From 9a6c2923e859b6993227605610255bd632c1ae68 Mon Sep 17 00:00:00 2001
From: Thomas Grainger <tagrain@gmail.com>
Date: Wed, 5 Aug 2020 12:32:34 +0100
Subject: [PATCH] do not enable celery.contrib.pytest by default

Fixes #6280
---
 requirements/extras/pytest.txt | 1 +
 requirements/test.txt          | 1 +
 setup.py                       | 5 +----
 3 files changed, 3 insertions(+), 4 deletions(-)
 create mode 100644 requirements/extras/pytest.txt

diff --git a/requirements/extras/pytest.txt b/requirements/extras/pytest.txt
new file mode 100644
index 00000000000..8e0e5f3471b
--- /dev/null
+++ b/requirements/extras/pytest.txt
@@ -0,0 +1 @@
+pytest-celery
diff --git a/requirements/test.txt b/requirements/test.txt
index 755905cbb55..fd0ba172f90 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -1,6 +1,7 @@
 case>=1.3.1
 pytest~=4.6; python_version < '3.0'
 pytest~=6.0; python_version >= '3.0'
+pytest-celery
 pytest-timeout~=1.4.2
 boto3>=1.9.178
 python-dateutil<2.8.1,>=2.1; python_version < '3.0'
diff --git a/setup.py b/setup.py
index f0b45858a4c..f3abf671b23 100644
--- a/setup.py
+++ b/setup.py
@@ -213,10 +213,7 @@ def run_tests(self):
     entry_points={
         'console_scripts': [
             'celery = celery.__main__:main',
-        ],
-        'pytest11': [
-            'celery = celery.contrib.pytest',
-        ],
+        ]
     },
     project_urls={
         "Documentation": "http://docs.celeryproject.org/en/latest/index.html",