From 3c7d7ee9542f005b0de7604e34117b711eea672e Mon Sep 17 00:00:00 2001 From: ilan Date: Thu, 21 Jul 2016 15:20:34 +0200 Subject: [PATCH 1/3] Updates arrow, botocore, psutil, pymongo, rollbar and wcwidth --- requirements.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8542722..75c56c2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,10 +5,10 @@ # pip-compile --output-file requirements.txt requirements.in # -arrow==0.7.0 +arrow==0.8.0 blessed==1.14.1 boto3==1.3.1 -botocore==1.4.25 # via boto3 +botocore==1.4.38 # via boto3 django-picklefield==0.3.2 django-redis==4.4.3 docutils==0.12 # via botocore @@ -17,11 +17,11 @@ hiredis==0.2.0 iron-core==1.2.0 # via iron-mq iron-mq==0.9 jmespath==0.9.0 # via boto3, botocore -psutil==4.2.0 -pymongo==3.2.2 +psutil==4.3.0 +pymongo==3.3.0 python-dateutil==2.5.3 # via arrow, botocore, iron-core redis==2.10.5 requests==2.10.0 # via iron-core, rollbar -rollbar==0.13.0 +rollbar==0.13.2 six==1.10.0 # via blessed, python-dateutil, rollbar -wcwidth==0.1.6 # via blessed +wcwidth==0.1.7 # via blessed From 09a951134177beb3972d81959b8f5d4dafa0d2c9 Mon Sep 17 00:00:00 2001 From: ilan Date: Thu, 21 Jul 2016 15:26:12 +0200 Subject: [PATCH 2/3] Django 1.8.14, 1.9.8 and 1.10rc1 --- .travis.yml | 6 +++--- README.rst | 4 ++-- docs/index.rst | 2 +- docs/install.rst | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29ec94b..0022569 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,9 @@ python: - "3.4" env: - - DJANGO=1.10a1 - - DJANGO=1.9.7 - - DJANGO=1.8.13 + - DJANGO=1.10rc1 + - DJANGO=1.9.8 + - DJANGO=1.8.14 sudo: false diff --git a/README.rst b/README.rst index 611a0ef..9d60d01 100644 --- a/README.rst +++ b/README.rst @@ -31,7 +31,7 @@ Requirements - `Arrow `__ - `Blessed `__ -Tested with: Python 2.7 & 3.5. Django 1.8.13, 1.9.7 and 1.10a1 +Tested with: Python 2.7 & 3.5. Django 1.8.14, 1.9.8 and 1.10rc1 Brokers ~~~~~~~ @@ -166,7 +166,7 @@ Admin page or directly from your code: args='2,-2', schedule_type=Schedule.DAILY ) - + # Run a task every 5 minutes, starting at 6 today # for 2 hours import arrow diff --git a/docs/index.rst b/docs/index.rst index b79e9eb..082071c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -24,7 +24,7 @@ Features - Rollbar support -Django Q is tested with: Python 2.7 & 3.5. Django 1.8.13 & 1.9.7 +Django Q is tested with: Python 2.7 & 3.5. Django 1.8.14, 1.9.8 and 1.10rc1 Contents: diff --git a/docs/install.rst b/docs/install.rst index 9b13429..e106521 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -124,7 +124,7 @@ You can reference the `requirements Date: Thu, 21 Jul 2016 16:41:30 +0200 Subject: [PATCH 3/3] Removes value check for guard cycle --- django_q/conf.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/django_q/conf.py b/django_q/conf.py index dfa719a..9b7f83a 100644 --- a/django_q/conf.py +++ b/django_q/conf.py @@ -71,11 +71,9 @@ class Conf(object): # Failures are always saved SAVE_LIMIT = conf.get('save_limit', 250) - # Guard loop sleep in seconds + # Guard loop sleep in seconds. Should be between 0 and 60 seconds. GUARD_CYCLE = conf.get('guard_cycle', 0.5) - if GUARD_CYCLE <= 0 or GUARD_CYCLE >= 60: - raise ValueError('`guard_cycle` must be greater than 0 and less than 60 sec') - + # Disable the scheduler SCHEDULER = conf.get('scheduler', True)