celery · stegayet · May 11, 2023 · May 16, 2023
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,4 @@
 [tool:pytest]
-testpaths = t/unit/
 python_classes = test_*
 
 [build_sphinx]
@@ -27,12 +26,12 @@ files =
     kombu/abstract.py,
     kombu/utils/time.py,
     kombu/utils/uuid.py,
-    t/unit/utils/test_uuid.py,
+    tests/unit/utils/test_uuid.py,
     kombu/utils/text.py,
     kombu/exceptions.py,
-    t/unit/test_exceptions.py,
+    tests/unit/test_exceptions.py,
     kombu/clocks.py,
-    t/unit/test_clocks.py,
+    tests/unit/test_clocks.py,
     kombu/__init__.py,
     kombu/asynchronous/__init__.py,
     kombu/asynchronous/aws/__init__.py,

diff --git a/setup.py b/setup.py
@@ -5,7 +5,6 @@
 import re
 import sys
 
-import setuptools
 from setuptools import setup
 
 # -- Parse meta
@@ -82,7 +81,6 @@ def readme():
 
 setup(
     name='kombu',
-    packages=setuptools.find_packages(exclude=['t', 't.*']),
     version=meta['version'],
     description=meta['doc'],
     keywords='messaging message amqp rabbitmq redis actor producer consumer',

diff --git a/t/__init__.py → tests/__init__.py b/t/__init__.py → tests/__init__.py
diff --git a/t/integration/__init__.py → tests/integration/__init__.py b/t/integration/__init__.py → tests/integration/__init__.py
diff --git a/t/integration/common.py → tests/integration/common.py b/t/integration/common.py → tests/integration/common.py
diff --git a/t/integration/test_kafka.py → tests/integration/test_kafka.py b/t/integration/test_kafka.py → tests/integration/test_kafka.py
diff --git a/t/integration/test_mongodb.py → tests/integration/test_mongodb.py b/t/integration/test_mongodb.py → tests/integration/test_mongodb.py
diff --git a/t/integration/test_py_amqp.py → tests/integration/test_py_amqp.py b/t/integration/test_py_amqp.py → tests/integration/test_py_amqp.py
diff --git a/t/integration/test_redis.py → tests/integration/test_redis.py b/t/integration/test_redis.py → tests/integration/test_redis.py
diff --git a/t/mocks.py → tests/mocks.py b/t/mocks.py → tests/mocks.py
diff --git a/t/skip.py → tests/skip.py b/t/skip.py → tests/skip.py
diff --git a/t/unit/__init__.py → tests/unit/__init__.py b/t/unit/__init__.py → tests/unit/__init__.py
diff --git a/t/unit/asynchronous/__init__.py → tests/unit/asynchronous/__init__.py b/t/unit/asynchronous/__init__.py → tests/unit/asynchronous/__init__.py
diff --git a/t/unit/asynchronous/aws/__init__.py → tests/unit/asynchronous/aws/__init__.py b/t/unit/asynchronous/aws/__init__.py → tests/unit/asynchronous/aws/__init__.py
diff --git a/t/unit/asynchronous/aws/case.py → tests/unit/asynchronous/aws/case.py b/t/unit/asynchronous/aws/case.py → tests/unit/asynchronous/aws/case.py
@@ -2,13 +2,13 @@
 
 import pytest
 
-import t.skip
+import tests.skip
 
 pytest.importorskip('boto3')
 pytest.importorskip('pycurl')
 
 
-@t.skip.if_pypy
+@tests.skip.if_pypy
 @pytest.mark.usefixtures('hub')
 class AWSCase:
     pass
diff --git a/t/unit/asynchronous/aws/sqs/__init__.py → tests/unit/asynchronous/aws/sqs/__init__.py b/t/unit/asynchronous/aws/sqs/__init__.py → tests/unit/asynchronous/aws/sqs/__init__.py
diff --git a/...t/asynchronous/aws/sqs/test_connection.py → ...t/asynchronous/aws/sqs/test_connection.py b/...t/asynchronous/aws/sqs/test_connection.py → ...t/asynchronous/aws/sqs/test_connection.py
@@ -7,7 +7,7 @@
 from kombu.asynchronous.aws.sqs.message import AsyncMessage
 from kombu.asynchronous.aws.sqs.queue import AsyncQueue
 from kombu.utils.uuid import uuid
-from t.mocks import PromiseMock
+from tests.mocks import PromiseMock
 
 from ..case import AWSCase
 

diff --git a/t/unit/asynchronous/aws/sqs/test_queue.py → ...s/unit/asynchronous/aws/sqs/test_queue.py b/t/unit/asynchronous/aws/sqs/test_queue.py → ...s/unit/asynchronous/aws/sqs/test_queue.py
@@ -6,7 +6,7 @@
 
 from kombu.asynchronous.aws.sqs.message import AsyncMessage
 from kombu.asynchronous.aws.sqs.queue import AsyncQueue
-from t.mocks import PromiseMock
+from tests.mocks import PromiseMock
 
 from ..case import AWSCase
 

diff --git a/t/unit/asynchronous/aws/test_aws.py → tests/unit/asynchronous/aws/test_aws.py b/t/unit/asynchronous/aws/test_aws.py → tests/unit/asynchronous/aws/test_aws.py
diff --git a/t/unit/asynchronous/aws/test_connection.py → .../unit/asynchronous/aws/test_connection.py b/t/unit/asynchronous/aws/test_connection.py → .../unit/asynchronous/aws/test_connection.py
@@ -14,7 +14,7 @@
                                                AsyncHTTPSConnection)
 from kombu.asynchronous.aws.ext import boto3
 from kombu.exceptions import HttpError
