Migrate to the flat layout

I will add `py.typed` after this PR is merged.
testcontainers · Mar 20, 2024 · 571b5d9 · 571b5d9
1 parent b10d916
commit 571b5d9
Show file tree

Hide file tree

Showing 95 changed files with 23 additions and 74 deletions.
diff --git a/INDEX.rst b/INDEX.rst
@@ -14,29 +14,29 @@ testcontainers-python facilitates the use of Docker containers for functional an
 
 .. toctree::
 
-    core/README
-    modules/arangodb/README
-    modules/azurite/README
-    modules/clickhouse/README
-    modules/elasticsearch/README
-    modules/google/README
-    modules/influxdb/README
-    modules/kafka/README
-    modules/keycloak/README
-    modules/localstack/README
-    modules/minio/README
-    modules/mongodb/README
-    modules/mssql/README
-    modules/mysql/README
-    modules/neo4j/README
-    modules/nginx/README
-    modules/opensearch/README
-    modules/oracle/README
-    modules/postgres/README
-    modules/rabbitmq/README
-    modules/redis/README
-    modules/selenium/README
-    modules/k3s/README
+    testcontainers/core/README
+    testcontainers//arangodb/README
+    testcontainers//azurite/README
+    testcontainers//clickhouse/README
+    testcontainers//elasticsearch/README
+    testcontainers//google/README
+    testcontainers//influxdb/README
+    testcontainers//kafka/README
+    testcontainers//keycloak/README
+    testcontainers//localstack/README
+    testcontainers//minio/README
+    testcontainers//mongodb/README
+    testcontainers//mssql/README
+    testcontainers//mysql/README
+    testcontainers//neo4j/README
+    testcontainers//nginx/README
+    testcontainers//opensearch/README
+    testcontainers//oracle/README
+    testcontainers//postgres/README
+    testcontainers//rabbitmq/README
+    testcontainers//redis/README
+    testcontainers//selenium/README
+    testcontainers//k3s/README
 
 Getting Started
 ---------------

diff --git a/pyproject.toml b/pyproject.toml
@@ -24,32 +24,6 @@ classifiers = [
     "Operating System :: Unix",
     "Operating System :: MacOS",
 ]
-# testcontainers-core is a proper package dependency - only modules needed here
-packages = [
-    { include = "testcontainers", from = "core" },
-    { include = "testcontainers", from = "modules/arangodb" },
-    { include = "testcontainers", from = "modules/azurite" },
-    { include = "testcontainers", from = "modules/clickhouse" },
-    { include = "testcontainers", from = "modules/elasticsearch" },
-    { include = "testcontainers", from = "modules/google" },
-    { include = "testcontainers", from = "modules/influxdb" },
-    { include = "testcontainers", from = "modules/k3s" },
-    { include = "testcontainers", from = "modules/kafka" },
-    { include = "testcontainers", from = "modules/keycloak" },
-    { include = "testcontainers", from = "modules/localstack" },
-    { include = "testcontainers", from = "modules/minio" },
-    { include = "testcontainers", from = "modules/mongodb" },
-    { include = "testcontainers", from = "modules/mssql" },
-    { include = "testcontainers", from = "modules/mysql" },
-    { include = "testcontainers", from = "modules/neo4j" },
-    { include = "testcontainers", from = "modules/nginx" },
-    { include = "testcontainers", from = "modules/opensearch" },
-    { include = "testcontainers", from = "modules/oracle" },
-    { include = "testcontainers", from = "modules/postgres" },
-    { include = "testcontainers", from = "modules/rabbitmq" },
-    { include = "testcontainers", from = "modules/redis" },
-    { include = "testcontainers", from = "modules/selenium" }
-]
 
 [tool.poetry.urls]
 "GitHub" = "https://github.com/testcontainers/testcontainers-python"
@@ -215,31 +189,6 @@ pretty = true
 show_error_codes = true
 strict = true
 fast_module_lookup = true
