drop tests/support for unsupported django versions (<1.11), added tes…

…t of django 1.11, 2.0
jimmy927 · May 18, 2018 · 6377ff3 · 6377ff3
1 parent 14d1484
commit 6377ff3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,32 +3,20 @@ language: python
 
 matrix:
   include:
-    - env: TOXENV=django17-py27
+    - env: TOXENV=django111-py27
       python: 2.7
-    - env: TOXENV=django17-py33
-      python: 3.3
-    - env: TOXENV=django17-py34
+    - env: TOXENV=django111-py34
       python: 3.4
-    - env: TOXENV=django18-py27
-      python: 2.7
-    - env: TOXENV=django18-py33
-      python: 3.3
-    - env: TOXENV=django18-py34
-      python: 3.4
-    - env: TOXENV=django18-py35
-      python: 3.5
-    - env: TOXENV=django19-py27
-      python: 2.7
-    - env: TOXENV=django19-py34
-      python: 3.4
-    - env: TOXENV=django19-py35
+    - env: TOXENV=django111-py35
       python: 3.5
-    - env: TOXENV=django110-py27
-      python: 2.7
-    - env: TOXENV=django110-py34
+    - env: TOXENV=django111-py36
+      python: 3.6
+    - env: TOXENV=django20-py34
       python: 3.4
-    - env: TOXENV=django110-py35
+    - env: TOXENV=django20-py35
       python: 3.5
+    - env: TOXENV=django20-py36
+      python: 3.6
 
 install:
   - pip install coveralls tox

diff --git a/setup.py b/setup.py
@@ -35,14 +35,12 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Framework :: Django',
-        'Framework :: Django :: 1.7',
-        'Framework :: Django :: 1.8',
-        'Framework :: Django :: 1.9',
-        'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],
 )
diff --git a/tox.ini b/tox.ini
@@ -1,22 +1,18 @@
 [tox]
 envlist =
-    django17-py{27,33,34}
-    django18-py{27,33,34,35}
-    django19-py{27,34,35}
-    django110-py{27,34,35}
+    django111-py{27,34,35,36}
+    django20-py{34,35,36}
 
 [testenv]
 basepython =
     py27: python2.7
-    py33: python3.3
     py34: python3.4
     py35: python3.5
+    py36: python3.6
 
 deps =
-    django17: Django>=1.7,<1.8
-    django18: Django>=1.8,<1.9
-    django19: Django<1.10
-    django110: Django>=1.10
+    django111: Django>=1.11,<2.0
+    django20: Django>=2.0,<2.1
     coverage
 
 commands=coverage run runtests.py