diff --git a/INDEX.rst b/INDEX.rst index 4e0cd54b9..e429e117a 100644 --- 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 index b9ac9d7c9..024a7cb44 100644 --- 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 b/testcontainers/README.md similarity index 100% rename from modules/README.md rename to testcontainers/README.md diff --git a/core/testcontainers/core/__init__.py b/testcontainers/__init__.py similarity index 100% rename from core/testcontainers/core/__init__.py rename to testcontainers/__init__.py diff --git a/modules/arangodb/testcontainers/arangodb/__init__.py b/testcontainers/arangodb/__init__.py similarity index 100% rename from modules/arangodb/testcontainers/arangodb/__init__.py rename to testcontainers/arangodb/__init__.py diff --git a/modules/arangodb/README.rst b/testcontainers/arangodb_/README.rst similarity index 100% rename from modules/arangodb/README.rst rename to testcontainers/arangodb_/README.rst diff --git a/modules/azurite/testcontainers/azurite/__init__.py b/testcontainers/azurite/__init__.py similarity index 100% rename from modules/azurite/testcontainers/azurite/__init__.py rename to testcontainers/azurite/__init__.py diff --git a/modules/azurite/README.rst b/testcontainers/azurite_/README.rst similarity index 100% rename from modules/azurite/README.rst rename to testcontainers/azurite_/README.rst diff --git a/modules/clickhouse/testcontainers/clickhouse/__init__.py b/testcontainers/clickhouse/__init__.py similarity index 100% rename from modules/clickhouse/testcontainers/clickhouse/__init__.py rename to testcontainers/clickhouse/__init__.py diff --git a/modules/clickhouse/README.rst b/testcontainers/clickhouse_/README.rst similarity index 100% rename from modules/clickhouse/README.rst rename to testcontainers/clickhouse_/README.rst diff --git a/core/testcontainers/compose/__init__.py b/testcontainers/compose/__init__.py similarity index 100% rename from core/testcontainers/compose/__init__.py rename to testcontainers/compose/__init__.py diff --git a/core/testcontainers/compose/compose.py b/testcontainers/compose/compose.py similarity index 100% rename from core/testcontainers/compose/compose.py rename to testcontainers/compose/compose.py diff --git a/modules/influxdb/tests/__init__.py b/testcontainers/core/__init__.py similarity index 100% rename from modules/influxdb/tests/__init__.py rename to testcontainers/core/__init__.py diff --git a/core/testcontainers/core/config.py b/testcontainers/core/config.py similarity index 100% rename from core/testcontainers/core/config.py rename to testcontainers/core/config.py diff --git a/core/testcontainers/core/container.py b/testcontainers/core/container.py similarity index 100% rename from core/testcontainers/core/container.py rename to testcontainers/core/container.py diff --git a/core/testcontainers/core/docker_client.py b/testcontainers/core/docker_client.py similarity index 100% rename from core/testcontainers/core/docker_client.py rename to testcontainers/core/docker_client.py diff --git a/core/testcontainers/core/exceptions.py b/testcontainers/core/exceptions.py similarity index 100% rename from core/testcontainers/core/exceptions.py rename to testcontainers/core/exceptions.py diff --git a/core/testcontainers/core/generic.py b/testcontainers/core/generic.py similarity index 100% rename from core/testcontainers/core/generic.py rename to testcontainers/core/generic.py diff --git a/core/testcontainers/core/labels.py b/testcontainers/core/labels.py similarity index 100% rename from core/testcontainers/core/labels.py rename to testcontainers/core/labels.py diff --git a/core/testcontainers/core/utils.py b/testcontainers/core/utils.py similarity index 100% rename from core/testcontainers/core/utils.py rename to testcontainers/core/utils.py diff --git a/core/testcontainers/core/waiting_utils.py b/testcontainers/core/waiting_utils.py similarity index 100% rename from core/testcontainers/core/waiting_utils.py rename to testcontainers/core/waiting_utils.py diff --git a/core/README.rst b/testcontainers/core_/README.rst similarity index 100% rename from core/README.rst rename to testcontainers/core_/README.rst diff --git a/modules/elasticsearch/testcontainers/elasticsearch/__init__.py b/testcontainers/elasticsearch/__init__.py similarity index 100% rename from modules/elasticsearch/testcontainers/elasticsearch/__init__.py rename to testcontainers/elasticsearch/__init__.py diff --git a/modules/elasticsearch/README.rst b/testcontainers/elasticsearch_/README.rst similarity index 100% rename from modules/elasticsearch/README.rst rename to testcontainers/elasticsearch_/README.rst diff --git a/modules/google/testcontainers/google/__init__.py b/testcontainers/google/__init__.py similarity index 100% rename from modules/google/testcontainers/google/__init__.py rename to testcontainers/google/__init__.py diff --git a/modules/google/testcontainers/google/pubsub.py b/testcontainers/google/pubsub.py similarity index 100% rename from modules/google/testcontainers/google/pubsub.py rename to testcontainers/google/pubsub.py diff --git a/modules/google/README.rst b/testcontainers/google_/README.rst similarity index 100% rename from modules/google/README.rst rename to testcontainers/google_/README.rst diff --git a/modules/influxdb/testcontainers/influxdb.py b/testcontainers/influxdb/__init__.py similarity index 100% rename from modules/influxdb/testcontainers/influxdb.py rename to testcontainers/influxdb/__init__.py diff --git a/modules/influxdb/testcontainers/influxdb1/__init__.py b/testcontainers/influxdb1/__init__.py similarity index 100% rename from modules/influxdb/testcontainers/influxdb1/__init__.py rename to testcontainers/influxdb1/__init__.py diff --git a/modules/influxdb/testcontainers/influxdb2/__init__.py b/testcontainers/influxdb2/__init__.py similarity index 100% rename from modules/influxdb/testcontainers/influxdb2/__init__.py rename to testcontainers/influxdb2/__init__.py diff --git a/modules/influxdb/README.rst b/testcontainers/influxdb_/README.rst similarity index 100% rename from modules/influxdb/README.rst rename to testcontainers/influxdb_/README.rst diff --git a/modules/k3s/testcontainers/k3s/__init__.py b/testcontainers/k3s/__init__.py similarity index 100% rename from modules/k3s/testcontainers/k3s/__init__.py rename to testcontainers/k3s/__init__.py diff --git a/modules/k3s/README.rst b/testcontainers/k3s_/README.rst similarity index 100% rename from modules/k3s/README.rst rename to testcontainers/k3s_/README.rst diff --git a/modules/kafka/testcontainers/kafka/__init__.py b/testcontainers/kafka/__init__.py similarity index 100% rename from modules/kafka/testcontainers/kafka/__init__.py rename to testcontainers/kafka/__init__.py diff --git a/modules/kafka/README.rst b/testcontainers/kafka_/README.rst similarity index 100% rename from modules/kafka/README.rst rename to testcontainers/kafka_/README.rst diff --git a/modules/keycloak/testcontainers/keycloak/__init__.py b/testcontainers/keycloak/__init__.py similarity index 100% rename from modules/keycloak/testcontainers/keycloak/__init__.py rename to testcontainers/keycloak/__init__.py diff --git a/modules/keycloak/README.rst b/testcontainers/keycloak_/README.rst similarity index 100% rename from modules/keycloak/README.rst rename to testcontainers/keycloak_/README.rst diff --git a/modules/localstack/testcontainers/localstack/__init__.py b/testcontainers/localstack/__init__.py similarity index 100% rename from modules/localstack/testcontainers/localstack/__init__.py rename to testcontainers/localstack/__init__.py diff --git a/modules/localstack/README.rst b/testcontainers/localstack_/README.rst similarity index 100% rename from modules/localstack/README.rst rename to testcontainers/localstack_/README.rst diff --git a/modules/minio/testcontainers/minio/__init__.py b/testcontainers/minio/__init__.py similarity index 100% rename from modules/minio/testcontainers/minio/__init__.py rename to testcontainers/minio/__init__.py diff --git a/modules/minio/README.rst b/testcontainers/minio_/README.rst similarity index 100% rename from modules/minio/README.rst rename to testcontainers/minio_/README.rst diff --git a/modules/mongodb/testcontainers/mongodb/__init__.py b/testcontainers/mongodb/__init__.py similarity index 100% rename from modules/mongodb/testcontainers/mongodb/__init__.py rename to testcontainers/mongodb/__init__.py diff --git a/modules/mongodb/README.rst b/testcontainers/mongodb_/README.rst similarity index 100% rename from modules/mongodb/README.rst rename to testcontainers/mongodb_/README.rst diff --git a/modules/mssql/testcontainers/mssql/__init__.py b/testcontainers/mssql/__init__.py similarity index 100% rename from modules/mssql/testcontainers/mssql/__init__.py rename to testcontainers/mssql/__init__.py diff --git a/modules/mssql/README.rst b/testcontainers/mssql_/README.rst similarity index 100% rename from modules/mssql/README.rst rename to testcontainers/mssql_/README.rst diff --git a/modules/mysql/testcontainers/mysql/__init__.py b/testcontainers/mysql/__init__.py similarity index 100% rename from modules/mysql/testcontainers/mysql/__init__.py rename to testcontainers/mysql/__init__.py diff --git a/modules/mysql/README.rst b/testcontainers/mysql_/README.rst similarity index 100% rename from modules/mysql/README.rst rename to testcontainers/mysql_/README.rst diff --git a/modules/neo4j/testcontainers/neo4j/__init__.py b/testcontainers/neo4j/__init__.py similarity index 100% rename from modules/neo4j/testcontainers/neo4j/__init__.py rename to testcontainers/neo4j/__init__.py diff --git a/modules/neo4j/README.rst b/testcontainers/neo4j_/README.rst similarity index 100% rename from modules/neo4j/README.rst rename to testcontainers/neo4j_/README.rst diff --git a/modules/nginx/testcontainers/nginx/__init__.py b/testcontainers/nginx/__init__.py similarity index 100% rename from modules/nginx/testcontainers/nginx/__init__.py rename to testcontainers/nginx/__init__.py diff --git a/modules/nginx/README.rst b/testcontainers/nginx_/README.rst similarity index 100% rename from modules/nginx/README.rst rename to testcontainers/nginx_/README.rst diff --git a/modules/opensearch/testcontainers/opensearch/__init__.py b/testcontainers/opensearch/__init__.py similarity index 100% rename from modules/opensearch/testcontainers/opensearch/__init__.py rename to testcontainers/opensearch/__init__.py diff --git a/modules/opensearch/README.rst b/testcontainers/opensearch_/README.rst similarity index 100% rename from modules/opensearch/README.rst rename to testcontainers/opensearch_/README.rst diff --git a/modules/oracle/testcontainers/oracle/__init__.py b/testcontainers/oracle/__init__.py similarity index 100% rename from modules/oracle/testcontainers/oracle/__init__.py rename to testcontainers/oracle/__init__.py diff --git a/modules/oracle/README.rst b/testcontainers/oracle_/README.rst similarity index 100% rename from modules/oracle/README.rst rename to testcontainers/oracle_/README.rst diff --git a/modules/postgres/testcontainers/postgres/__init__.py b/testcontainers/postgres/__init__.py similarity index 100% rename from modules/postgres/testcontainers/postgres/__init__.py rename to testcontainers/postgres/__init__.py diff --git a/modules/postgres/README.rst b/testcontainers/postgres_/README.rst similarity index 100% rename from modules/postgres/README.rst rename to testcontainers/postgres_/README.rst diff --git a/modules/rabbitmq/testcontainers/rabbitmq/__init__.py b/testcontainers/rabbitmq/__init__.py similarity index 100% rename from modules/rabbitmq/testcontainers/rabbitmq/__init__.py rename to testcontainers/rabbitmq/__init__.py diff --git a/modules/rabbitmq/README.rst b/testcontainers/rabbitmq_/README.rst similarity index 100% rename from modules/rabbitmq/README.rst rename to testcontainers/rabbitmq_/README.rst diff --git a/modules/redis/testcontainers/redis/__init__.py b/testcontainers/redis/__init__.py similarity index 100% rename from modules/redis/testcontainers/redis/__init__.py rename to testcontainers/redis/__init__.py diff --git a/modules/redis/README.rst b/testcontainers/redis_/README.rst similarity index 100% rename from modules/redis/README.rst rename to testcontainers/redis_/README.rst diff --git a/modules/selenium/testcontainers/selenium/__init__.py b/testcontainers/selenium/__init__.py similarity index 100% rename from modules/selenium/testcontainers/selenium/__init__.py rename to testcontainers/selenium/__init__.py diff --git a/modules/selenium/README.rst b/testcontainers/selenium_/README.rst similarity index 100% rename from modules/selenium/README.rst rename to testcontainers/selenium_/README.rst diff --git a/modules/arangodb/tests/test_arangodb.py b/tests/arangodb/test_arangodb.py similarity index 100% rename from modules/arangodb/tests/test_arangodb.py rename to tests/arangodb/test_arangodb.py diff --git a/modules/azurite/tests/test_azurite.py b/tests/azurite/test_azurite.py similarity index 100% rename from modules/azurite/tests/test_azurite.py rename to tests/azurite/test_azurite.py diff --git a/modules/clickhouse/tests/test_clickhouse.py b/tests/clickhouse/test_clickhouse.py similarity index 100% rename from modules/clickhouse/tests/test_clickhouse.py rename to tests/clickhouse/test_clickhouse.py diff --git a/core/tests/Dockerfile b/tests/core/Dockerfile similarity index 100% rename from core/tests/Dockerfile rename to tests/core/Dockerfile diff --git a/core/tests/compose_fixtures/basic/docker-compose.yaml b/tests/core/compose_fixtures/basic/docker-compose.yaml similarity index 100% rename from core/tests/compose_fixtures/basic/docker-compose.yaml rename to tests/core/compose_fixtures/basic/docker-compose.yaml diff --git a/core/tests/compose_fixtures/port_multiple/compose.yaml b/tests/core/compose_fixtures/port_multiple/compose.yaml similarity index 100% rename from core/tests/compose_fixtures/port_multiple/compose.yaml rename to tests/core/compose_fixtures/port_multiple/compose.yaml diff --git a/core/tests/compose_fixtures/port_single/compose.yaml b/tests/core/compose_fixtures/port_single/compose.yaml similarity index 100% rename from core/tests/compose_fixtures/port_single/compose.yaml rename to tests/core/compose_fixtures/port_single/compose.yaml diff --git a/core/tests/test_compose.py b/tests/core/test_compose.py similarity index 100% rename from core/tests/test_compose.py rename to tests/core/test_compose.py diff --git a/core/tests/test_core.py b/tests/core/test_core.py similarity index 100% rename from core/tests/test_core.py rename to tests/core/test_core.py diff --git a/core/tests/test_docker_client.py b/tests/core/test_docker_client.py similarity index 100% rename from core/tests/test_docker_client.py rename to tests/core/test_docker_client.py diff --git a/core/tests/test_docker_in_docker.py b/tests/core/test_docker_in_docker.py similarity index 100% rename from core/tests/test_docker_in_docker.py rename to tests/core/test_docker_in_docker.py diff --git a/core/tests/test_new_docker_api.py b/tests/core/test_new_docker_api.py similarity index 100% rename from core/tests/test_new_docker_api.py rename to tests/core/test_new_docker_api.py diff --git a/core/tests/test_ryuk.py b/tests/core/test_ryuk.py similarity index 100% rename from core/tests/test_ryuk.py rename to tests/core/test_ryuk.py diff --git a/modules/elasticsearch/tests/test_elasticsearch.py b/tests/elasticsearch/test_elasticsearch.py similarity index 100% rename from modules/elasticsearch/tests/test_elasticsearch.py rename to tests/elasticsearch/test_elasticsearch.py diff --git a/modules/google/tests/test_google.py b/tests/google/test_google.py similarity index 100% rename from modules/google/tests/test_google.py rename to tests/google/test_google.py diff --git a/modules/influxdb/tests/test_influxdb.py b/tests/influxdb/test_influxdb.py similarity index 100% rename from modules/influxdb/tests/test_influxdb.py rename to tests/influxdb/test_influxdb.py diff --git a/modules/k3s/tests/test_k3s.py b/tests/k3s/test_k3s.py similarity index 100% rename from modules/k3s/tests/test_k3s.py rename to tests/k3s/test_k3s.py diff --git a/modules/kafka/tests/test_kafka.py b/tests/kafka/test_kafka.py similarity index 100% rename from modules/kafka/tests/test_kafka.py rename to tests/kafka/test_kafka.py diff --git a/modules/keycloak/tests/test_keycloak.py b/tests/keycloak/test_keycloak.py similarity index 100% rename from modules/keycloak/tests/test_keycloak.py rename to tests/keycloak/test_keycloak.py diff --git a/modules/localstack/tests/test_localstack.py b/tests/localstack/test_localstack.py similarity index 100% rename from modules/localstack/tests/test_localstack.py rename to tests/localstack/test_localstack.py diff --git a/modules/minio/tests/test_minio.py b/tests/minio/test_minio.py similarity index 100% rename from modules/minio/tests/test_minio.py rename to tests/minio/test_minio.py diff --git a/modules/mongodb/tests/test_mongodb.py b/tests/mongodb/test_mongodb.py similarity index 100% rename from modules/mongodb/tests/test_mongodb.py rename to tests/mongodb/test_mongodb.py diff --git a/modules/mssql/tests/test_mssql.py b/tests/mssql/test_mssql.py similarity index 100% rename from modules/mssql/tests/test_mssql.py rename to tests/mssql/test_mssql.py diff --git a/modules/mysql/tests/test_mysql.py b/tests/mysql/test_mysql.py similarity index 100% rename from modules/mysql/tests/test_mysql.py rename to tests/mysql/test_mysql.py diff --git a/modules/neo4j/tests/test_neo4j.py b/tests/neo4j/test_neo4j.py similarity index 100% rename from modules/neo4j/tests/test_neo4j.py rename to tests/neo4j/test_neo4j.py diff --git a/modules/nginx/tests/test_nginx.py b/tests/nginx/test_nginx.py similarity index 100% rename from modules/nginx/tests/test_nginx.py rename to tests/nginx/test_nginx.py diff --git a/modules/opensearch/tests/test_opensearch.py b/tests/opensearch/test_opensearch.py similarity index 100% rename from modules/opensearch/tests/test_opensearch.py rename to tests/opensearch/test_opensearch.py diff --git a/modules/oracle/tests/test_oracle.py b/tests/oracle/test_oracle.py similarity index 100% rename from modules/oracle/tests/test_oracle.py rename to tests/oracle/test_oracle.py diff --git a/modules/postgres/tests/test_postgres.py b/tests/postgres/test_postgres.py similarity index 100% rename from modules/postgres/tests/test_postgres.py rename to tests/postgres/test_postgres.py diff --git a/modules/rabbitmq/tests/test_rabbitmq.py b/tests/rabbitmq/test_rabbitmq.py similarity index 100% rename from modules/rabbitmq/tests/test_rabbitmq.py rename to tests/rabbitmq/test_rabbitmq.py diff --git a/modules/redis/tests/test_redis.py b/tests/redis/test_redis.py similarity index 100% rename from modules/redis/tests/test_redis.py rename to tests/redis/test_redis.py diff --git a/modules/selenium/tests/test_selenium.py b/tests/selenium/test_selenium.py similarity index 100% rename from modules/selenium/tests/test_selenium.py rename to tests/selenium/test_selenium.py