Merge efbc517 into 2251c29

.travis.yml

@@ -2,16 +2,14 @@ language: python
 
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"
 
 env:
-  - DJANGO=1.8
-  - DJANGO=1.9
-  - DJANGO=1.10
   - DJANGO=1.11
+  - DJANGO=2.0
+  - DJANGO=2.1
 
 services:
   - redis-server
@@ -21,7 +19,7 @@ install:
   - pip install coveralls
   - pip install mockredispy
   - pip install django-redis-cache
-  - pip install 'celery<4'
+  - pip install 'celery<5'
   - python setup.py develop
 
 script:
@@ -30,18 +28,14 @@ script:
 
 matrix:
   exclude:
-    - python: "3.3"
-      env: DJANGO=1.9
-    - python: "3.3"
-      env: DJANGO=1.10
-    - python: "3.3"
-      env: DJANGO=1.11
-    - python: "3.6"
-      env: DJANGO=1.8
-    - python: "3.6"
-      env: DJANGO=1.9
-    - python: "3.6"
-      env: DJANGO=1.10
+    - python: "2.7"
+      env: DJANGO=2.0
+    - python: "2.7"
+      env: DJANGO=2.1
+    - python: "3.4"
+      env: DJANGO=2.0
+    - python: "3.4"
+      env: DJANGO=2.1
 
 after_success:
   - coveralls --verbose

defender/test_urls.py

@@ -4,5 +4,5 @@
 from .urls import urlpatterns as original_urlpatterns
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 ] + original_urlpatterns

setup.py

@@ -68,7 +68,7 @@ def get_package_data(package):
       include_package_data=True,
       packages=get_packages('defender'),
       package_data=get_package_data('defender'),
-      install_requires=['Django>=1.8,<2.1', 'redis>=2.10.3,<3.0'],
+      install_requires=['Django>=1.8,<2.2', 'redis>=2.10.3,<3.0'],
       tests_require=['mock', 'mockredispy>=2.9.0.11,<3.0', 'coverage',
                      'celery', 'django-redis-cache'],
       )