Add Django 1.10 to travis; move 1.7 to allowed failures

django-hijack · Aug 8, 2016 · bccfbfd · bccfbfd
1 parent 2748492
commit bccfbfd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,18 +5,20 @@ python:
     - "3.4"
     - "3.5"
 env:
-    - DJANGO=django==1.4.*
-    - DJANGO=django==1.6.*
-    - DJANGO=django==1.7.*
-    - DJANGO=django==1.8.*
-    - DJANGO=django==1.9.*
+    - DJANGO=django==1.4.* DJANGO_NOSE=django-nose==1.4.3
+    - DJANGO=django==1.6.* DJANGO_NOSE=django-nose==1.4.3
+    - DJANGO=django==1.7.* DJANGO_NOSE=django-nose==1.4.3
+    - DJANGO=django==1.8.* DJANGO_NOSE=django-nose==1.4.4
+    - DJANGO=django==1.9.* DJANGO_NOSE=django-nose==1.4.4
+    - DJANGO=django==1.10.* DJANGO_NOSE=django-nose==1.4.4
 
 sudo: false
 
 install:
     - pip install -r requirements.txt
     - pip install -r requirements-test.txt
     - pip install $DJANGO
+    - pip install $DJANGO_NOSE
     - pip install coveralls
 
 script:
@@ -42,4 +44,5 @@ matrix:
     allow_failures:
         - env: DJANGO=django==1.4.*
         - env: DJANGO=django==1.6.*
+        - env: DJANGO=django==1.7.*
     fast_finish: true
diff --git a/setup.py b/setup.py
@@ -59,7 +59,6 @@ def read(fname):
                    'Framework :: Django',
                    'License :: OSI Approved :: MIT License',
                    'Framework :: Django',
-                   'Framework :: Django :: 1.7',
                    'Framework :: Django :: 1.8',
                    'Framework :: Django :: 1.9',
                    'Framework :: Django :: 1.10',