Merge branch 'django_2_compat' into django_2_compat

.travis.yml

@@ -9,7 +9,7 @@ python:
 
 env:
     - DJANGO=2.0
-    - DJANGO=1.11.8
+    - DJANGO=1.11.9
     - DJANGO=1.8.18
 
 sudo: false

django_q/tests/settings.py

@@ -29,24 +29,17 @@ INSTALLED_APPS = (
     'django_redis'
 )
 
-if django.VERSION[:2] < (1, 10):
-    MIDDLEWARE_CLASSES = (
-        'django.contrib.sessions.middleware.SessionMiddleware',
-        'django.middleware.common.CommonMiddleware',
-        'django.middleware.csrf.CsrfViewMiddleware',
-        'django.contrib.auth.middleware.AuthenticationMiddleware',
-        'django.contrib.messages.middleware.MessageMiddleware',
-        'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    )
-else:
-    MIDDLEWARE = (
-        'django.contrib.sessions.middleware.SessionMiddleware',
-        'django.middleware.common.CommonMiddleware',
-        'django.middleware.csrf.CsrfViewMiddleware',
-        'django.contrib.auth.middleware.AuthenticationMiddleware',
-        'django.contrib.messages.middleware.MessageMiddleware',
-        'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    )
+
+MIDDLEWARE_CLASSES = (
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+)
+
+MIDDLEWARE = MIDDLEWARE_CLASSES
 
 ROOT_URLCONF = 'tests.urls'
 

requirements.txt

@@ -4,11 +4,11 @@
 #
 #    pip-compile --output-file requirements.txt requirements.in
 #
-arrow==0.10.0
+arrow==0.12.0
 blessed==1.14.2
-boto3==1.4.7
-botocore==1.7.28          # via boto3, s3transfer
-certifi==2017.7.27.1      # via requests
+boto3==1.5.9
+botocore==1.8.23          # via boto3, s3transfer
+certifi==2017.11.5        # via requests
 chardet==3.0.4            # via requests
 django-picklefield==1.0.0
 django-redis==4.8.0
@@ -18,13 +18,13 @@ idna==2.6                 # via requests
 iron-core==1.2.0          # via iron-mq
 iron-mq==0.9
 jmespath==0.9.3           # via boto3, botocore
-psutil==5.4.0
-pymongo==3.5.1
+psutil==5.4.3
+pymongo==3.6.0
 python-dateutil==2.6.1    # via arrow, botocore, iron-core
 redis==2.10.6
 requests==2.18.4          # via iron-core, rollbar
-rollbar==0.13.13
-s3transfer==0.1.11        # via boto3
+rollbar==0.13.17
+s3transfer==0.1.12        # via boto3
 six==1.11.0               # via blessed, python-dateutil, rollbar
 urllib3==1.22             # via requests
 wcwidth==0.1.7            # via blessed