From 3cbd2d015945199e5aed67c9de939383e00bfb25 Mon Sep 17 00:00:00 2001
From: Antoine LAURENT <antoine.laurent@polyconseil.fr>
Date: Mon, 17 Feb 2020 10:37:27 +0100
Subject: [PATCH] Add Django 3.0 Support

---
 .travis.yml                     | 12 +++++++-----
 HISTORY.rst                     |  3 ++-
 README.rst                      |  2 +-
 cid/backends/postgresql/base.py |  3 +--
 setup.py                        |  1 +
 tox.ini                         | 10 +++++-----
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cbd0fea..ecc596e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,18 +8,20 @@ matrix:
   fast_finish: true
   include:
     # https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django
-    - {env: DJANGO=2.1, python: '3.5'}
-    - {env: DJANGO=2.1, python: '3.6'}
-    - {env: DJANGO=2.1, python: '3.7'}
-    - {env: DJANGO=2.1, python: 'nightly'}
-
     - {env: DJANGO=2.2, python: '3.5'}
     - {env: DJANGO=2.2, python: '3.6'}
     - {env: DJANGO=2.2, python: '3.7'}
+    - {env: DJANGO=2.2, python: '3.8'}
     - {env: DJANGO=2.2, python: 'nightly'}
 
+    - {env: DJANGO=3.0, python: '3.6'}
+    - {env: DJANGO=3.0, python: '3.7'}
+    - {env: DJANGO=3.0, python: '3.8'}
+    - {env: DJANGO=3.0, python: 'nightly'}
+
     - {env: DJANGO=master, python: '3.6'}
     - {env: DJANGO=master, python: '3.7'}
+    - {env: DJANGO=master, python: '3.8'}
     - {env: DJANGO=master, python: 'nightly'}
 
     - {python: '3.7', env: TOXENV=docs}
diff --git a/HISTORY.rst b/HISTORY.rst
index 8644d26..564ea1a 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,7 +4,8 @@ History
 2.1 (unreleased)
 ++++++++++++++++
 
-- Nothing changed yet.
+* Add support of Django 3.0
+* |backward-incompatible| Drop support of Django 2.1.
 
 
 2.0 (2019-09-27)
diff --git a/README.rst b/README.rst
index e4f6376..cf180f3 100644
--- a/README.rst
+++ b/README.rst
@@ -49,7 +49,7 @@ Supported versions
 
 We currently support the following versions:
 
-- Django 2.1 with Python >= 3.5.
 - Django 2.2 with Python >= 3.5.
+- Django 3.0 with Python >= 3.6.
 
 Other versions may work but are not supported.
diff --git a/cid/backends/postgresql/base.py b/cid/backends/postgresql/base.py
index 26b3fd1..9554507 100644
--- a/cid/backends/postgresql/base.py
+++ b/cid/backends/postgresql/base.py
@@ -1,5 +1,4 @@
-from django.db.backends.postgresql_psycopg2.base import \
-    DatabaseWrapper as BaseDatabaseWrapper
+from django.db.backends.postgresql.base import DatabaseWrapper as BaseDatabaseWrapper
 
 from ...cursor import CidCursorWrapper
 
diff --git a/setup.py b/setup.py
index 354cd86..68ba0de 100755
--- a/setup.py
+++ b/setup.py
@@ -44,5 +44,6 @@ def clean_history(history):
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
 )
diff --git a/tox.ini b/tox.ini
index 555ffbf..ea53813 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,23 +1,23 @@
 [tox]
 envlist =
-    py{35,36,37,nightly}-django21,
-    py{35,36,37,nightly}-django22,
-    py{36,37,nightly}-djangomaster,
+    py{35,36,37,38,nightly}-django22,
+    py{36,37,38,nightly}-django30,
+    py{36,37,38,nightly}-djangomaster,
     docs,
     quality
 
 [travis:env]
 DJANGO =
-    2.1: django21
     2.2: django22
+    3.0: django30
     master: djangomaster
 
 [testenv]
 commands = /usr/bin/make test
 envdir = {toxworkdir}/venvs/{envname}
 deps =
-    django21: Django==2.1.*
     django22: Django==2.2.*
+    django30: Django==3.0.*
     djangomaster: https://github.com/django/django/archive/master.tar.gz
     -rrequirements/tests.txt