Upgrade Deps and add testing for Celery 5

Cargo.toml

@@ -31,7 +31,7 @@ classifier = [
     "Programming Language :: Python :: 3 :: Only",
     "Operating System :: OS Independent"
 ]
-requires-dist = ["click>=7", "celery>=4,<5", "prometheus_client>=0.0.20"]
+requires-dist = ["click>=7", "celery>=4,<6", "prometheus_client>=0.0.20"]
 
 [package.metadata.maturin.scripts]
 celery-exporter = "celery_exporter.__main__:main"

Dockerfile

@@ -48,7 +48,7 @@ WORKDIR /app/
 COPY --from=build-rs /src/wheelhouse/ /app/wheelhouse/
 
 COPY requirements/ ./requirements
-RUN pip install -r ./requirements/requirements.txt
+RUN pip install -r ./requirements/requirements_celery4.txt
 
 RUN pip install wheelhouse/*
 

requirements/base.txt

@@ -1,3 +1,3 @@
-Click==7.0
-prometheus-client==0.7.0
-redis==3.2.0
+click==7.1.2
+prometheus-client==0.10.1
+redis==3.5.3

requirements/requirements_celery.txt

@@ -0,0 +1,3 @@
+-r base.txt
+billiard==3.6.4.0
+pytz==2021.1

requirements/requirements_celery4.txt

@@ -0,0 +1,4 @@
+-r requirements_celery.txt
+celery==4.4.7
+kombu==4.6.11
+vine==1.3.0

requirements/requirements_celery5.txt

@@ -0,0 +1,4 @@
+-r requirements_celery.txt
+celery==5.0.5
+kombu==5.0.2
+vine==5.0.0

requirements/requirements_test.txt

@@ -1,4 +1,4 @@
--r base.txt
+-r requirements_celery.txt
 astroid==2.2.5
 atomicwrites==1.3.0
 attrs==19.1.0

test/test_func.py

@@ -4,6 +4,7 @@
 import celery
 import celery_exporter.monitor
 from celery_exporter.core import CeleryExporter
+from celery.app.control import Inspect
 
 prom_http_server_mock = MagicMock(return_value=None)
 setup_metrics_mock = MagicMock(return_value=None)
@@ -12,7 +13,7 @@
 event_thread_mock = MagicMock(spec=celery_exporter.monitor.EnableEventsThread)
 
 
-@patch("celery.task.control.inspect.registered_tasks", {"worker1": [BaseTest.task]})
+@patch.object(Inspect, "registered_tasks", {"worker1": [BaseTest.task]})
 @patch(
     "celery_exporter.core.prometheus_client.start_http_server", prom_http_server_mock
 )

test/test_unit.py

@@ -24,8 +24,10 @@
 class TestMockedCelery(BaseTest):
     def setUp(self):
         self.app = get_celery_app()
-        with patch("celery.task.control.inspect.conf") as tasks:
-            with patch("celery.task.control.inspect.registered_tasks") as registered:
+        with patch.object(celery.app.control.Inspect, "conf") as tasks:
+            with patch.object(
+                celery.app.control.Inspect, "registered_tasks"
+            ) as registered:
                 tasks.return_value = {
                     "celery@d6f95e9e24fc": {
                         "task_routes": {"my_task": {}, "trial": {"queue": "deadbeef"}}

tox.ini

@@ -7,11 +7,12 @@ whitelist_externals = cargo
 deps =
     py36: black==19.3b0
     -rrequirements/requirements_test.txt
-    -rrequirements/requirements.txt
+    celery4: -rrequirements/requirements_celery4.txt
+    celery5: -rrequirements/requirements_celery5.txt
     maturin==0.8.3
 commands =
     py36: black . --check
-    maturin develop 
+    maturin develop
     coverage run -m py.test {toxinidir}/test/
     coverage report