Update tox and travis configuration

sunscrapers · Sep 2, 2016 · 5a7dedd · 5a7dedd
1 parent e6795fe
commit 5a7dedd
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,29 +3,36 @@ language: python
 python:
   - "3.5"
 env:
-  - TOX_ENV=py26-dj14
-  - TOX_ENV=py26-dj15
-  - TOX_ENV=py26-dj16
-  - TOX_ENV=py27-dj14
-  - TOX_ENV=py27-dj15
-  - TOX_ENV=py27-dj16
-  - TOX_ENV=py27-dj17
-  - TOX_ENV=py27-dj18
-  - TOX_ENV=py27-dj19
-  - TOX_ENV=py32-dj15
-  - TOX_ENV=py32-dj16
-  - TOX_ENV=py32-dj17
-  - TOX_ENV=py32-dj18
-  - TOX_ENV=py33-dj15
-  - TOX_ENV=py33-dj16
-  - TOX_ENV=py33-dj17
-  - TOX_ENV=py33-dj18
-  - TOX_ENV=py34-dj15
-  - TOX_ENV=py34-dj16
-  - TOX_ENV=py34-dj17
-  - TOX_ENV=py34-dj18
-  - TOX_ENV=py34-dj19
-  - TOX_ENV=py35-dj19
+  - TOX_ENV=py26-dj14-rf31
+  - TOX_ENV=py26-dj15-rf31
+  - TOX_ENV=py26-dj16-rf31
+  - TOX_ENV=py27-dj14-rf31
+  - TOX_ENV=py27-dj15-rf31
+  - TOX_ENV=py27-dj16-rf31
+  - TOX_ENV=py27-dj17-rf31
+  - TOX_ENV=py27-dj18-rf34
+  - TOX_ENV=py27-dj19-rf34
+  - TOX_ENV=py27-dj110-rf34
+  - TOX_ENV=py32-dj15-rf31
+  - TOX_ENV=py32-dj16-rf31
+  - TOX_ENV=py32-dj17-rf31
+  - TOX_ENV=py32-dj18-rf31
+  - TOX_ENV=py33-dj15-rf31
+  - TOX_ENV=py33-dj16-rf31
+  - TOX_ENV=py33-dj17-rf31
+  - TOX_ENV=py33-dj18-rf31
+  - TOX_ENV=py34-dj15-rf31
+  - TOX_ENV=py34-dj16-rf31
+  - TOX_ENV=py34-dj17-rf31
+  - TOX_ENV=py34-dj18-rf31
+  - TOX_ENV=py35-dj15-rf31
+  - TOX_ENV=py35-dj16-rf31
+  - TOX_ENV=py35-dj17-rf31
+  - TOX_ENV=py35-dj18-rf31
+  - TOX_ENV=py34-dj19-rf34
+  - TOX_ENV=py34-dj110-rf34
+  - TOX_ENV=py35-dj19-rf34
+  - TOX_ENV=py35-dj110-rf34
 
 install:
   - pip install tox

diff --git a/tox.ini b/tox.ini
@@ -16,13 +16,13 @@ basepython =
     py34: python3.4
     py35: python3.5
 deps =
-    dj14: django==1.4.20
-    dj15: django==1.5.12
-    dj16: django==1.6.11
-    dj17: django==1.7.10
-    dj18: django==1.8.5
-    dj19: django==1.9.9
-    dj110: django==1.10
+    dj14: django>=1.4,<1.5
+    dj15: django>=1.5,<1.6
+    dj16: django>=1.6,<1.7
+    dj17: django>=1.7,<1.8
+    dj18: django>=1.8,<1.9
+    dj19: django>=1.9,<1.10
+    dj110: django>=1.10,<1.11
     rf31: djangorestframework>=3.1,<3.2
     rf34: djangorestframework>=3.4,<3.5
     -rrequirements-test.txt