Commits

Anonymous committed 89f596f

Forgot to push to Bitbucket - sorry y'all.

Now targeting Celery Version 2.1.4

  • Participants
  • Parent commits b4fe673

Comments (0)

Files changed (6)

 Ordered by date of first contribution:
   Ian Schenck <ian.schenck@gmail.com>
   Jonathan Stasiak <jonathan.stasiak@gmail.com>
+
 .. contents::
    :local:
 
-.. _version-2.0.1:
+.. _version-2.1.4:
+
+2.1.4
+=====
+
+:release date: 18 January, 2011
+
+Fixes
+-----
+
+* Fixed Paster CeleryBeat and Celeryd Commands to reflect new module organization
+
+News
+----
+
+* Jonathan Stasiak will be taking over maintenance.
+
 
 2.0.1
 =====
 
+:release date: October 2010
+Throw celery-pylons in your setup.py.
 ===============================================
- celery-pylons - Celery Integration for Django 
+ celery-pylons - Celery Integration for Django
 ===============================================
 
 .. image:: http://bitbucket.org/ianschenck/celery-pylons/downloads/celery_pylons-03.png
 
-:Version: 2.0.1
-:Celery Version: 2.0.1 
-:Web: http://celeryproject.org 
-:Download: http://pypi.python.org/pypi/celery-pylons 
-:Source: http://bitbucket.org/ianschenck/celery-pylons 
+:Version: 2.1.4
+:Celery Version: 2.1.4
+:Web: http://celeryproject.org
+:Download: http://pypi.python.org/pypi/celery-pylons
+:Source: http://bitbucket.org/ianschenck/celery-pylons
 :Keywords: celery, pylons, task queue, job queue, asynchronous, rabbitmq, amqp, python, queue, distributed
 
 --
 
-celery-pylons provides Celery integration for pylons. 
+celery-pylons provides Celery integration for pylons.
 
 For more information please read the celery
 .. _`documentation`:http://celeryproject.org/ for more information

File celerypylons/commands.py

     def run(self, args):
         """
         Overrides Command.run
-        
+
         Checks for a config file argument and loads it.
         """
         if len(args) < self.min_args:
     parser = Command.standard_parser(quiet=True)
 
     def update_parser(self):
-        from celery.bin import celeryd
-        for x in celeryd.OPTION_LIST:
+        from celery.bin.celeryd import WorkerCommand
+        w = WorkerCommand()
+        for x in w.get_options():
             self.parser.add_option(x)
 
     def command(self):
-        from celery.bin import celeryd
-        return celeryd.run_worker(**vars(self.options))
+        from celery.apps import worker
+        return worker.run_worker(**vars(self.options))
 
 
 class CeleryBeatCommand(CeleryCommand):
     parser = Command.standard_parser(quiet=True)
 
     def update_parser(self):
-        from celery.bin import celerybeat
-        for x in celerybeat.OPTION_LIST:
-            self.parser.add_option(x)        
-        
+        from celery.bin.celerybeat import BeatCommand
+        beat = BeatCommand()
+        for x in beat.get_options():
+            self.parser.add_option(x)
+
     def command(self):
-        from celery.bin import celerybeat
-        return celerybeat.run_celerybeat(**vars(self.options))
-
+        from celery.apps import beat
+        return beat.run_celerybeat(**vars(self.options))
 
 class CAMQPAdminCommand(CeleryCommand):
     """CAMQP Admin
     description = "".join(__doc__.splitlines()[2:])
 
     parser = Command.standard_parser(quiet=True)
-    
+
     def update_parser(self):
         from celery.bin import camqadm
         for x in camqadm.OPTION_LIST:
         from celery.bin import camqadm
         return camqadm.camqadm(*self.args, **vars(self.options))
 
-    
+
 class CeleryEventCommand(CeleryCommand):
     """Celery event commandd.
 

File celerypylons/loader.py

     """Pylons Settings Proxy
 
     Proxies settings from pylons.config
-
     """
     def __getattr__(self, key):
         pylons_key = to_pylons(key)
         try:
             value = config[pylons_key]
-            if key in LIST_PARAMS: return value.split()
+            if key in LIST_PARAMS:
+                return value.split()
             return value
         except KeyError:
             raise AttributeError(pylons_key)
-    
+
     def __setattr__(self, key, value):
         pylons_key = to_pylons(key)
         config[pylons_key] = value
-        
+
 
 class PylonsLoader(BaseLoader):
     """Pylons celery loader
 
     Maps the celery config onto pylons.config
-
     """
     def read_configuration(self):
         self.configured = True