WIP

src/pytest_celery/__init__.py

@@ -19,6 +19,9 @@
 from pytest_celery.api import CeleryTestSetup
 from pytest_celery.api import CeleryTestWorker
 from pytest_celery.api import CeleryWorkerCluster
+from pytest_celery.api import CeleryWorkerContainer
+from pytest_celery.api import RabbitMQContainer
+from pytest_celery.api import RedisContainer
 from pytest_celery.components import RabbitMQTestBroker
 from pytest_celery.components import RedisTestBackend
 from pytest_celery.components import RedisTestBroker
@@ -58,9 +61,6 @@
 from pytest_celery.components import default_worker_signals
 from pytest_celery.components import default_worker_tasks
 from pytest_celery.components import default_worker_volume
-from pytest_celery.containers import CeleryWorkerContainer
-from pytest_celery.containers import RabbitMQContainer
-from pytest_celery.containers import RedisContainer
 from pytest_celery.fixtures import celery_backend
 from pytest_celery.fixtures import celery_backend_cluster
 from pytest_celery.fixtures import celery_backend_cluster_config

src/pytest_celery/api/__init__.py

@@ -7,6 +7,9 @@
 from pytest_celery.api.broker import CeleryBrokerCluster
 from pytest_celery.api.broker import CeleryTestBroker
 from pytest_celery.api.container import CeleryTestContainer
+from pytest_celery.api.containers.rabbitmq import RabbitMQContainer
+from pytest_celery.api.containers.redis import RedisContainer
+from pytest_celery.api.containers.worker import CeleryWorkerContainer
 from pytest_celery.api.setup import CeleryTestSetup
 from pytest_celery.api.worker import CeleryTestWorker
 from pytest_celery.api.worker import CeleryWorkerCluster

src/pytest_celery/api/containers/__init__.py

@@ -0,0 +1,5 @@
+# flake8: noqa
+
+from pytest_celery.api.containers.rabbitmq import RabbitMQContainer
+from pytest_celery.api.containers.redis import RedisContainer
+from pytest_celery.api.containers.worker import CeleryWorkerContainer

src/pytest_celery/api/worker.py

@@ -8,7 +8,7 @@
 from pytest_celery.api.base import CeleryTestCluster
 from pytest_celery.api.base import CeleryTestNode
 from pytest_celery.api.container import CeleryTestContainer
-from pytest_celery.containers.worker import CeleryWorkerContainer
+from pytest_celery.api.containers.worker import CeleryWorkerContainer
 
 
 class CeleryTestWorker(CeleryTestNode):

src/pytest_celery/components/backend/redis/fixtures.py

@@ -7,8 +7,8 @@
 from pytest_docker_tools import fxtr
 
 from pytest_celery import defaults
+from pytest_celery.api.containers.redis import RedisContainer
 from pytest_celery.components.backend.redis.api import RedisTestBackend
-from pytest_celery.containers.redis import RedisContainer
 
 
 @pytest.fixture

src/pytest_celery/components/broker/rabbitmq/fixtures.py

@@ -7,8 +7,8 @@
 from pytest_docker_tools import fxtr
 
 from pytest_celery import defaults
+from pytest_celery.api.containers.rabbitmq import RabbitMQContainer
 from pytest_celery.components.broker.rabbitmq.api import RabbitMQTestBroker
-from pytest_celery.containers.rabbitmq import RabbitMQContainer
 
 
 @pytest.fixture

src/pytest_celery/components/broker/redis/fixtures.py

@@ -7,8 +7,8 @@
 from pytest_docker_tools import fxtr
 
 from pytest_celery import defaults
+from pytest_celery.api.containers.redis import RedisContainer
 from pytest_celery.components.broker.redis.api import RedisTestBroker
-from pytest_celery.containers.redis import RedisContainer
 
 
 @pytest.fixture

src/pytest_celery/components/worker/fixtures.py

@@ -10,8 +10,8 @@
 from pytest_docker_tools import volume
 
 from pytest_celery import defaults
+from pytest_celery.api.containers.worker import CeleryWorkerContainer
 from pytest_celery.api.worker import CeleryTestWorker