-from t.mocks import PromiseMock
+from tests.mocks import PromiseMock
 
 from .case import AWSCase
 

diff --git a/t/unit/asynchronous/http/__init__.py → tests/unit/asynchronous/http/__init__.py b/t/unit/asynchronous/http/__init__.py → tests/unit/asynchronous/http/__init__.py
diff --git a/t/unit/asynchronous/http/test_curl.py → tests/unit/asynchronous/http/test_curl.py b/t/unit/asynchronous/http/test_curl.py → tests/unit/asynchronous/http/test_curl.py
@@ -5,13 +5,13 @@
 
 import pytest
 
-import t.skip
+import tests.skip
 from kombu.asynchronous.http.curl import READ, WRITE, CurlClient
 
 pytest.importorskip('pycurl')
 
 
-@t.skip.if_pypy
+@tests.skip.if_pypy
 @pytest.mark.usefixtures('hub')
 class test_CurlClient:
 

diff --git a/t/unit/asynchronous/http/test_http.py → tests/unit/asynchronous/http/test_http.py b/t/unit/asynchronous/http/test_http.py → tests/unit/asynchronous/http/test_http.py
@@ -6,11 +6,11 @@
 import pytest
 from vine import promise
 
-import t.skip
+import tests.skip
 from kombu.asynchronous import http
 from kombu.asynchronous.http.base import BaseClient, normalize_header
 from kombu.exceptions import HttpError
-from t.mocks import PromiseMock
+from tests.mocks import PromiseMock
 
 
 class test_Headers:
@@ -143,7 +143,7 @@ def test_as_context(self):
         c.close.assert_called_with()
 
 
-@t.skip.if_pypy
+@tests.skip.if_pypy
 class test_Client:
 
     def test_get_client(self, hub):

diff --git a/t/unit/asynchronous/test_hub.py → tests/unit/asynchronous/test_hub.py b/t/unit/asynchronous/test_hub.py → tests/unit/asynchronous/test_hub.py
diff --git a/t/unit/asynchronous/test_semaphore.py → tests/unit/asynchronous/test_semaphore.py b/t/unit/asynchronous/test_semaphore.py → tests/unit/asynchronous/test_semaphore.py
diff --git a/t/unit/asynchronous/test_timer.py → tests/unit/asynchronous/test_timer.py b/t/unit/asynchronous/test_timer.py → tests/unit/asynchronous/test_timer.py
diff --git a/t/unit/conftest.py → tests/unit/conftest.py b/t/unit/conftest.py → tests/unit/conftest.py
diff --git a/t/unit/test_clocks.py → tests/unit/test_clocks.py b/t/unit/test_clocks.py → tests/unit/test_clocks.py
diff --git a/t/unit/test_common.py → tests/unit/test_common.py b/t/unit/test_common.py → tests/unit/test_common.py
@@ -11,7 +11,7 @@
 from kombu.common import (PREFETCH_COUNT_MAX, Broadcast, QoS, collect_replies,
                           declaration_cached, generate_oid, ignore_errors,
                           maybe_declare, send_reply)
-from t.mocks import ContextMock, MockPool
+from tests.mocks import ContextMock, MockPool
 
 if TYPE_CHECKING:
     from types import TracebackType

