Upgrade test matrix to include Python 3.7 and Django 2.1

jazzband · Jan 15, 2019 · c489a83 · c489a83
1 parent 68b9e69
commit c489a83
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,11 +7,25 @@ matrix:
 
     - python: 3.5
       env: TOX_ENV=py35-django20
+    - python: 3.5
+      env: TOX_ENV=py35-django21
 
     - python: 3.6
       env: TOX_ENV=flake8
     - python: 3.6
       env: TOX_ENV=py36-django20
+    - python: 3.6
+      env: TOX_ENV=py36-django21
+
+    - python: 3.7
+      dist: xenial
+      env: TOX_ENV=flake8
+    - python: 3.7
+      dist: xenial
+      env: TOX_ENV=py36-django20
+    - python: 3.7
+      dist: xenial
+      env: TOX_ENV=py36-django21
 addons:
   apt:
     packages:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -7,7 +7,7 @@ This document describes changes between each past release.
 2.9.0 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Upgrade test matrix to Python 3.7 and Django 2.1
 
 
 2.8.0 (2019-01-15)

diff --git a/setup.py b/setup.py
@@ -40,8 +40,9 @@ def read_file(filename):
         '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',
         'Topic :: Software Development :: Libraries :: Application Frameworks',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],

diff --git a/tox.ini b/tox.ini
@@ -1,15 +1,16 @@
 [tox]
 envlist =
     py27-django{111},
-    py34-django{111},
-    py35-django{2},
-    py36-django{2},
+    py35-django{20,21},
+    py36-django{20,21},
+    py37-django{20,21},
     flake8
 
 [testenv]
 deps =
     django111: Django>=1.11,<2.0
     django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
     coverage
     mock
     pyenchant