From 2820a8777dd00b69ab9d636ba34c3b0492ae0f22 Mon Sep 17 00:00:00 2001
From: Jonathan Sundqvist <sundqvist.jonathan@gmail.com>
Date: Tue, 18 Feb 2020 11:58:05 +0100
Subject: [PATCH] Support django 2.2

---
 .circleci/config.yml   | 23 ++++++++++++++++++++---
 setup.py               |  9 ++++++++-
 tests/requirements.txt |  1 -
 tox.ini                |  4 ++--
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9c03208f..cb7d8a0d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -68,14 +68,22 @@ jobs:
     <<: *py36default
   py35-dj20-sqlite-cms40-default:
     <<: *py35default
+  py35-dj22-sqlite-cms40-default:
+    <<: *py35default
   py36-dj20-sqlite-cms40-default:
     <<: *py36default
   py36-dj21-sqlite-cms40-default:
     <<: *py36default
+  py36-dj22-sqlite-cms40-default:
+    <<: *py36default
   py35-dj20-sqlite-cms40-versioning:
     <<: *py35default
+  py35-dj22-sqlite-cms40-versioning:
+    <<: *py35default
   py36-dj21-sqlite-cms40-versioning:
     <<: *py36default
+  py36-dj22-sqlite-cms40-versioning:
+    <<: *py36default
 
 #######################
 
@@ -97,15 +105,24 @@ workflows:
       - py35-dj20-sqlite-cms40-default:
           requires:
             - py35_base
+      - py35-dj20-sqlite-cms40-versioning:
+          requires:
+            - py35_base
+      - py35-dj22-sqlite-cms40-versioning:
+          requires:
+            - py35_base
       - py36-dj20-sqlite-cms40-default:
           requires:
             - py36_base
       - py36-dj21-sqlite-cms40-default:
           requires:
             - py36_base
-      - py35-dj20-sqlite-cms40-versioning:
-          requires:
-            - py35_base
       - py36-dj21-sqlite-cms40-versioning:
           requires:
             - py36_base
+      - py36-dj22-sqlite-cms40-default:
+          requires:
+            - py36_base
+      - py36-dj22-sqlite-cms40-versioning:
+          requires:
+            - py36_base
diff --git a/setup.py b/setup.py
index 23fa63b3..229e3ceb 100644
--- a/setup.py
+++ b/setup.py
@@ -20,14 +20,19 @@
     'Framework :: Django :: 1.11',
     'Framework :: Django :: 2.0',
     'Framework :: Django :: 2.1',
+    'Framework :: Django :: 2.2',
 ]
 
 INSTALL_REQUIREMENTS = [
-    'Django>=1.11,<2.2',
+    'Django>=1.11,<3.0',
     'django-parler>=1.4',
     'django-cms'
 ]
 
+TEST_REQUIRE = [
+    'djangocms-versioning'
+]
+
 setup(
     name='djangocms-alias',
     author='Divio AG',
@@ -43,8 +48,10 @@
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,
+    tests_require=TEST_REQUIRE,
     test_suite='test_settings.run',
     dependency_links=[
         'http://github.com/divio/django-cms/tarball/release/4.0.x#egg=django-cms-4.0.0',
+        'http://github.com/divio/djangocms-versioning/tarball/master#egg=djangocms-versioning-0.0.23',
     ]
 )
diff --git a/tests/requirements.txt b/tests/requirements.txt
index d77453b3..4e63a2ea 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -2,5 +2,4 @@ coverage
 djangocms_helper
 flake8
 isort
-https://github.com/divio/djangocms-versioning/archive/master.zip
 pyflakes>=2.1.1
diff --git a/tox.ini b/tox.ini
index 481b8fdd..9ba4af84 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 envlist =
     flake8
     isort
-    py{34,35,36}-dj{111,20,21}-sqlite-cms40-{default,versioning}
+    py{35,36}-dj{111,20,21,22}-sqlite-cms40-{default,versioning}
 
 skip_missing_interpreters=True
 
@@ -14,11 +14,11 @@ deps =
 
     dj111: Django>=1.11,<2.0
     dj20: Django>=2.0,<2.1
+    dj22: Django>2.1,<3.0
 
     cms40: https://github.com/divio/django-cms/archive/release/4.0.x.zip
 
 basepython =
-    py34: python3.4
     py35: python3.5
     py36: python3.6