Rebase main

Author: carlosemart

.github/workflows/ci-community.yml

@@ -25,6 +25,7 @@ jobs:
           - arangodb
           - azurite
           - clickhouse
+          - compose
           - elasticsearch
           - google
           - kafka

INDEX.rst

@@ -18,6 +18,7 @@ testcontainers-python facilitates the use of Docker containers for functional an
     modules/arangodb/README
     modules/azurite/README
     modules/clickhouse/README
+    modules/compose/README
     modules/elasticsearch/README
     modules/google/README
     modules/kafka/README

compose/setup.py

@@ -55,7 +55,10 @@ def __init__(
         services: Optional[List[str]] = None,
     ) -> None:
         self.filepath = filepath
-        self.compose_file_names = [compose_file_name] if isinstance(compose_file_name, str) else list(compose_file_name)
+        if isinstance(compose_file_name, str):
+            self.compose_file_names = [compose_file_name]
+        else:
+            self.compose_file_names = list(compose_file_name)
         self.pull = pull
         self.build = build
         self.env_file = env_file

compose/README.rst renamed to modules/compose/README.rst

@@ -124,4 +124,4 @@ def test_can_exec_commands():
         result = compose.exec_in_container('hub', ['echo', 'my_test'])
         assert result[0] == 'my_test\n', "The echo should be successful"
         assert result[1] == '', "stderr should be empty"
-        assert result[2] == 0, 'The exit code should be successful'
+        assert result[2] == 0, 'The exit code should be successful'

compose/testcontainers/compose/__init__.py renamed to modules/compose/testcontainers/compose/__init__.py

@@ -31,6 +31,7 @@ packages = [
     { include = "testcontainers", from = "modules/arangodb" },
     { include = "testcontainers", from = "modules/azurite" },
     { include = "testcontainers", from = "modules/clickhouse" },
+    { include = "testcontainers", from = "modules/compose" },
     { include = "testcontainers", from = "modules/elasticsearch" },
     { include = "testcontainers", from = "modules/google" },
     { include = "testcontainers", from = "modules/k3s" },
@@ -88,6 +89,7 @@ selenium = { version = "*", optional = true }
 arangodb = ["python-arango"]
 azurite = ["azure-storage-blob"]
 clickhouse = ["clickhouse-driver"]
+compose = []
 elasticsearch = []
 google = ["google-cloud-pubsub"]
 k3s = ["kubernetes", "pyyaml"]