diff --git a/t/unit/test_compat.py → tests/unit/test_compat.py b/t/unit/test_compat.py → tests/unit/test_compat.py
@@ -5,7 +5,7 @@
 import pytest
 
 from kombu import Connection, Exchange, Queue, compat
-from t.mocks import Channel, Transport
+from tests.mocks import Channel, Transport
 
 
 class test_misc:

diff --git a/t/unit/test_compression.py → tests/unit/test_compression.py b/t/unit/test_compression.py → tests/unit/test_compression.py
diff --git a/t/unit/test_connection.py → tests/unit/test_connection.py b/t/unit/test_connection.py → tests/unit/test_connection.py
@@ -11,7 +11,7 @@
 from kombu.connection import Resource
 from kombu.exceptions import OperationalError
 from kombu.utils.functional import lazy
-from t.mocks import TimeoutingTransport, Transport
+from tests.mocks import TimeoutingTransport, Transport
 
 
 class test_connection_utils:

diff --git a/t/unit/test_entity.py → tests/unit/test_entity.py b/t/unit/test_entity.py → tests/unit/test_entity.py
@@ -9,7 +9,7 @@
 from kombu.abstract import MaybeChannelBound
 from kombu.exceptions import NotBoundError
 from kombu.serialization import registry
-from t.mocks import Transport
+from tests.mocks import Transport
 
 
 def get_conn() -> Connection:

diff --git a/t/unit/test_exceptions.py → tests/unit/test_exceptions.py b/t/unit/test_exceptions.py → tests/unit/test_exceptions.py
diff --git a/t/unit/test_log.py → tests/unit/test_log.py b/t/unit/test_log.py → tests/unit/test_log.py
diff --git a/t/unit/test_matcher.py → tests/unit/test_matcher.py b/t/unit/test_matcher.py → tests/unit/test_matcher.py
diff --git a/t/unit/test_message.py → tests/unit/test_message.py b/t/unit/test_message.py → tests/unit/test_message.py
diff --git a/t/unit/test_messaging.py → tests/unit/test_messaging.py b/t/unit/test_messaging.py → tests/unit/test_messaging.py
@@ -11,7 +11,7 @@
 from kombu.exceptions import MessageStateError
 from kombu.utils import json
 from kombu.utils.functional import ChannelPromise
-from t.mocks import Transport
+from tests.mocks import Transport
 
 
 class test_Producer:

diff --git a/t/unit/test_mixins.py → tests/unit/test_mixins.py b/t/unit/test_mixins.py → tests/unit/test_mixins.py
@@ -6,7 +6,7 @@
 import pytest
 
 from kombu.mixins import ConsumerMixin
-from t.mocks import ContextMock
+from tests.mocks import ContextMock
 
 
 def Message(body, content_type='text/plain', content_encoding='utf-8'):

diff --git a/t/unit/test_pidbox.py → tests/unit/test_pidbox.py b/t/unit/test_pidbox.py → tests/unit/test_pidbox.py
diff --git a/t/unit/test_pools.py → tests/unit/test_pools.py b/t/unit/test_pools.py → tests/unit/test_pools.py
diff --git a/t/unit/test_serialization.py → tests/unit/test_serialization.py b/t/unit/test_serialization.py → tests/unit/test_serialization.py
@@ -7,7 +7,7 @@
 
 import pytest
 
-import t.skip
+import tests.skip
 from kombu.exceptions import ContentDisallowed, DecodeError, EncodeError
 from kombu.serialization import (SerializerNotInstalled,
                                  disable_insecure_serializers, dumps,
@@ -193,7 +193,7 @@ def test_json_dumps(self):
         )
         assert a == b
 
-    @t.skip.if_pypy
+    @tests.skip.if_pypy
     def test_msgpack_loads(self):
         register_msgpack()
         pytest.importorskip('msgpack')
@@ -202,7 +202,7 @@ def test_msgpack_loads(self):
                     content_encoding='binary')
         assert res == msgpack_py_data
 
-    @t.skip.if_pypy
+    @tests.skip.if_pypy
     def test_msgpack_dumps(self):
         pytest.importorskip('msgpack')
         register_msgpack()

