Merge remote-tracking branch 'origin/master'

ed00/django-q

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

.travis.yml

@@ -9,8 +9,8 @@ python:
   - "3.4"
 
 env:
-    - DJANGO=1.9.5
-    - DJANGO=1.8.12
+    - DJANGO=1.9.6
+    - DJANGO=1.8.13
 
 sudo: false
 

README.rst

@@ -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.12 & 1.9.5
+Tested with: Python 2.7 & 3.5. Django 1.8.13 & 1.9.6
 
 Brokers
 ~~~~~~~

docs/index.rst

@@ -24,7 +24,7 @@ Features
 -  Rollbar support
 
 
-Django Q is tested with: Python 2.7 & 3.5. Django 1.8.12 & 1.9.5
+Django Q is tested with: Python 2.7 & 3.5. Django 1.8.13 & 1.9.6
 
 Contents:
 

docs/install.rst

@@ -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.12` and `1.9.5`.
+    The code is tested against Django version `1.8.13` and `1.9.6`.
 
 -  `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.12 and 1.9.5 releases.
+At the moment this means we support the 1.8.13 and 1.9.6 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

@@ -8,7 +8,7 @@
 arrow==0.7.0
 blessed==1.14.1
 boto3==1.3.1
-botocore==1.4.13          # via boto3
+botocore==1.4.19          # via boto3
 django-picklefield==0.3.2
 django-redis==4.4.2
 docutils==0.12            # via botocore
@@ -17,11 +17,11 @@ 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.1.0
+psutil==4.2.0
 pymongo==3.2.2
 python-dateutil==2.5.3    # via arrow, botocore, iron-core
 redis==2.10.5
-requests==2.9.1           # via iron-core, rollbar
+requests==2.10.0          # via iron-core, rollbar
 rollbar==0.12.1
 six==1.10.0               # via blessed, python-dateutil, rollbar
 wcwidth==0.1.6            # via blessed