-modules = ["testcontainers.core"]
-mypy_path = [
-    "core",
-#    "modules/arangodb",
-#    "modules/azurite",
-#    "modules/clickhouse",
-#    "modules/elasticsearch",
-#    "modules/google",
-#    "modules/k3s",
-#    "modules/kafka",
-#    "modules/keycloak",
-#    "modules/localstack",
-#    "modules/minio",
-#    "modules/mongodb",
-#    "modules/mssql",
-#    "modules/mysql",
-#    "modules/neo4j",
-#    "modules/nginx",
-#    "modules/opensearch",
-#    "modules/oracle",
-#    "modules/postgres",
-#    "modules/rabbitmq",
-#    "modules/redis",
-#    "modules/selenium"
-]
 enable_error_code = [
     "ignore-without-code",
     "redundant-expr",

diff --git a/modules/README.md → testcontainers/README.md b/modules/README.md → testcontainers/README.md
diff --git a/core/testcontainers/core/__init__.py → testcontainers/__init__.py b/core/testcontainers/core/__init__.py → testcontainers/__init__.py
diff --git a/...ngodb/testcontainers/arangodb/__init__.py → testcontainers/arangodb/__init__.py b/...ngodb/testcontainers/arangodb/__init__.py → testcontainers/arangodb/__init__.py
diff --git a/modules/arangodb/README.rst → testcontainers/arangodb_/README.rst b/modules/arangodb/README.rst → testcontainers/arangodb_/README.rst
diff --git a/...zurite/testcontainers/azurite/__init__.py → testcontainers/azurite/__init__.py b/...zurite/testcontainers/azurite/__init__.py → testcontainers/azurite/__init__.py
diff --git a/modules/azurite/README.rst → testcontainers/azurite_/README.rst b/modules/azurite/README.rst → testcontainers/azurite_/README.rst
diff --git a/...use/testcontainers/clickhouse/__init__.py → testcontainers/clickhouse/__init__.py b/...use/testcontainers/clickhouse/__init__.py → testcontainers/clickhouse/__init__.py
diff --git a/modules/clickhouse/README.rst → testcontainers/clickhouse_/README.rst b/modules/clickhouse/README.rst → testcontainers/clickhouse_/README.rst
diff --git a/core/testcontainers/compose/__init__.py → testcontainers/compose/__init__.py b/core/testcontainers/compose/__init__.py → testcontainers/compose/__init__.py
diff --git a/core/testcontainers/compose/compose.py → testcontainers/compose/compose.py b/core/testcontainers/compose/compose.py → testcontainers/compose/compose.py
diff --git a/modules/influxdb/tests/__init__.py → testcontainers/core/__init__.py b/modules/influxdb/tests/__init__.py → testcontainers/core/__init__.py
diff --git a/core/testcontainers/core/config.py → testcontainers/core/config.py b/core/testcontainers/core/config.py → testcontainers/core/config.py
diff --git a/core/testcontainers/core/container.py → testcontainers/core/container.py b/core/testcontainers/core/container.py → testcontainers/core/container.py
diff --git a/core/testcontainers/core/docker_client.py → testcontainers/core/docker_client.py b/core/testcontainers/core/docker_client.py → testcontainers/core/docker_client.py
diff --git a/core/testcontainers/core/exceptions.py → testcontainers/core/exceptions.py b/core/testcontainers/core/exceptions.py → testcontainers/core/exceptions.py
diff --git a/core/testcontainers/core/generic.py → testcontainers/core/generic.py b/core/testcontainers/core/generic.py → testcontainers/core/generic.py
diff --git a/core/testcontainers/core/labels.py → testcontainers/core/labels.py b/core/testcontainers/core/labels.py → testcontainers/core/labels.py
diff --git a/core/testcontainers/core/utils.py → testcontainers/core/utils.py b/core/testcontainers/core/utils.py → testcontainers/core/utils.py
diff --git a/core/testcontainers/core/waiting_utils.py → testcontainers/core/waiting_utils.py b/core/testcontainers/core/waiting_utils.py → testcontainers/core/waiting_utils.py
diff --git a/core/README.rst → testcontainers/core_/README.rst b/core/README.rst → testcontainers/core_/README.rst
diff --git a/.../testcontainers/elasticsearch/__init__.py → testcontainers/elasticsearch/__init__.py b/.../testcontainers/elasticsearch/__init__.py → testcontainers/elasticsearch/__init__.py
diff --git a/modules/elasticsearch/README.rst → testcontainers/elasticsearch_/README.rst b/modules/elasticsearch/README.rst → testcontainers/elasticsearch_/README.rst
diff --git a/.../google/testcontainers/google/__init__.py → testcontainers/google/__init__.py b/.../google/testcontainers/google/__init__.py → testcontainers/google/__init__.py
diff --git a/...es/google/testcontainers/google/pubsub.py → testcontainers/google/pubsub.py b/...es/google/testcontainers/google/pubsub.py → testcontainers/google/pubsub.py
diff --git a/modules/google/README.rst → testcontainers/google_/README.rst b/modules/google/README.rst → testcontainers/google_/README.rst
diff --git a/modules/influxdb/testcontainers/influxdb.py → testcontainers/influxdb/__init__.py b/modules/influxdb/testcontainers/influxdb.py → testcontainers/influxdb/__init__.py
diff --git a/...uxdb/testcontainers/influxdb1/__init__.py → testcontainers/influxdb1/__init__.py b/...uxdb/testcontainers/influxdb1/__init__.py → testcontainers/influxdb1/__init__.py
diff --git a/...uxdb/testcontainers/influxdb2/__init__.py → testcontainers/influxdb2/__init__.py b/...uxdb/testcontainers/influxdb2/__init__.py → testcontainers/influxdb2/__init__.py
diff --git a/modules/influxdb/README.rst → testcontainers/influxdb_/README.rst b/modules/influxdb/README.rst → testcontainers/influxdb_/README.rst
diff --git a/modules/k3s/testcontainers/k3s/__init__.py → testcontainers/k3s/__init__.py b/modules/k3s/testcontainers/k3s/__init__.py → testcontainers/k3s/__init__.py
diff --git a/modules/k3s/README.rst → testcontainers/k3s_/README.rst b/modules/k3s/README.rst → testcontainers/k3s_/README.rst
diff --git a/...es/kafka/testcontainers/kafka/__init__.py → testcontainers/kafka/__init__.py b/...es/kafka/testcontainers/kafka/__init__.py → testcontainers/kafka/__init__.py
diff --git a/modules/kafka/README.rst → testcontainers/kafka_/README.rst b/modules/kafka/README.rst → testcontainers/kafka_/README.rst
diff --git a/...cloak/testcontainers/keycloak/__init__.py → testcontainers/keycloak/__init__.py b/...cloak/testcontainers/keycloak/__init__.py → testcontainers/keycloak/__init__.py
diff --git a/modules/keycloak/README.rst → testcontainers/keycloak_/README.rst b/modules/keycloak/README.rst → testcontainers/keycloak_/README.rst
diff --git a/...ack/testcontainers/localstack/__init__.py → testcontainers/localstack/__init__.py b/...ack/testcontainers/localstack/__init__.py → testcontainers/localstack/__init__.py
diff --git a/modules/localstack/README.rst → testcontainers/localstack_/README.rst b/modules/localstack/README.rst → testcontainers/localstack_/README.rst
diff --git a/...es/minio/testcontainers/minio/__init__.py → testcontainers/minio/__init__.py b/...es/minio/testcontainers/minio/__init__.py → testcontainers/minio/__init__.py
diff --git a/modules/minio/README.rst → testcontainers/minio_/README.rst b/modules/minio/README.rst → testcontainers/minio_/README.rst
diff --git a/...ongodb/testcontainers/mongodb/__init__.py → testcontainers/mongodb/__init__.py b/...ongodb/testcontainers/mongodb/__init__.py → testcontainers/mongodb/__init__.py
diff --git a/modules/mongodb/README.rst → testcontainers/mongodb_/README.rst b/modules/mongodb/README.rst → testcontainers/mongodb_/README.rst
diff --git a/...es/mssql/testcontainers/mssql/__init__.py → testcontainers/mssql/__init__.py b/...es/mssql/testcontainers/mssql/__init__.py → testcontainers/mssql/__init__.py
diff --git a/modules/mssql/README.rst → testcontainers/mssql_/README.rst b/modules/mssql/README.rst → testcontainers/mssql_/README.rst
diff --git a/...es/mysql/testcontainers/mysql/__init__.py → testcontainers/mysql/__init__.py b/...es/mysql/testcontainers/mysql/__init__.py → testcontainers/mysql/__init__.py
diff --git a/modules/mysql/README.rst → testcontainers/mysql_/README.rst b/modules/mysql/README.rst → testcontainers/mysql_/README.rst
diff --git a/...es/neo4j/testcontainers/neo4j/__init__.py → testcontainers/neo4j/__init__.py b/...es/neo4j/testcontainers/neo4j/__init__.py → testcontainers/neo4j/__init__.py
diff --git a/modules/neo4j/README.rst → testcontainers/neo4j_/README.rst b/modules/neo4j/README.rst → testcontainers/neo4j_/README.rst
diff --git a/...es/nginx/testcontainers/nginx/__init__.py → testcontainers/nginx/__init__.py b/...es/nginx/testcontainers/nginx/__init__.py → testcontainers/nginx/__init__.py
diff --git a/modules/nginx/README.rst → testcontainers/nginx_/README.rst b/modules/nginx/README.rst → testcontainers/nginx_/README.rst
diff --git a/...rch/testcontainers/opensearch/__init__.py → testcontainers/opensearch/__init__.py b/...rch/testcontainers/opensearch/__init__.py → testcontainers/opensearch/__init__.py
diff --git a/modules/opensearch/README.rst → testcontainers/opensearch_/README.rst b/modules/opensearch/README.rst → testcontainers/opensearch_/README.rst
diff --git a/.../oracle/testcontainers/oracle/__init__.py → testcontainers/oracle/__init__.py b/.../oracle/testcontainers/oracle/__init__.py → testcontainers/oracle/__init__.py
diff --git a/modules/oracle/README.rst → testcontainers/oracle_/README.rst b/modules/oracle/README.rst → testcontainers/oracle_/README.rst
diff --git a/...tgres/testcontainers/postgres/__init__.py → testcontainers/postgres/__init__.py b/...tgres/testcontainers/postgres/__init__.py → testcontainers/postgres/__init__.py
diff --git a/modules/postgres/README.rst → testcontainers/postgres_/README.rst b/modules/postgres/README.rst → testcontainers/postgres_/README.rst
diff --git a/...bitmq/testcontainers/rabbitmq/__init__.py → testcontainers/rabbitmq/__init__.py b/...bitmq/testcontainers/rabbitmq/__init__.py → testcontainers/rabbitmq/__init__.py
diff --git a/modules/rabbitmq/README.rst → testcontainers/rabbitmq_/README.rst b/modules/rabbitmq/README.rst → testcontainers/rabbitmq_/README.rst
diff --git a/...es/redis/testcontainers/redis/__init__.py → testcontainers/redis/__init__.py b/...es/redis/testcontainers/redis/__init__.py → testcontainers/redis/__init__.py
diff --git a/modules/redis/README.rst → testcontainers/redis_/README.rst b/modules/redis/README.rst → testcontainers/redis_/README.rst
diff --git a/...enium/testcontainers/selenium/__init__.py → testcontainers/selenium/__init__.py b/...enium/testcontainers/selenium/__init__.py → testcontainers/selenium/__init__.py
diff --git a/modules/selenium/README.rst → testcontainers/selenium_/README.rst b/modules/selenium/README.rst → testcontainers/selenium_/README.rst
diff --git a/modules/arangodb/tests/test_arangodb.py → tests/arangodb/test_arangodb.py b/modules/arangodb/tests/test_arangodb.py → tests/arangodb/test_arangodb.py
diff --git a/modules/azurite/tests/test_azurite.py → tests/azurite/test_azurite.py b/modules/azurite/tests/test_azurite.py → tests/azurite/test_azurite.py
diff --git a/modules/clickhouse/tests/test_clickhouse.py → tests/clickhouse/test_clickhouse.py b/modules/clickhouse/tests/test_clickhouse.py → tests/clickhouse/test_clickhouse.py
diff --git a/core/tests/Dockerfile → tests/core/Dockerfile b/core/tests/Dockerfile → tests/core/Dockerfile
diff --git a/...ompose_fixtures/basic/docker-compose.yaml → ...ompose_fixtures/basic/docker-compose.yaml b/...ompose_fixtures/basic/docker-compose.yaml → ...ompose_fixtures/basic/docker-compose.yaml
diff --git a/...mpose_fixtures/port_multiple/compose.yaml → ...mpose_fixtures/port_multiple/compose.yaml b/...mpose_fixtures/port_multiple/compose.yaml → ...mpose_fixtures/port_multiple/compose.yaml
diff --git a/...compose_fixtures/port_single/compose.yaml → ...compose_fixtures/port_single/compose.yaml b/...compose_fixtures/port_single/compose.yaml → ...compose_fixtures/port_single/compose.yaml
diff --git a/core/tests/test_compose.py → tests/core/test_compose.py b/core/tests/test_compose.py → tests/core/test_compose.py
diff --git a/core/tests/test_core.py → tests/core/test_core.py b/core/tests/test_core.py → tests/core/test_core.py
diff --git a/core/tests/test_docker_client.py → tests/core/test_docker_client.py b/core/tests/test_docker_client.py → tests/core/test_docker_client.py
diff --git a/core/tests/test_docker_in_docker.py → tests/core/test_docker_in_docker.py b/core/tests/test_docker_in_docker.py → tests/core/test_docker_in_docker.py
diff --git a/core/tests/test_new_docker_api.py → tests/core/test_new_docker_api.py b/core/tests/test_new_docker_api.py → tests/core/test_new_docker_api.py
diff --git a/core/tests/test_ryuk.py → tests/core/test_ryuk.py b/core/tests/test_ryuk.py → tests/core/test_ryuk.py
diff --git a/...elasticsearch/tests/test_elasticsearch.py → tests/elasticsearch/test_elasticsearch.py b/...elasticsearch/tests/test_elasticsearch.py → tests/elasticsearch/test_elasticsearch.py
diff --git a/modules/google/tests/test_google.py → tests/google/test_google.py b/modules/google/tests/test_google.py → tests/google/test_google.py
diff --git a/modules/influxdb/tests/test_influxdb.py → tests/influxdb/test_influxdb.py b/modules/influxdb/tests/test_influxdb.py → tests/influxdb/test_influxdb.py
diff --git a/modules/k3s/tests/test_k3s.py → tests/k3s/test_k3s.py b/modules/k3s/tests/test_k3s.py → tests/k3s/test_k3s.py
diff --git a/modules/kafka/tests/test_kafka.py → tests/kafka/test_kafka.py b/modules/kafka/tests/test_kafka.py → tests/kafka/test_kafka.py
diff --git a/modules/keycloak/tests/test_keycloak.py → tests/keycloak/test_keycloak.py b/modules/keycloak/tests/test_keycloak.py → tests/keycloak/test_keycloak.py
diff --git a/modules/localstack/tests/test_localstack.py → tests/localstack/test_localstack.py b/modules/localstack/tests/test_localstack.py → tests/localstack/test_localstack.py
diff --git a/modules/minio/tests/test_minio.py → tests/minio/test_minio.py b/modules/minio/tests/test_minio.py → tests/minio/test_minio.py
diff --git a/modules/mongodb/tests/test_mongodb.py → tests/mongodb/test_mongodb.py b/modules/mongodb/tests/test_mongodb.py → tests/mongodb/test_mongodb.py
diff --git a/modules/mssql/tests/test_mssql.py → tests/mssql/test_mssql.py b/modules/mssql/tests/test_mssql.py → tests/mssql/test_mssql.py
diff --git a/modules/mysql/tests/test_mysql.py → tests/mysql/test_mysql.py b/modules/mysql/tests/test_mysql.py → tests/mysql/test_mysql.py
diff --git a/modules/neo4j/tests/test_neo4j.py → tests/neo4j/test_neo4j.py b/modules/neo4j/tests/test_neo4j.py → tests/neo4j/test_neo4j.py
diff --git a/modules/nginx/tests/test_nginx.py → tests/nginx/test_nginx.py b/modules/nginx/tests/test_nginx.py → tests/nginx/test_nginx.py
diff --git a/modules/opensearch/tests/test_opensearch.py → tests/opensearch/test_opensearch.py b/modules/opensearch/tests/test_opensearch.py → tests/opensearch/test_opensearch.py
diff --git a/modules/oracle/tests/test_oracle.py → tests/oracle/test_oracle.py b/modules/oracle/tests/test_oracle.py → tests/oracle/test_oracle.py
diff --git a/modules/postgres/tests/test_postgres.py → tests/postgres/test_postgres.py b/modules/postgres/tests/test_postgres.py → tests/postgres/test_postgres.py
diff --git a/modules/rabbitmq/tests/test_rabbitmq.py → tests/rabbitmq/test_rabbitmq.py b/modules/rabbitmq/tests/test_rabbitmq.py → tests/rabbitmq/test_rabbitmq.py
diff --git a/modules/redis/tests/test_redis.py → tests/redis/test_redis.py b/modules/redis/tests/test_redis.py → tests/redis/test_redis.py
diff --git a/modules/selenium/tests/test_selenium.py → tests/selenium/test_selenium.py b/modules/selenium/tests/test_selenium.py → tests/selenium/test_selenium.py