From a807b91b04066d4ded210a71e77db1314129fc1c Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Tue, 25 Jul 2017 17:56:50 +0200 Subject: [PATCH 1/3] tests: celery 4 by default; handle django-celery Only install django-celery for Django versions where it is actually used. This also requires to use Celery<4 there then [1]. 1: https://github.com/celery/django-celery/commit/4ed4067e94e141a37baa7b085906766fb162d676. --- setup.py | 1 - test_requirements/requirements-base.txt | 2 +- test_requirements/requirements-django-1.10.txt | 1 - test_requirements/requirements-django-1.11.txt | 1 - test_requirements/requirements-django-1.4.txt | 1 + test_requirements/requirements-django-1.5.txt | 1 + test_requirements/requirements-django-1.6.txt | 1 + test_requirements/requirements-django-1.7.txt | 1 + test_requirements/requirements-django-1.8.txt | 1 - test_requirements/requirements-django-1.9.txt | 1 - test_requirements/requirements-django-master.txt | 1 - 11 files changed, 5 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index e419a0a0..50b91451 100644 --- a/setup.py +++ b/setup.py @@ -64,7 +64,6 @@ def build_extension(self, ext): 'pytest-capturelog>=0.7', 'blinker>=1.1', 'celery', - 'django-celery', 'Flask>=0.8', 'logbook', 'mock', diff --git a/test_requirements/requirements-base.txt b/test_requirements/requirements-base.txt index e98a1521..d64420c3 100644 --- a/test_requirements/requirements-base.txt +++ b/test_requirements/requirements-base.txt @@ -22,7 +22,7 @@ argparse billiard blinker>=1.1 boto3 -celery<4 +celery greenlet itsdangerous kombu<4 diff --git a/test_requirements/requirements-django-1.10.txt b/test_requirements/requirements-django-1.10.txt index bbdf6e6d..ea34e8e3 100644 --- a/test_requirements/requirements-django-1.10.txt +++ b/test_requirements/requirements-django-1.10.txt @@ -1,3 +1,2 @@ Django>=1.10,<1.11 -django-celery -r requirements-base.txt diff --git a/test_requirements/requirements-django-1.11.txt b/test_requirements/requirements-django-1.11.txt index 1a6dc848..a1f165e9 100644 --- a/test_requirements/requirements-django-1.11.txt +++ b/test_requirements/requirements-django-1.11.txt @@ -1,3 +1,2 @@ Django>=1.11b1,<1.12 -django-celery -r requirements-base.txt diff --git a/test_requirements/requirements-django-1.4.txt b/test_requirements/requirements-django-1.4.txt index 2033d1c6..885a5034 100644 --- a/test_requirements/requirements-django-1.4.txt +++ b/test_requirements/requirements-django-1.4.txt @@ -1,3 +1,4 @@ Django>=1.4.21,<1.5 +celery<4 django-celery -r requirements-base.txt diff --git a/test_requirements/requirements-django-1.5.txt b/test_requirements/requirements-django-1.5.txt index b47445f8..63e2a036 100644 --- a/test_requirements/requirements-django-1.5.txt +++ b/test_requirements/requirements-django-1.5.txt @@ -1,3 +1,4 @@ Django>=1.5.12,<1.6 +celery<4 django-celery -r requirements-base.txt diff --git a/test_requirements/requirements-django-1.6.txt b/test_requirements/requirements-django-1.6.txt index 3fe20b2d..f3c22128 100644 --- a/test_requirements/requirements-django-1.6.txt +++ b/test_requirements/requirements-django-1.6.txt @@ -1,3 +1,4 @@ Django>=1.6.11,<1.7 +celery<4 django-celery -r requirements-base.txt diff --git a/test_requirements/requirements-django-1.7.txt b/test_requirements/requirements-django-1.7.txt index 4ac0729e..c77d75d3 100644 --- a/test_requirements/requirements-django-1.7.txt +++ b/test_requirements/requirements-django-1.7.txt @@ -1,3 +1,4 @@ Django>=1.7.9,<1.8 +celery<4 django-celery -r requirements-base.txt diff --git a/test_requirements/requirements-django-1.8.txt b/test_requirements/requirements-django-1.8.txt index ee1d2f68..6848c4b9 100644 --- a/test_requirements/requirements-django-1.8.txt +++ b/test_requirements/requirements-django-1.8.txt @@ -1,3 +1,2 @@ Django>=1.8.3,<1.9 -django-celery -r requirements-base.txt diff --git a/test_requirements/requirements-django-1.9.txt b/test_requirements/requirements-django-1.9.txt index 7537d809..042bcd66 100644 --- a/test_requirements/requirements-django-1.9.txt +++ b/test_requirements/requirements-django-1.9.txt @@ -1,3 +1,2 @@ Django>=1.9,<1.10 -django-celery -r requirements-base.txt diff --git a/test_requirements/requirements-django-master.txt b/test_requirements/requirements-django-master.txt index ad5ade18..dd54b19c 100644 --- a/test_requirements/requirements-django-master.txt +++ b/test_requirements/requirements-django-master.txt @@ -1,3 +1,2 @@ -e git://github.com/django/django.git@master#egg=Django -django-celery -r requirements-base.txt From 35cdd3ae5bb1a122265ac7980d3136b81b332f02 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 26 Jul 2017 13:35:32 +0200 Subject: [PATCH 2/3] fixup! tests: celery 4 by default; handle django-celery --- test_requirements/requirements-base.txt | 1 - test_requirements/requirements-django-1.10.txt | 1 + test_requirements/requirements-django-1.11.txt | 1 + test_requirements/requirements-django-1.8.txt | 1 + test_requirements/requirements-django-1.9.txt | 1 + test_requirements/requirements-django-master.txt | 1 + test_requirements/requirements-flask-0.10.txt | 1 + test_requirements/requirements-flask-0.11.txt | 1 + test_requirements/requirements-flask-0.12.txt | 1 + 9 files changed, 8 insertions(+), 1 deletion(-) diff --git a/test_requirements/requirements-base.txt b/test_requirements/requirements-base.txt index d64420c3..7a664367 100644 --- a/test_requirements/requirements-base.txt +++ b/test_requirements/requirements-base.txt @@ -22,7 +22,6 @@ argparse billiard blinker>=1.1 boto3 -celery greenlet itsdangerous kombu<4 diff --git a/test_requirements/requirements-django-1.10.txt b/test_requirements/requirements-django-1.10.txt index ea34e8e3..606d7e0a 100644 --- a/test_requirements/requirements-django-1.10.txt +++ b/test_requirements/requirements-django-1.10.txt @@ -1,2 +1,3 @@ Django>=1.10,<1.11 +celery -r requirements-base.txt diff --git a/test_requirements/requirements-django-1.11.txt b/test_requirements/requirements-django-1.11.txt index a1f165e9..e0f2860a 100644 --- a/test_requirements/requirements-django-1.11.txt +++ b/test_requirements/requirements-django-1.11.txt @@ -1,2 +1,3 @@ Django>=1.11b1,<1.12 +celery -r requirements-base.txt diff --git a/test_requirements/requirements-django-1.8.txt b/test_requirements/requirements-django-1.8.txt index 6848c4b9..24476781 100644 --- a/test_requirements/requirements-django-1.8.txt +++ b/test_requirements/requirements-django-1.8.txt @@ -1,2 +1,3 @@ Django>=1.8.3,<1.9 +celery -r requirements-base.txt diff --git a/test_requirements/requirements-django-1.9.txt b/test_requirements/requirements-django-1.9.txt index 042bcd66..ca7bab20 100644 --- a/test_requirements/requirements-django-1.9.txt +++ b/test_requirements/requirements-django-1.9.txt @@ -1,2 +1,3 @@ Django>=1.9,<1.10 +celery -r requirements-base.txt diff --git a/test_requirements/requirements-django-master.txt b/test_requirements/requirements-django-master.txt index dd54b19c..6df5b519 100644 --- a/test_requirements/requirements-django-master.txt +++ b/test_requirements/requirements-django-master.txt @@ -1,2 +1,3 @@ -e git://github.com/django/django.git@master#egg=Django +celery -r requirements-base.txt diff --git a/test_requirements/requirements-flask-0.10.txt b/test_requirements/requirements-flask-0.10.txt index 0e664d72..df311e83 100644 --- a/test_requirements/requirements-flask-0.10.txt +++ b/test_requirements/requirements-flask-0.10.txt @@ -1,2 +1,3 @@ Flask>=0.10,<0.11 +celery -r requirements-base.txt diff --git a/test_requirements/requirements-flask-0.11.txt b/test_requirements/requirements-flask-0.11.txt index a34119c1..357467e1 100644 --- a/test_requirements/requirements-flask-0.11.txt +++ b/test_requirements/requirements-flask-0.11.txt @@ -1,2 +1,3 @@ Flask>=0.11,<0.12 +celery -r requirements-base.txt diff --git a/test_requirements/requirements-flask-0.12.txt b/test_requirements/requirements-flask-0.12.txt index 65d69cb7..9bbd7634 100644 --- a/test_requirements/requirements-flask-0.12.txt +++ b/test_requirements/requirements-flask-0.12.txt @@ -1,2 +1,3 @@ Flask>=0.12,<0.13 +celery -r requirements-base.txt From 53a970b4a5f9c731b008debea17bd6004fc2ee9b Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 26 Jul 2017 13:46:33 +0200 Subject: [PATCH 3/3] Let celery handle its kombu/amqp dependencies --- test_requirements/requirements-base.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/test_requirements/requirements-base.txt b/test_requirements/requirements-base.txt index 7a664367..858838d0 100644 --- a/test_requirements/requirements-base.txt +++ b/test_requirements/requirements-base.txt @@ -16,7 +16,6 @@ Logbook MarkupSafe WebOb Werkzeug -amqp==1.4.9 anyjson argparse billiard @@ -24,7 +23,6 @@ blinker>=1.1 boto3 greenlet itsdangerous -kombu<4 mock msgpack-python pep8