Merge e3700ca into de21e63

CHANGES.txt

@@ -1,11 +1,14 @@
 4.0.0
 ================
 - Drop support for celery 3.0
+- Drop support for Pyramid 2.7
 - Error out if ini is misconfigured
-- Add support for pyramid2
+- Add support for pyramid v2
 - Add support for celery v5
 - Drop support for old CELERY config options,
   use only the lower case versions.
+- Added support for `options` in celerybeat.
+- Added support for `broker_transport_options`
 
 3.0.0
 ================

examples/scheduler_example/development.ini

@@ -34,6 +34,7 @@ schedule = 10
 task = scheduler_example.tasks.get_date_2
 type = crontab
 schedule = {"minute": "*/1", "hour": "*"}
+options = {"task_id" : "4445"}
 
 [server:main]
 use = egg:waitress#main

pyramid_celery/loaders.py

@@ -2,8 +2,8 @@
 import json
 import celery.loaders.base
 import celery.schedules
+import configparser
 from celery import VERSION as celery_version
-from six.moves import configparser
 from pyramid.exceptions import ConfigurationError
 
 from functools import partial
@@ -65,6 +65,9 @@ def get_beat_config(parser, section):
         'schedule': schedule,
     }
 
+    if has_option('options'):
+        config['options'] = safe_json(get, section, 'options')
+
     if has_option('args'):
         config['args'] = safe_json(get, section, 'args')
 

requirements.txt

@@ -1,3 +1,2 @@
 pyramid
 celery
-six

setup.py

@@ -9,7 +9,7 @@
 requires = ['pyramid', 'celery']
 
 setup(name='pyramid_celery',
-      version='3.0.0',
+      version='4.0.0',
       description='Celery integration with pyramid',
       long_description=README + "\n" + CHANGES,
       classifiers=[

tests/configs/dev.ini

@@ -24,6 +24,7 @@ max_retries = 5
 task = myapp.tasks.Task1
 type = crontab
 schedule = {"minute": 0}
+options = {"task_id": "4446"}
 
 [celerybeat:task2]
 # Execute every 30 seconds

tests/test_loaders.py

@@ -27,6 +27,7 @@ def test_basic_ini():
     assert isinstance(schedule['task1']['schedule'], crontab)
     assert isinstance(schedule['task2']['schedule'], datetime.timedelta)
     assert isinstance(schedule['task4']['schedule'], int)
+    assert schedule['task1']['options'] == {'task_id': '4446'}
     assert schedule['task2']['args'] == [16, 16]
     assert schedule['task3']['kwargs'] == {"boom": "shaka"}