Added tests for Django 2.2, 3.0, 3.1; removed Python 3.4

charettes · Sep 21, 2020 · 6d0a862 · 6d0a862
1 parent 69d73bf
commit 6d0a862
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,33 +1,32 @@
-dist: trusty
+dist: xenial
 sudo: false
 language: python
-env:
-- TOXENV=flake8
-- TOXENV=isort
 cache: pip
 matrix:
   fast_finish: true
   include:
   - python: 2.7
     env: TOXENV=py27-1.11
-  - python: 3.4
-    env: TOXENV=py34-1.11
-  - python: 3.4
-    env: TOXENV=py34-2.0
   - python: 3.5
     env: TOXENV=py35-1.11
   - python: 3.5
     env: TOXENV=py35-2.0
   - python: 3.5
     env: TOXENV=py35-2.1
   - python: 3.5
-    env: TOXENV=py35-master
+    env: TOXENV=py35-2.2
   - python: 3.6
     env: TOXENV=py36-1.11
   - python: 3.6
     env: TOXENV=py36-2.0
   - python: 3.6
     env: TOXENV=py36-2.1
+  - python: 3.6
+    env: TOXENV=py36-2.2
+  - python: 3.6
+    env: TOXENV=py36-3.0
+  - python: 3.6
+    env: TOXENV=py36-3.1
   - python: 3.6
     env: TOXENV=py36-master
   - python: 3.7
@@ -38,10 +37,24 @@ matrix:
     env: TOXENV=py37-2.1
     dist: xenial
     sudo: true
+  - python: 3.7
+    env: TOXENV=py37-2.2
+  - python: 3.7
+    env: TOXENV=py37-3.0
+  - python: 3.7
+    env: TOXENV=py37-3.1
   - python: 3.7
     env: TOXENV=py37-master
     dist: xenial
     sudo: true
+  - python: 3.7
+    env: TOXENV=flake8
+    dist: xenial
+    sudo: true
+  - python: 3.7
+    env: TOXENV=isort
+    dist: xenial
+    sudo: true
   allow_failures:
   - env: TOXENV=py35-master
   - env: TOXENV=py36-master

diff --git a/setup.py b/setup.py
@@ -26,14 +26,16 @@
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
         'Framework :: Django :: 2.1',
+        'Framework :: Django :: 2.2',
+        'Framework :: Django :: 3.0',
+        'Framework :: Django :: 3.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',

diff --git a/tox.ini b/tox.ini
@@ -5,15 +5,12 @@ envlist =
     flake8,
     isort,
     py27-1.11,
-    py34-{1.11,2.0},
-    py35-{1.11,2.0,2.1,master},
-    py36-{1.11,2.0,2.1,master},
-    py37-{2.0,2.1,master}
+    py35-{1.11,2.0,2.1,2.2},
+    py{36,37}-{1.11,2.0,2.1,2.2,3.0,3.1,master}
 
 [testenv]
 basepython =
     py27: python2.7
-    py34: python3.4
     py35: python3.5
     py36: python3.6
     py37: python3.7
@@ -27,16 +24,19 @@ deps =
     1.11: Django>=1.11,<2.0
     2.0: Django>=2.0,<2.1
     2.1: Django>=2.1,<2.2
+    2.2: Django>=2.2,<3.0
+    3.0: Django>=3.0,<3.1
+    3.1: Django>=3.1,<3.2
     master: https://github.com/django/django/archive/master.tar.gz
 
 [testenv:flake8]
 usedevelop = false
-basepython = python2.7
+basepython = python3.7
 commands = flake8
 deps = flake8
 
 [testenv:isort]
 usedevelop = false
-basepython = python2.7
+basepython = python3.7
 commands = isort --recursive --check-only --diff colorful tests
-deps = isort
+deps = isort<5.0