Skip to content

Commit

Permalink
Merge pull request #184 from Koed00/package_update_21_7
Browse files Browse the repository at this point in the history
Package update 21 7
  • Loading branch information
Koed00 authored Jul 21, 2016
2 parents 837c873 + 6734f5b commit 60b95a6
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.7 and 1.10a1
Tested with: Python 2.7 & 3.5. Django 1.8.14, 1.9.8 and 1.10rc1

Brokers
~~~~~~~
Expand Down Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions django_q/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.7 releases.
At the moment this means we support the 1.8.14 and 1.9.8 releases.

You might find that Django Q still works fine with Django 1.7, but new releases are no longer tested for it.

Expand Down
12 changes: 6 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 60b95a6

Please sign in to comment.