-from pytest_celery.containers.worker import CeleryWorkerContainer
 
 
 @pytest.fixture

tests/conftest.py

@@ -7,8 +7,8 @@
 from pytest_docker_tools import fxtr
 
 from pytest_celery import defaults
+from pytest_celery.api.containers.worker import CeleryWorkerContainer
 from pytest_celery.api.worker import CeleryTestWorker
-from pytest_celery.containers.worker import CeleryWorkerContainer
 
 
 class Celery4WorkerContainer(CeleryWorkerContainer):

tests/integration/api/test_worker.py

@@ -5,7 +5,7 @@
 from pytest_celery import CeleryTestWorker
 from pytest_celery import CeleryWorkerCluster
 from pytest_celery import defaults
-from pytest_celery.containers.worker import CeleryWorkerContainer
+from pytest_celery.api.containers.worker import CeleryWorkerContainer
 
 
 @pytest.mark.parametrize("node", [lazy_fixture(defaults.CELERY_WORKER)])

tests/integration/conftest.py

@@ -7,7 +7,7 @@
 from pytest_docker_tools import fxtr
 
 from pytest_celery import defaults
-from pytest_celery.containers.worker import CeleryWorkerContainer
+from pytest_celery.api.containers.worker import CeleryWorkerContainer
 
 
 class IntegrationWorkerContainer(CeleryWorkerContainer):

tests/integration/setup/custom/conftest.py

@@ -5,9 +5,9 @@
 from pytest_docker_tools import fxtr
 
 from pytest_celery import defaults
+from pytest_celery.api.containers.worker import CeleryWorkerContainer
 from pytest_celery.api.worker import CeleryTestWorker
 from pytest_celery.api.worker import CeleryWorkerCluster
-from pytest_celery.containers.worker import CeleryWorkerContainer
 from tests.conftest import Celery5WorkerContainer
 
 

tests/smoke/conftest.py

@@ -7,7 +7,7 @@
 from pytest_docker_tools import fxtr
 
 from pytest_celery import defaults
-from pytest_celery.containers.worker import CeleryWorkerContainer
+from pytest_celery.api.containers.worker import CeleryWorkerContainer
 
 
 @pytest.fixture

tests/smoke/test_failover.py

@@ -7,8 +7,8 @@
 from pytest_celery import CeleryTestSetup
 from pytest_celery import defaults
 from pytest_celery.api.broker import CeleryBrokerCluster
+from pytest_celery.api.containers.rabbitmq import RabbitMQContainer
 from pytest_celery.components.broker.rabbitmq.api import RabbitMQTestBroker
-from pytest_celery.containers.rabbitmq import RabbitMQContainer
 from tests.tasks import identity
 
 failover_broker = container(

tests/unit/conftest.py

@@ -11,13 +11,13 @@
 from pytest_docker_tools import volume
 
 from pytest_celery import defaults
+from pytest_celery.api.containers.rabbitmq import RabbitMQContainer
+from pytest_celery.api.containers.redis import RedisContainer
+from pytest_celery.api.containers.worker import CeleryWorkerContainer
 from pytest_celery.api.worker import CeleryTestWorker
 from pytest_celery.components.backend.redis.api import RedisTestBackend
 from pytest_celery.components.broker.rabbitmq.api import RabbitMQTestBroker
 from pytest_celery.components.broker.redis.api import RedisTestBroker
-from pytest_celery.containers.rabbitmq import RabbitMQContainer
-from pytest_celery.containers.redis import RedisContainer
-from pytest_celery.containers.worker import CeleryWorkerContainer
 from tests.unit.docker.api import UnitTestContainer
 from tests.unit.docker.api import UnitWorkerContainer
 

tests/unit/docker/api.py

@@ -1,7 +1,7 @@
 from typing import Any
 
 from pytest_celery import CeleryTestContainer
-from pytest_celery.containers.worker import CeleryWorkerContainer
+from pytest_celery.api.containers.worker import CeleryWorkerContainer
 
 
 class UnitTestContainer(CeleryTestContainer):