Browse Source

Fix install_requires, extra_requires and README.rst

Ask Solem 15 years ago
parent
commit
27da872e4e
3 changed files with 11 additions and 7 deletions
  1. 1 0
      MANIFEST.in
  2. 1 0
      celery/messaging.py
  3. 9 7
      setup.py

+ 1 - 0
MANIFEST.in

@@ -1,6 +1,7 @@
 include AUTHORS
 include Changelog
 include README
+include README.rst
 include MANIFEST.in
 include LICENSE
 include TODO

+ 1 - 0
celery/messaging.py

@@ -18,6 +18,7 @@ class TaskPublisher(Publisher):
     exchange = conf.AMQP_EXCHANGE
     exchange_type = conf.AMQP_EXCHANGE_TYPE
     routing_key = conf.AMQP_PUBLISHER_ROUTING_KEY
+    serializer = "pickle"
     encoder = pickle.dumps
 
     def delay_task(self, task_name, task_args, task_kwargs, **kwargs):

+ 9 - 7
setup.py

@@ -40,7 +40,9 @@ class RunTests(Command):
         os.chdir(this_dir)
 
 
-install_requires = ["carrot"]
+install_requires = ["django-unittest-depth",
+                    "carrot>=0.5.0",
+                    "python-daemon"]
 py_version_info = sys.version_info
 py_major_version = py_version_info[0]
 py_minor_version = py_version_info[1]
@@ -48,8 +50,8 @@ py_minor_version = py_version_info[1]
 if (py_major_version == 2 and py_minor_version <=5) or py_major_version < 2:
     install_requires.append("multiprocessing")
 
-if os.path.exists("README"):
-    long_description = codecs.open("README", "r", "utf-8").read()
+if os.path.exists("README.rst"):
+    long_description = codecs.open("README.rst", "r", "utf-8").read()
 else:
     long_description = "See http://pypi.python.org/pypi/celery"
 
@@ -65,10 +67,10 @@ setup(
     packages=find_packages(exclude=['ez_setup']),
     scripts=["bin/celeryd"],
     zip_safe=False,
-    install_requires=[
-        'carrot>=0.4.5',
-        'python-daemon',
-    ],
+    install_requires=install_requires,
+    extra_requires={
+        "Tyrant": ["pytyrant"],
+    },
     cmdclass = {"test": RunTests},
     classifiers=[
         "Development Status :: 4 - Beta",