From 4a5ea5a9d4ede3caa384fafec090ed39e6c22472 Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Sun, 24 Apr 2016 15:42:38 +0200 Subject: [PATCH 1/7] v0.7.17 --- django_q/__init__.py | 2 +- docs/conf.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/django_q/__init__.py b/django_q/__init__.py index b2453b9..b9e4298 100644 --- a/django_q/__init__.py +++ b/django_q/__init__.py @@ -5,7 +5,7 @@ from django import get_version myPath = os.path.dirname(os.path.abspath(__file__)) sys.path.insert(0, myPath) -VERSION = (0, 7, 16) +VERSION = (0, 7, 17) default_app_config = 'django_q.apps.DjangoQConfig' diff --git a/docs/conf.py b/docs/conf.py index a2745d3..b7ca298 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -72,7 +72,7 @@ author = 'Ilan Steemers' # The short X.Y version. version = '0.7' # The full version, including alpha/beta/rc tags. -release = '0.7.16' +release = '0.7.17' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index eb5787d..fa8e73b 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ class PyTest(Command): setup( name='django-q', - version='0.7.16', + version='0.7.17', author='Ilan Steemers', author_email='koed0@gmail.com', keywords='django distributed task queue worker scheduler cron redis disque ironmq sqs orm mongodb multiprocessing rollbar', From 644125c3f83636cda612f8c5013afdf2d6350560 Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Tue, 7 Jun 2016 16:10:33 +0200 Subject: [PATCH 2/7] Updates dependencies --- requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 886dc6d..8542722 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,20 +8,20 @@ arrow==0.7.0 blessed==1.14.1 boto3==1.3.1 -botocore==1.4.19 # via boto3 +botocore==1.4.25 # via boto3 django-picklefield==0.3.2 -django-redis==4.4.2 +django-redis==4.4.3 docutils==0.12 # via botocore future==0.15.2 hiredis==0.2.0 iron-core==1.2.0 # via iron-mq -iron-mq==0.8 +iron-mq==0.9 jmespath==0.9.0 # via boto3, botocore psutil==4.2.0 pymongo==3.2.2 python-dateutil==2.5.3 # via arrow, botocore, iron-core redis==2.10.5 requests==2.10.0 # via iron-core, rollbar -rollbar==0.12.1 +rollbar==0.13.0 six==1.10.0 # via blessed, python-dateutil, rollbar wcwidth==0.1.6 # via blessed From 67bd68d10f053f0ea616b0990ebdbecf67417a58 Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Tue, 7 Jun 2016 16:43:30 +0200 Subject: [PATCH 3/7] Recognize Django 1.10 versions --- django_q/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/django_q/__init__.py b/django_q/__init__.py index b9e4298..da8f10e 100644 --- a/django_q/__init__.py +++ b/django_q/__init__.py @@ -11,7 +11,8 @@ default_app_config = 'django_q.apps.DjangoQConfig' # root imports will slowly be deprecated. # please import from the relevant sub modules -if get_version().split('.')[1][0] != '9': +split_version = get_version().split('.') +if split_version[1][0] != '9' and split_version[1][:2]!='10': from .tasks import async, schedule, result, result_group, fetch, fetch_group, count_group, delete_group, queue_size from .models import Task, Schedule, Success, Failure from .cluster import Cluster From d58c31e10351f4eb46e5d3a7e025bb4f58fb62e2 Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Tue, 7 Jun 2016 16:43:51 +0200 Subject: [PATCH 4/7] Replaces optparse with argparse for commands --- django_q/management/commands/qcluster.py | 17 ++++++++--------- django_q/management/commands/qinfo.py | 18 ++++++++---------- django_q/management/commands/qmonitor.py | 17 ++++++++--------- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/django_q/management/commands/qcluster.py b/django_q/management/commands/qcluster.py index 14e312c..b40267b 100644 --- a/django_q/management/commands/qcluster.py +++ b/django_q/management/commands/qcluster.py @@ -1,5 +1,3 @@ -from optparse import make_option - from django.core.management.base import BaseCommand from django.utils.translation import ugettext as _ @@ -10,13 +8,14 @@ class Command(BaseCommand): # Translators: help text for qcluster management command help = _("Starts a Django Q Cluster.") - option_list = BaseCommand.option_list + ( - make_option('--run-once', - action='store_true', - dest='run_once', - default=False, - help='Run once and then stop.'), - ) + def add_arguments(self, parser): + parser.add_argument( + '--run-once', + action='store_true', + dest='run_once', + default=False, + help='Run once and then stop.', + ) def handle(self, *args, **options): q = Cluster() diff --git a/django_q/management/commands/qinfo.py b/django_q/management/commands/qinfo.py index 84068fa..6647f4f 100644 --- a/django_q/management/commands/qinfo.py +++ b/django_q/management/commands/qinfo.py @@ -1,7 +1,4 @@ -from optparse import make_option - from django.core.management.base import BaseCommand - from django.utils.translation import ugettext as _ from django_q import VERSION @@ -13,13 +10,14 @@ class Command(BaseCommand): # Translators: help text for qinfo management command help = _('General information over all clusters.') - option_list = BaseCommand.option_list + ( - make_option('--config', - action='store_true', - dest='config', - default=False, - help='Print current configuration.'), - ) + def add_arguments(self, parser): + parser.add_argument( + '--config', + action='store_true', + dest='config', + default=False, + help='Print current configuration.', + ) def handle(self, *args, **options): if options.get('config', False): diff --git a/django_q/management/commands/qmonitor.py b/django_q/management/commands/qmonitor.py index bef4bd1..706f58e 100644 --- a/django_q/management/commands/qmonitor.py +++ b/django_q/management/commands/qmonitor.py @@ -1,5 +1,3 @@ -from optparse import make_option - from django.core.management.base import BaseCommand from django.utils.translation import ugettext as _ @@ -10,13 +8,14 @@ class Command(BaseCommand): # Translators: help text for qmonitor management command help = _("Monitors Q Cluster activity") - option_list = BaseCommand.option_list + ( - make_option('--run-once', - action='store_true', - dest='run_once', - default=False, - help='Run once and then stop.'), - ) + def add_arguments(self, parser): + parser.add_argument( + '--run-once', + action='store_true', + dest='run_once', + default=False, + help='Run once and then stop.', + ) def handle(self, *args, **options): monitor(run_once=options.get('run_once', False)) From c5d637feee2442f9dd77e459cfd2f84575eb9b60 Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Tue, 7 Jun 2016 16:48:41 +0200 Subject: [PATCH 5/7] Upgrades reference to Django 1.9.7 --- README.rst | 2 +- docs/index.rst | 2 +- docs/install.rst | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 7944e20..3934100 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.6 +Tested with: Python 2.7 & 3.5. Django 1.8.13 & 1.9.7 Brokers ~~~~~~~ diff --git a/docs/index.rst b/docs/index.rst index aed785d..b79e9eb 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.6 +Django Q is tested with: Python 2.7 & 3.5. Django 1.8.13 & 1.9.7 Contents: diff --git a/docs/install.rst b/docs/install.rst index 36be0cd..9b13429 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -29,7 +29,7 @@ Django Q is tested for Python 2.7 and 3.5 - `Django `__ Django Q aims to use as much of Django's standard offerings as possible - The code is tested against Django version `1.8.13` and `1.9.6`. + The code is tested against Django version `1.8.13` and `1.9.7`. - `Django-picklefield `__ @@ -124,7 +124,7 @@ You can reference the `requirements Date: Tue, 7 Jun 2016 16:48:57 +0200 Subject: [PATCH 6/7] Test for 1.9.7 and 1.10a1 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4ce9626..29ec94b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,8 @@ python: - "3.4" env: - - DJANGO=1.9.6 + - DJANGO=1.10a1 + - DJANGO=1.9.7 - DJANGO=1.8.13 sudo: false From 6891e1968a48866197e5477a69e02a1582d48597 Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Tue, 7 Jun 2016 17:04:12 +0200 Subject: [PATCH 7/7] Readme: mentions 1.10a1 tests --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 3934100..611a0ef 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 +Tested with: Python 2.7 & 3.5. Django 1.8.13, 1.9.7 and 1.10a1 Brokers ~~~~~~~