Remove support for Django < 1.8 in tests, add 1.11

jbalogh · Jul 4, 2017 · a6017d3 · a6017d3
1 parent 17e4034
commit a6017d3
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 42 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,44 +3,50 @@ language: python
 
 matrix:
     include:
-      - python: "2.7"
-        env: TOX_ENV=py27-django15
-      - python: "2.7"
-        env: TOX_ENV=py27-django16
-      - python: "2.7"
-        env: TOX_ENV=py27-django17
       - python: "2.7"
         env: TOX_ENV=py27-django18
-      - python: "2.7"
-        env: TOX_ENV=py27-django19
-      - python: "2.7"
-        env: TOX_ENV=py27-django110
-      - python: "3.3"
-        env: TOX_ENV=py33-django17
+
       - python: "3.3"
         env: TOX_ENV=py33-django18
-      - python: "3.4"
-        env: TOX_ENV=py34-django17
+
       - python: "3.4"
         env: TOX_ENV=py34-django18
-      - python: "3.4"
-        env: TOX_ENV=py34-django19
-      - python: "3.4"
-        env: TOX_ENV=py34-django110
+
       - python: "3.5"
         env: TOX_ENV=py35-django18
-      - python: "3.5"
-        env: TOX_ENV=py35-django19
-      - python: "3.5"
-        env: TOX_ENV=py35-django110
+
       - python: "3.6"
         env: TOX_ENV=py36-django18
-      - python: "3.6"
-        env: TOX_ENV=py36-django19
+
+      - python: "2.7"
+        env: TOX_ENV=py27-django110
+
+      - python: "3.4"
+        env: TOX_ENV=py34-django110
+
+      - python: "3.5"
+        env: TOX_ENV=py35-django110
+
       - python: "3.6"
         env: TOX_ENV=py36-django110
+
+      - python: "2.7"
+        env: TOX_ENV=py27-django111
+
+      - python: "3.4"
+        env: TOX_ENV=py34-django111
+
+      - python: "3.5"
+        env: TOX_ENV=py35-django111
+
+      - python: "3.6"
+        env: TOX_ENV=py36-django111
+
       - python: "2.7"
         env: TOX_ENV=flake8
+
+      - python: "3.6"
+        env: TOX_ENV=flake8
 script: tox -e $TOX_ENV
 install:
     - pip install tox
diff --git a/olddjango_requirements.txt b/olddjango_requirements.txt
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
 django-nose==1.4.4
-flake8==2.1.0
+flake8==3.3.0
diff --git a/tox.ini b/tox.ini
@@ -1,30 +1,17 @@
 [tox]
-envlist = flake8,py27-django{15,16,17,18,19,110},py{33,34}-django{17,18},py{34}-django{19,110},py{35,36}-django{18,19,110}
+envlist = flake8,py{33}-django{18},py{27,34,35,36}-django{18,110,111}
 
 [testenv]
 deps =
-    django15: Django>=1.5,<1.6
-    django16: Django>=1.6,<1.7
-    django17: Django>=1.7,<1.8
     django18: Django>=1.8,<1.9
-    django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
+    django111: Django>=1.11,<1.12
     -rrequirements.txt
 
 commands =
     ./run.sh test
     pip freeze
 
-[testenv:py27-django15]
-deps =
-    django15: Django>=1.5,<1.6
-    -rolddjango_requirements.txt
-
-[testenv:py27-django16]
-deps =
-    django16: Django>=1.6,<1.7
-    -rolddjango_requirements.txt
-
 [testenv:flake8]
 deps =
     -rrequirements.txt