opbeat · blueyed · Jul 25, 2017 · Jul 26, 2017 · Jul 26, 2017
diff --git 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
@@ -16,16 +16,13 @@ Logbook
 MarkupSafe
 WebOb
 Werkzeug
-amqp==1.4.9
 anyjson
 argparse
 billiard
 blinker>=1.1
 boto3
-celery<4
 greenlet
 itsdangerous
-kombu<4
 mock
 msgpack-python
 pep8

diff --git a/test_requirements/requirements-django-1.10.txt b/test_requirements/requirements-django-1.10.txt
@@ -1,3 +1,3 @@
 Django>=1.10,<1.11
-django-celery
+celery
 -r requirements-base.txt
diff --git a/test_requirements/requirements-django-1.11.txt b/test_requirements/requirements-django-1.11.txt
@@ -1,3 +1,3 @@
 Django>=1.11b1,<1.12
-django-celery
+celery
 -r requirements-base.txt
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,3 @@
 Django>=1.8.3,<1.9
-django-celery
+celery
 -r requirements-base.txt
diff --git a/test_requirements/requirements-django-1.9.txt b/test_requirements/requirements-django-1.9.txt
@@ -1,3 +1,3 @@
 Django>=1.9,<1.10
-django-celery
+celery
 -r requirements-base.txt
diff --git a/test_requirements/requirements-django-master.txt b/test_requirements/requirements-django-master.txt
@@ -1,3 +1,3 @@
 -e git://github.com/django/django.git@master#egg=Django
-django-celery
+celery
 -r requirements-base.txt
diff --git 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
@@ -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
@@ -1,2 +1,3 @@
 Flask>=0.12,<0.13
+celery
 -r requirements-base.txt