Merge 36a02ab into 347a711

jazzband · Oct 3, 2018 · f3d70ee · f3d70ee
2 parents 347a711 + 36a02ab
commit f3d70ee
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,10 @@ matrix:
         - env: TOXENV=docs
           python: "3.5"
         # Supported Python / Django versions w/ SQLite
+        - env: TOXENV=py35-django-21
+          python: "3.5"
+        - env: TOXENV=py36-django-21
+          python: "3.6"
         - env: TOXENV=py35-django-20
           python: "3.5"
         - env: TOXENV=py36-django-20
@@ -32,9 +36,13 @@ matrix:
         - env: TOXENV=py34-django-18
           python: "3.4"
         # Test with PostgreSQL
-        - env: TOXENV=py35-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-111-postgres"
+        - env: TOXENV=py35-django-21-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-21-postgres"
+          python: "3.5"
+        - env: TOXENV=py36-django-21-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-21-postgres"
+          python: "3.6"
+        - env: TOXENV=py35-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-20-postgres"
           python: "3.5"
-        - env: TOXENV=py36-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-111-postgres"
+        - env: TOXENV=py36-django-20-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-20-postgres"
           python: "3.6"
         - env: TOXENV=py27-django-111-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-111-postgres"
           python: "2.7"
@@ -51,9 +59,13 @@ matrix:
         - env: TOXENV=py27-django-18-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-18-postgres"
           python: "2.7"
         # Test with MySQL
-        - env: TOXENV=py35-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-111-mysql"
+        - env: TOXENV=py35-django-21-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-21-mysql"
+          python: "3.5"
+        - env: TOXENV=py36-django-21-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-21-mysql"
+          python: "3.6"
+        - env: TOXENV=py35-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-20-mysql"
           python: "3.5"
-        - env: TOXENV=py36-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-111-mysql"
+        - env: TOXENV=py36-django-20-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-20-mysql"
           python: "3.6"
         - env: TOXENV=py27-django-111-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-111-mysql"
           python: "2.7"

diff --git a/README.rst b/README.rst
@@ -46,7 +46,10 @@ recommended.  It follows the `Django's support policy`_, supporting:
 * Django 1.9 with Python 2.7, 3.4, or 3.5
 * Django 1.10 with Python 2.7, 3.4, or 3.5
 * Django 1.11 (LTS) with Python 2.7, 3.4, 3.5, or 3.6
-* Django 2.0 with Python 3.5 or 3.6
+* Django 2.0 with Python 3.4, 3.5 or 3.6
+* Django 2.1 with Python 3.5 or 3.6
+
+Python 3.7 should work, but is untested in TravisCI.
 
 .. _latest release: https://pypi.python.org/pypi/nose
 .. _Django's support policy: https://docs.djangoproject.com/en/1.8/internals/release-process/#supported-versions

diff --git a/setup.py b/setup.py
@@ -66,6 +66,12 @@ def get_long_description(title):
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Django',
+        'Framework :: Django :: 1.8',
+        'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
@@ -76,6 +82,7 @@ def get_long_description(title):
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Software Development :: Testing'
     ]
 )
diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,8 @@
 envlist =
     py{27,34,35}-django-{18,19,110}{,-postgres,-mysql}
     py{27,34,35,36}-django-111{,-postgres,-mysql}
-    py{35,36}-django-{20,master}{,-postgres,-mysql}
+    py{34,35,36,37}-django-20{,-postgres,-mysql}
+    py{35,36,37}-django-{21,master}{,-postgres,-mysql}
     flake8
     docs
 skip_missing_interpreters = True
@@ -20,6 +21,7 @@ deps =
     django-110: Django>=1.10,<1.11
     django-111: Django>=1.11,<2.0
     django-20: Django>=2.0,<2.1
+    django-21: Django>=2.1,<2.2
     django-master: https://github.com/django/django/archive/master.tar.gz
     postgres: psycopg2
     mysql: mysqlclient