Merge branch 'updates'

# Conflicts:
#	requirements.txt
This commit is contained in:
Ilan Steemers
2015-10-04 09:57:07 +02:00
4 changed files with 8 additions and 8 deletions

View File

@@ -9,7 +9,7 @@ python:
- "3.4"
env:
- DJANGO=1.8.4
- DJANGO=1.8.5
- DJANGO=1.7.10
sudo: false

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

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.7.10` and `1.8.4`.
The code is tested against Django version `1.7.10` and `1.8.5`.
- `Django-picklefield <https://github.com/gintas/django-picklefield>`__
@@ -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.4 releases.
At the moment this means we support the 1.7.10 and 1.8.5 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.

View File

@@ -5,9 +5,9 @@
# pip-compile requirements.in
#
arrow==0.6.0
blessed==1.9.5
blessed==1.10.0
boto3==1.1.4
botocore==1.2.6 # via boto3
botocore==1.2.7 # via boto3
django-picklefield==0.3.2
django-redis==4.2.0
docutils==0.12 # via botocore
@@ -16,12 +16,12 @@ futures==2.2.0 # via boto3
hiredis==0.2.0
iron-core==1.1.9 # via iron-mq
iron-mq==0.7
jmespath==0.8.0 # via boto3, botocore
jmespath==0.9.0 # via boto3, botocore
msgpack-python==0.4.6 # via django-redis
psutil==3.2.1
pymongo==3.0.3
python-dateutil==2.4.2 # via arrow, botocore, iron-core
redis==2.10.3
requests==2.7.0 # via iron-core
six==1.9.0 # via python-dateutil
six==1.9.0 # via blessed, python-dateutil
wcwidth==0.1.5 # via blessed