Merge pull request #302 from jwhitlock/django-2.2

Add support for Django 2.2
jazzband · Jul 3, 2019 · 6785593 · 6785593
2 parents 43348aa + fd7b3a7
commit 6785593
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,21 @@ matrix:
         - env: TOXENV=docs
           python: "3.5"
         # Supported Python / Django versions w/ SQLite
+        - env: TOXENV=py35-django-22
+          python: "3.5"
+          # Django 2.2 requires SQLite 3.8.3 or later, Trusty 14.04.5 has 3.8.2
+          sudo: required
+          dist: xenial
+        - env: TOXENV=py36-django-22
+          python: "3.6"
+          # Django 2.2 requires SQLite 3.8.3 or later, Trusty 14.04.5 has 3.8.2
+          sudo: required
+          dist: xenial
+        - env: TOXENV=py37-django-22
+          python: "3.7"
+          # Requires Python 3.7, not in Trusty
+          sudo: required
+          dist: xenial
         - env: TOXENV=py35-django-21
           python: "3.5"
         - env: TOXENV=py36-django-21
@@ -40,6 +55,24 @@ matrix:
         - env: TOXENV=py34-django-18
           python: "3.4"
         # Test with PostgreSQL
+        - env: TOXENV=py35-django-22-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-22-postgres"
+          python: "3.5"
+          services: postgresql
+          # Django 2.2 requires SQLite 3.8.3 or later, Trusty 14.04.5 has 3.8.2
+          sudo: required
+          dist: xenial
+        - env: TOXENV=py36-django-22-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-22-postgres"
+          python: "3.6"
+          services: postgresql
+          # Django 2.2 requires SQLite 3.8.3 or later, Trusty 14.04.5 has 3.8.2
+          sudo: required
+          dist: xenial
+        - env: TOXENV=py37-django-22-postgres DATABASE_URL="postgres://postgres@localhost:5432/py37-django-22-postgres"
+          python: "3.7"
+          # Requires Python 3.7, not in Trusty
+          sudo: required
+          dist: xenial
+          services: postgresql
         - env: TOXENV=py35-django-21-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-21-postgres"
           python: "3.5"
           services: postgresql
@@ -84,6 +117,24 @@ matrix:
           python: "2.7"
           services: postgresql
         # Test with MySQL
+        - env: TOXENV=py35-django-22-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-22-mysql"
+          python: "3.5"
+          services: mysql
+          # Django 2.2 requires SQLite 3.8.3 or later, Trusty 14.04.5 has 3.8.2
+          sudo: required
+          dist: xenial
+        - env: TOXENV=py36-django-22-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-22-mysql"
+          python: "3.6"
+          services: mysql
+          # Django 2.2 requires SQLite 3.8.3 or later, Trusty 14.04.5 has 3.8.2
+          sudo: required
+          dist: xenial
+        - env: TOXENV=py37-django-22-mysql DATABASE_URL="mysql://travis@localhost:3306/py37-django-22-mysql"
+          python: "3.7"
+          # Requires Python 3.7, not in Trusty
+          sudo: required
+          dist: xenial
+          services: mysql
         - env: TOXENV=py35-django-21-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-21-mysql"
           python: "3.5"
           services: mysql
@@ -128,28 +179,40 @@ matrix:
           python: "2.7"
           services: mysql
         # Django master is allowed to fail
-        - env: TOXENV=py35-django-master
-          python: "3.5"
         - env: TOXENV=py36-django-master
           python: "3.6"
+          # Django 3.0 requires SQLite 3.8.3 or later, Trusty 14.04.5 has 3.8.2
+          sudo: required
+          dist: xenial
         - env: TOXENV=py37-django-master
           python: "3.7"
+          # Requires Python 3.7, not in Trusty
           sudo: required
           dist: xenial
-        - env: TOXENV=py35-django-master-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-master-mysql"
-          python: "3.5"
-          language: pyth
-          services: mysql
-        - env: TOXENV=py36-django-master-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-master-postgres"
+        - env: TOXENV=py38-django-master
+          python: "3.8"
+          # Requires Python 3.8, not in Trusty
+          sudo: required
+          dist: xenial
+        - env: TOXENV=py36-django-master-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-master-mysql"
           python: "3.6"
+          services: mysql
+          # Django 3.0 requires SQLite 3.8.3 or later, Trusty 14.04.5 has 3.8.2
+          sudo: required
+          dist: xenial
+        - env: TOXENV=py37-django-master-postgres DATABASE_URL="postgres://postgres@localhost:5432/py37-django-master-postgres"
+          python: "3.7"
           services: postgresql
+          # Django 3.0 requires SQLite 3.8.3 or later, Trusty 14.04.5 has 3.8.2
+          sudo: required
+          dist: xenial
     allow_failures:
         # Master is allowed to fail
-        - env: TOXENV=py35-django-master
         - env: TOXENV=py36-django-master
         - env: TOXENV=py37-django-master
-        - env: TOXENV=py35-django-master-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-master-mysql"
-        - env: TOXENV=py36-django-master-postgres DATABASE_URL="postgres://postgres@localhost:5432/py36-django-master-postgres"
+        - env: TOXENV=py38-django-master
+        - env: TOXENV=py36-django-master-mysql DATABASE_URL="mysql://travis@localhost:3306/py36-django-master-mysql"
+        - env: TOXENV=py37-django-master-postgres DATABASE_URL="postgres://postgres@localhost:5432/py37-django-master-postgres"
 
 install:
     - pip install tox coveralls

diff --git a/requirements-rtd.txt b/requirements-rtd.txt
@@ -1,5 +1,5 @@
 # Requirements for ReadTheDocs
 # Must be set in the RTD Admin, at:
 # https://readthedocs.org/dashboard/django-nose/advanced/
-Django>=1.10,<1.11
+Django
 nose
diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,7 @@
 #
 
 # Latest Django
-Django>=2.0,<2.1
+Django>=2.2,<3.0
 
 # This project
 -e .

diff --git a/setup.py b/setup.py
@@ -72,6 +72,7 @@ def get_long_description(title):
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
         'Framework :: Django :: 2.1',
+        'Framework :: Django :: 2.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',

diff --git a/tox.ini b/tox.ini
@@ -3,7 +3,8 @@ envlist =
     py{27,34,35}-django-{18,19,110}{,-postgres,-mysql}
     py{27,34,35,36}-django-111{,-postgres,-mysql}
     py{34,35,36,37}-django-20{,-postgres,-mysql}
-    py{35,36,37}-django-{21,master}{,-postgres,-mysql}
+    py{35,36,37}-django-{21,22}{,-postgres,-mysql}
+    py{36,37,38}-django-master{,-postgres,-mysql}
     flake8
     docs
 skip_missing_interpreters = True
@@ -22,6 +23,7 @@ deps =
     django-111: Django>=1.11,<2.0
     django-20: Django>=2.0,<2.1
     django-21: Django>=2.1,<2.2
+    django-22: Django>=2.2,<3.0
     django-master: https://github.com/django/django/archive/master.tar.gz
     postgres: psycopg2
     mysql: mysqlclient