diff --git a/t/unit/test_simple.py → tests/unit/test_simple.py b/t/unit/test_simple.py → tests/unit/test_simple.py
diff --git a/t/unit/transport/__init__.py → tests/unit/transport/__init__.py b/t/unit/transport/__init__.py → tests/unit/transport/__init__.py
diff --git a/t/unit/transport/test_SQS.py → tests/unit/transport/test_SQS.py b/t/unit/transport/test_SQS.py → tests/unit/transport/test_SQS.py
diff --git a/t/unit/transport/test_azureservicebus.py → tests/unit/transport/test_azureservicebus.py b/t/unit/transport/test_azureservicebus.py → tests/unit/transport/test_azureservicebus.py
diff --git a/t/unit/transport/test_azurestoragequeues.py → ...unit/transport/test_azurestoragequeues.py b/t/unit/transport/test_azurestoragequeues.py → ...unit/transport/test_azurestoragequeues.py
diff --git a/t/unit/transport/test_base.py → tests/unit/transport/test_base.py b/t/unit/transport/test_base.py → tests/unit/transport/test_base.py
diff --git a/t/unit/transport/test_consul.py → tests/unit/transport/test_consul.py b/t/unit/transport/test_consul.py → tests/unit/transport/test_consul.py
diff --git a/t/unit/transport/test_etcd.py → tests/unit/transport/test_etcd.py b/t/unit/transport/test_etcd.py → tests/unit/transport/test_etcd.py
diff --git a/t/unit/transport/test_filesystem.py → tests/unit/transport/test_filesystem.py b/t/unit/transport/test_filesystem.py → tests/unit/transport/test_filesystem.py
@@ -7,11 +7,11 @@
 
 import pytest
 
-import t.skip
+import tests.skip
 from kombu import Connection, Consumer, Exchange, Producer, Queue
 
 
-@t.skip.if_win32
+@tests.skip.if_win32
 class test_FilesystemTransport:
 
     def setup(self):
@@ -145,7 +145,7 @@ def callback2(message_data, message):
         assert self.q2(consumer_channel).get() is None
 
 
-@t.skip.if_win32
+@tests.skip.if_win32
 class test_FilesystemFanout:
     def setup(self):
         try:
@@ -238,7 +238,7 @@ def callback2(message_data, message):
         assert self.q2(self.consume_channel).get() is None
 
 
-@t.skip.if_win32
+@tests.skip.if_win32
 class test_FilesystemLock:
     def setup(self):
         try:

diff --git a/t/unit/transport/test_librabbitmq.py → tests/unit/transport/test_librabbitmq.py b/t/unit/transport/test_librabbitmq.py → tests/unit/transport/test_librabbitmq.py
diff --git a/t/unit/transport/test_memory.py → tests/unit/transport/test_memory.py b/t/unit/transport/test_memory.py → tests/unit/transport/test_memory.py
diff --git a/t/unit/transport/test_mongodb.py → tests/unit/transport/test_mongodb.py b/t/unit/transport/test_mongodb.py → tests/unit/transport/test_mongodb.py
diff --git a/t/unit/transport/test_pyamqp.py → tests/unit/transport/test_pyamqp.py b/t/unit/transport/test_pyamqp.py → tests/unit/transport/test_pyamqp.py
diff --git a/t/unit/transport/test_pyro.py → tests/unit/transport/test_pyro.py b/t/unit/transport/test_pyro.py → tests/unit/transport/test_pyro.py
diff --git a/t/unit/transport/test_qpid.py → tests/unit/transport/test_qpid.py b/t/unit/transport/test_qpid.py → tests/unit/transport/test_qpid.py
diff --git a/t/unit/transport/test_redis.py → tests/unit/transport/test_redis.py b/t/unit/transport/test_redis.py → tests/unit/transport/test_redis.py
diff --git a/t/unit/transport/test_sqlalchemy.py → tests/unit/transport/test_sqlalchemy.py b/t/unit/transport/test_sqlalchemy.py → tests/unit/transport/test_sqlalchemy.py
diff --git a/t/unit/transport/test_transport.py → tests/unit/transport/test_transport.py b/t/unit/transport/test_transport.py → tests/unit/transport/test_transport.py
diff --git a/t/unit/transport/test_zookeeper.py → tests/unit/transport/test_zookeeper.py b/t/unit/transport/test_zookeeper.py → tests/unit/transport/test_zookeeper.py
diff --git a/t/unit/transport/virtual/__init__.py → tests/unit/transport/virtual/__init__.py b/t/unit/transport/virtual/__init__.py → tests/unit/transport/virtual/__init__.py
diff --git a/t/unit/transport/virtual/test_base.py → tests/unit/transport/virtual/test_base.py b/t/unit/transport/virtual/test_base.py → tests/unit/transport/virtual/test_base.py
diff --git a/t/unit/transport/virtual/test_exchange.py → ...s/unit/transport/virtual/test_exchange.py b/t/unit/transport/virtual/test_exchange.py → ...s/unit/transport/virtual/test_exchange.py
@@ -6,7 +6,7 @@
 
 from kombu import Connection
 from kombu.transport.virtual import exchange
