Merge branch 'buildoutpatch'

celery/bin/celerybeat.py

@@ -176,7 +176,9 @@ def parse_options(arguments):
     options, values = parser.parse_args(arguments)
     return options
 
-
-if __name__ == "__main__":
+def main():
     options = parse_options(sys.argv[1:])
     run_clockservice(**vars(options))
+
+if __name__ == "__main__":
+    main()

celery/bin/celeryd.py

@@ -275,7 +275,9 @@ def set_process_status(info):
         info = "%s (%s)" % (info, " ".join(sys.argv[arg_start:]))
     platform.set_mp_process_title("celeryd", info=info)
 
-
-if __name__ == "__main__":
+def main():
     options = parse_options(sys.argv[1:])
     run_worker(**vars(options))
+
+if __name__ == "__main__":
+    main()

setup.py

@@ -130,5 +130,12 @@ setup(
         "Topic :: System :: Distributed Computing",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
+    entry_points={
+        'console_scripts': [
+            'celeryd = celery.bin.celeryd:main',
+            'celeryinit = celery.bin.celeryinit:main',
+            'celerybeat = celery.bin.celerybeat:main'
+            ]
+    },
     long_description=long_description,
 )