Skip to content

Commit

Permalink
Merge pull request #163 from Koed00/dev
Browse files Browse the repository at this point in the history
Updates docs and tests for new Django versions
  • Loading branch information
Koed00 committed Apr 12, 2016
2 parents a702408 + 2bc8c20 commit 4e8a034
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ python:
- "3.4"

env:
- DJANGO=1.9.4
- DJANGO=1.8.11
- DJANGO=1.9.5
- DJANGO=1.8.12

sudo: false

Expand Down
2 changes: 1 addition & 1 deletion 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.11 & 1.9.4
Tested with: Python 2.7 & 3.5. Django 1.8.12 & 1.9.5

Brokers
~~~~~~~
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.11 & 1.9.4
Django Q is tested with: Python 2.7 & 3.5. Django 1.8.12 & 1.9.5

Contents:

Expand Down
4 changes: 2 additions & 2 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.11` and `1.9.4`.
The code is tested against Django version `1.8.12` and `1.9.5`.

- `Django-picklefield <https://github.com/gintas/django-picklefield>`__

Expand Down 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.11 and 1.9.4 releases.
At the moment this means we support the 1.8.12 and 1.9.5 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
19 changes: 10 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
#
# This file is autogenerated by pip-compile
# Make changes in requirements.in, then run this to update:
# To update, run:
#
# pip-compile requirements.in
# pip-compile --output-file requirements.txt requirements.in
#

arrow==0.7.0
blessed==1.14.1
boto3==1.2.5
botocore==1.3.30 # via boto3
boto3==1.3.0
botocore==1.4.11 # via boto3
django-picklefield==0.3.2
django-redis==4.3.0
django-redis==4.4.0
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
jmespath==0.9.0 # via boto3, botocore
psutil==4.0.0
pymongo==3.2.1
python-dateutil==2.4.2 # via arrow, botocore, iron-core
psutil==4.1.0
pymongo==3.2.2
python-dateutil==2.5.2 # via arrow, botocore, iron-core
redis==2.10.5
requests==2.9.1 # via iron-core, rollbar
rollbar==0.11.3
rollbar==0.11.6
six==1.10.0 # via blessed, python-dateutil, rollbar
wcwidth==0.1.6 # via blessed

0 comments on commit 4e8a034

Please sign in to comment.