From 3b3d1cb8f7e92d4b68016fce00007db18a1d26ef Mon Sep 17 00:00:00 2001
From: Iacopo Spalletti <i.spalletti@nephila.it>
Date: Wed, 24 Jul 2019 15:39:01 +0200
Subject: [PATCH] Update to Django 2.2

---
 .travis.yml | 12 +++++++++---
 README.rst  |  6 +++---
 setup.py    |  6 ++++--
 tox.ini     |  7 ++++---
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 95d70ab..007d1aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: xenial
 language: python
 
 sudo: false
@@ -40,11 +41,15 @@ matrix:
       env: DJANGO='dj21'
     - python: 3.6
       env: DJANGO='dj21'
-    # Django dev
+    - python: 3.7
+      env: DJANGO='dj21'
+    # Django 2.2
     - python: 3.5
-      env: DJANGO='djdev'
+      env: DJANGO='dj22'
     - python: 3.6
-      env: DJANGO='djdev'
+      env: DJANGO='dj22'
+    - python: 3.7
+      env: DJANGO='dj22'
 
 install:
   - pip install tox coveralls
@@ -52,6 +57,7 @@ install:
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PY_VER=py34; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PY_VER=py35; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then export PY_VER=py36; fi"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then export PY_VER=py37; fi"
   - "if [[ ${DJANGO}z != 'z' ]]; then export TOX_ENV=$PY_VER-$DJANGO; fi"
 
 script:
diff --git a/README.rst b/README.rst
index f0dad24..a63be16 100644
--- a/README.rst
+++ b/README.rst
@@ -19,8 +19,8 @@ to provide a standardised approach to extending existing apps.
 Supported versions
 ******************
 
-Python: 2.7, 3.4, 3.5, 3.6
-Django: 1.8, 1.9, 1.10, 1.11, 2.0, 2.1
+Python: 2.7, 3.4, 3.5, 3.6, 3.7
+Django: 1.8, 1.9, 1.10, 1.11, 2.0, 2.2
 
 Upgrading to 0.2
 ****************
@@ -59,7 +59,7 @@ it's own data there by registering a *container* (subclass of
 
     class TaggingAppDataContainer(AppDataContainer):
         form_class = TaggingAppDataForm
-        
+
         def tag_string(self):
             print ', '.join(t.name for t in self.public_tags)
 
diff --git a/setup.py b/setup.py
index 3b118bb..4b9d174 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 from setuptools import setup
 
-VERSION = (0, 2, 1)
+VERSION = (0, 2, 2)
 __version__ = VERSION
 __versionstr__ = '.'.join(map(str, VERSION))
 
@@ -11,7 +11,7 @@
 f.close()
 
 install_requires = [
-    'Django>=1.8,<2.2',
+    'Django>=1.8,<3.0',
 ]
 test_requires = [
     'nose',
@@ -39,6 +39,7 @@
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
         'Framework :: Django :: 2.1',
+        'Framework :: Django :: 2.2',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
@@ -46,6 +47,7 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Operating System :: OS Independent',
     ],
     install_requires=install_requires,
diff --git a/tox.ini b/tox.ini
index f88a6ab..bee2ded 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 envlist =
     py{27,34,35}-dj{18,19,110}
-    py{27,34,35,36}-dj111
-    py{34,35,36}-dj20
-    py{35,36}-dj{21,dev}
+    py{27,34,35,36,37}-dj111
+    py{34,35,36,37}-dj20
+    py{35,36,37}-dj{21,22,dev}
 
 [testenv]
 deps =
@@ -14,6 +14,7 @@ deps =
     dj111: Django>=1.11,<2.0
     dj20: Django>=2.0,<2.1
     dj21: Django>=2.1,<2.2
+    dj22: Django>=2.2,<3.0
     djdev: Django
 commands =
     {envpython} --version