Skip to content

Commit

Permalink
Merge pull request #109 from Koed00/dev
Browse files Browse the repository at this point in the history
Updates Django
  • Loading branch information
Koed00 committed Nov 4, 2015
2 parents d33fa45 + 55520ad commit c175883
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ python:
- "3.4"

env:
- DJANGO=1.8.5
- DJANGO=1.8.6
- DJANGO=1.7.10

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.7.10 & 1.8.5
Tested with: Python 2.7 & 3.5. Django 1.7.10 & 1.8.6

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
- Python 2 and 3


Django Q is tested with: Python 2.7 & 3.5. Django 1.7.10 & 1.8.5
Django Q is tested with: Python 2.7 & 3.5. Django 1.7.10 & 1.8.6

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.7.10` and `1.8.5`.
The code is tested against Django version `1.7.10` and `1.8.6`.

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

Expand Down Expand Up @@ -119,7 +119,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.7.10 and 1.8.5 releases.
At the moment this means we support the 1.7.10 and 1.8.6 releases.
Once version 1.9 is out , support for Django 1.7 will be deprecated.
This will mean that newer releases of Django Q might still work, but are no longer targeted for testing.

Expand Down
9 changes: 4 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,19 @@
arrow==0.7.0
blessed==1.12.0
boto3==1.2.1
botocore==1.3.2 # via boto3
botocore==1.3.4 # via boto3
django-picklefield==0.3.2
django-redis==4.2.0
django-redis==4.3.0
docutils==0.12 # via botocore
future==0.15.2
hiredis==0.2.0
iron-core==1.1.9 # via iron-mq
iron-mq==0.7
jmespath==0.9.0 # via boto3, botocore
msgpack-python==0.4.6 # via django-redis
psutil==3.2.2
pymongo==3.0.3
pymongo==3.1
python-dateutil==2.4.2 # via arrow, botocore, iron-core
redis==2.10.3
redis==2.10.5
requests==2.8.1 # via iron-core
six==1.10.0 # via blessed, python-dateutil
wcwidth==0.1.5 # via blessed

0 comments on commit c175883

Please sign in to comment.