fork/django-q2
1
0
Fork 0
mirror of https://github.com/django-q2/django-q2.git synced 2026-09-28 09:58:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #175 from Koed00/dev

Browse Source 
Updates dependencies
This commit is contained in:
Ilan Steemers
2016-06-07 17:14:59 +02:00
parent 2e062a2ba9 6891e1968a
commit 1c06cb4418
11 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+2 -1
View File
@@ -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
README.rst
+1 -1
View File
@@ -31,7 +31,7 @@ Requirements
- `Arrow <https://github.com/crsmithdev/arrow>`__
- `Blessed <https://github.com/jquast/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 and 1.10a1
Brokers
~~~~~~~
django_q/__init__.py
+3 -2
View File
@@ -5,13 +5,14 @@ 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'
# 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
django_q/management/commands/qcluster.py
+8 -9
View File
@@ -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()
django_q/management/commands/qinfo.py
+8 -10
View File
@@ -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):
django_q/management/commands/qmonitor.py
+8 -9
View File
@@ -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))
docs/conf.py
+1 -1
View File
@@ -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.
docs/index.rst
+1 -1
View File
@@ -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:
docs/install.rst
+2 -2
View File
@@ -29,7 +29,7 @@ Django Q is tested for Python 2.7 and 3.5
- `Django <https://www.djangoproject.com>`__
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 <https://github.com/gintas/django-picklefield>`__
@@ -124,7 +124,7 @@ You can reference the `requirements <https://github.com/Koed00/django-q/blob/mas
Django
~~~~~~
We strive to be compatible with last two major version of Django.
At the moment this means we support the 1.8.13 and 1.9.6 releases.
At the moment this means we support the 1.8.13 and 1.9.7 releases.
You might find that Django Q still works fine with Django 1.7, but new releases are no longer tested for it.
requirements.txt
+4 -4
View File
@@ -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
setup.py
+1 -1
View File
@@ -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',