-from t.mocks import Transport
+from tests.mocks import Transport
 
 
 class ExchangeCase:

diff --git a/t/unit/utils/__init__.py → tests/unit/utils/__init__.py b/t/unit/utils/__init__.py → tests/unit/utils/__init__.py
diff --git a/t/unit/utils/test_amq_manager.py → tests/unit/utils/test_amq_manager.py b/t/unit/utils/test_amq_manager.py → tests/unit/utils/test_amq_manager.py
diff --git a/t/unit/utils/test_compat.py → tests/unit/utils/test_compat.py b/t/unit/utils/test_compat.py → tests/unit/utils/test_compat.py
diff --git a/t/unit/utils/test_debug.py → tests/unit/utils/test_debug.py b/t/unit/utils/test_debug.py → tests/unit/utils/test_debug.py
diff --git a/t/unit/utils/test_div.py → tests/unit/utils/test_div.py b/t/unit/utils/test_div.py → tests/unit/utils/test_div.py
diff --git a/t/unit/utils/test_encoding.py → tests/unit/utils/test_encoding.py b/t/unit/utils/test_encoding.py → tests/unit/utils/test_encoding.py
diff --git a/t/unit/utils/test_functional.py → tests/unit/utils/test_functional.py b/t/unit/utils/test_functional.py → tests/unit/utils/test_functional.py
diff --git a/t/unit/utils/test_imports.py → tests/unit/utils/test_imports.py b/t/unit/utils/test_imports.py → tests/unit/utils/test_imports.py
diff --git a/t/unit/utils/test_json.py → tests/unit/utils/test_json.py b/t/unit/utils/test_json.py → tests/unit/utils/test_json.py
diff --git a/t/unit/utils/test_objects.py → tests/unit/utils/test_objects.py b/t/unit/utils/test_objects.py → tests/unit/utils/test_objects.py
diff --git a/t/unit/utils/test_scheduling.py → tests/unit/utils/test_scheduling.py b/t/unit/utils/test_scheduling.py → tests/unit/utils/test_scheduling.py
diff --git a/t/unit/utils/test_time.py → tests/unit/utils/test_time.py b/t/unit/utils/test_time.py → tests/unit/utils/test_time.py
diff --git a/t/unit/utils/test_url.py → tests/unit/utils/test_url.py b/t/unit/utils/test_url.py → tests/unit/utils/test_url.py
diff --git a/t/unit/utils/test_utils.py → tests/unit/utils/test_utils.py b/t/unit/utils/test_utils.py → tests/unit/utils/test_utils.py
diff --git a/t/unit/utils/test_uuid.py → tests/unit/utils/test_uuid.py b/t/unit/utils/test_uuid.py → tests/unit/utils/test_uuid.py
diff --git a/tox.ini b/tox.ini
@@ -33,11 +33,11 @@ deps=
     flake8,pydocstyle,mypy: -r{toxinidir}/requirements/pkgutils.txt
 
 commands =
-    unit: python -bb -m pytest -rxs -xv --cov=kombu --cov-report=xml --no-cov-on-fail {posargs}
-    integration-py-amqp: pytest -xv -E py-amqp t/integration {posargs:-n2}
-    integration-redis: pytest -xv -E redis t/integration {posargs:-n2}
-    integration-mongodb: pytest -xv -E mongodb t/integration {posargs:-n2}
-    integration-kafka: pytest -xv -E kafka t/integration {posargs:-n2}
+    unit: python -bb -m pytest tests/unit -rxs -xv --cov=kombu --cov-report=xml --no-cov-on-fail {posargs}
+    integration-py-amqp: pytest -xv -E py-amqp tests/integration {posargs:-n2}
+    integration-redis: pytest -xv -E redis tests/integration {posargs:-n2}
+    integration-mongodb: pytest -xv -E mongodb tests/integration {posargs:-n2}
+    integration-kafka: pytest -xv -E kafka tests/integration {posargs:-n2}
 
 basepython =
     pypy3.9: pypy3.9
@@ -124,7 +124,7 @@ commands = pip install -U -r{toxinidir}/requirements/dev.txt
 
 [testenv:flake8]
 commands =
-    flake8 -j2 {toxinidir}/kombu {toxinidir}/t
+    flake8 -j2 {toxinidir}/kombu {toxinidir}/tests
 
 [testenv:pydocstyle]
 commands =