Deprecate commands celeryd/celerybeat/celeryd-multi and remove commands celeryev/camqadm/celeryctl

celery/__main__.py

@@ -2,6 +2,20 @@ from __future__ import absolute_import
 
 import sys
 
+from os.path import basename
+
+DEPRECATED_FMT = """
+The {old!r} command is deprecated, please use {new!r} instead:
+
+$ {new_argv}
+
+"""
+
+
+def _warn_deprecated(new):
+    print(DEPRECATED_FMT.format(old=basename(sys.argv[0]), new=new,
+            new_argv=' '.join([new] + sys.argv[1:])))
+
 
 def maybe_patch_concurrency():
     from celery.platforms import maybe_patch_concurrency
@@ -16,18 +30,21 @@ def main():
 
 def _compat_worker():
     maybe_patch_concurrency()
+    _warn_deprecated('celery worker')
     from celery.bin.celeryd import main
     main()
 
 
 def _compat_multi():
     maybe_patch_concurrency()
+    _warn_deprecated('celery multi')
     from celery.bin.celeryd_multi import main
     main()
 
 
 def _compat_beat():
     maybe_patch_concurrency()
+    _warn_deprecated('celery beat')
     from celery.bin.celerybeat import main
     main()
 

requirements/extras/pyamqp.txt

@@ -1 +0,0 @@
-amqp>=0.9.4

setup.py

@@ -178,9 +178,6 @@ if CELERY_COMPAT_PROGRAMS:
     console_scripts.extend([
         'celeryd = celery.__main__:_compat_worker',
         'celerybeat = celery.__main__:_compat_beat',
-        'camqadm = celery.bin.camqadm:main',
-        'celeryev = celery.bin.celeryev:main',
-        'celeryctl = celery.bin.celeryctl:main',
         'celeryd-multi = celery.__main__:_compat_multi',
     ])