From cb3443aa4c40ee4e559c0fadc74e7ee233448757 Mon Sep 17 00:00:00 2001
From: Fabio Caccamo <fabio.caccamo@gmail.com>
Date: Mon, 29 Apr 2019 17:51:51 +0200
Subject: [PATCH] Added django 2.2 to tox and travis and updated README.

---
 .travis.yml | 13 +++++++++++++
 README.md   |  5 +++--
 README.rst  |  5 +++--
 setup.py    |  1 +
 tox.ini     |  7 ++++---
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fb45070..232bb95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,6 +36,8 @@ env:
   - TOX_ENV=py35-dj20-postgres
   - TOX_ENV=py35-dj21-sqlite
   - TOX_ENV=py35-dj21-postgres
+  - TOX_ENV=py35-dj22-sqlite
+  - TOX_ENV=py35-dj22-postgres
 matrix:
   include:
     - python: "3.6"
@@ -50,6 +52,10 @@ matrix:
       env:
         - TOX_ENV=py36-dj21-sqlite
         - TOX_ENV=py36-dj21-postgres
+    - python: "3.6"
+      env:
+        - TOX_ENV=py36-dj22-sqlite
+        - TOX_ENV=py36-dj22-postgres
     - python: "3.6"
       env:
         - TOX_ENV=py36-djmaster-sqlite
@@ -68,6 +74,13 @@ matrix:
       dist: xenial
       language: python
       sudo: required
+    - python: "3.7"
+      env:
+        - TOX_ENV=py37-dj22-sqlite
+        - TOX_ENV=py37-dj22-postgres
+      dist: xenial
+      language: python
+      sudo: required
     - python: "3.7"
       env:
         - TOX_ENV=py37-djmaster-sqlite
diff --git a/README.md b/README.md
index af15627..0a3d9ae 100644
--- a/README.md
+++ b/README.md
@@ -18,15 +18,16 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
 - List filter dropdown *(optional)*
 - `NEW` **Related modal** *(instead of the old popup window, optional)*
 - `NEW` **Environment name/marker**
-- Style optimizations for:
+- Compatibility / Style optimizations for:
   - `django-ckeditor`
+  - `django-dynamic-raw-id`
   - `django-modeltranslation`
   - `django-tabbed-admin`
   - `sorl-thumbnail`
 
 ## Requirements
 - Python 2.7, 3.4, 3.5, 3.6, 3.7
-- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0, 2.1
+- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0, 2.1, 2.2
 
 ## Installation
 - Run `pip install django-admin-interface`
diff --git a/README.rst b/README.rst
index c7cb177..a78a4c7 100644
--- a/README.rst
+++ b/README.rst
@@ -18,8 +18,9 @@ Features
 - List filter dropdown *(optional)*
 - ``NEW`` **Related modal** (instead of the old popup window, optional)
 - ``NEW`` **Environment name/marker**
-- Style optimizations for:
+- Compatibility / Style optimizations for:
   - `django-ckeditor`
+  - `django-dynamic-raw-id`
   - `django-modeltranslation`
   - `django-tabbed-admin`
   - `sorl-thumbnail`
@@ -28,7 +29,7 @@ Requirements
 ------------
 
 - Python 2.7, 3.4, 3.5, 3.6, 3.7
-- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0, 2.1
+- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0, 2.1, 2.2
 
 Installation
 ------------
diff --git a/setup.py b/setup.py
index 717ba23..9105cc6 100644
--- a/setup.py
+++ b/setup.py
@@ -47,6 +47,7 @@ setup(
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
         'Framework :: Django :: 2.1',
+        'Framework :: Django :: 2.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
diff --git a/tox.ini b/tox.ini
index 7b8d86d..6a8a8f7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,9 +2,9 @@
 envlist =
     py27-{dj17,dj18,dj19,dj110,dj111}-{sqlite,postgres},
     py34-{dj17,dj18,dj19,dj110,dj111,dj20}-{sqlite,postgres},
-    py35-{dj18,dj19,dj110,dj111,dj20,dj21}-{sqlite,postgres},
-    py36-{dj18,dj19,dj110,dj111,dj20,dj21,djmaster}-{sqlite,postgres},
-    py37-{dj20,dj21,djmaster}-{sqlite,postgres},
+    py35-{dj18,dj19,dj110,dj111,dj20,dj21,dj22}-{sqlite,postgres},
+    py36-{dj18,dj19,dj110,dj111,dj20,dj21,dj22,djmaster}-{sqlite,postgres},
+    py37-{dj20,dj21,dj22,djmaster}-{sqlite,postgres},
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
 deps =
@@ -15,6 +15,7 @@ deps =
     dj111: Django >= 1.11, < 1.12
     dj20: Django >= 2.0, < 2.1
     dj21: Django >= 2.1, < 2.2
+    dj22: Django >= 2.2, < 2.3
     djmaster: https://github.com/django/django/archive/master.tar.gz
     # mysql: mysqlclient
     postgres: psycopg2-binary