From 16b256268e5ba6424432bd0e84e60df674acf412 Mon Sep 17 00:00:00 2001
From: Jacob Rief <jacob.rief@gmail.com>
Date: Mon, 11 May 2020 10:21:00 +0200
Subject: [PATCH] add Django-3 to testing matrix

---
 .travis.yml |  1 +
 setup.py    | 43 ++++++++++++++++++++++---------------------
 tox.ini     |  3 ++-
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4315c3d2b..7eaf2b0f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ python:
 env:
   - DJANGOVER=django21
   - DJANGOVER=django22
+  - DJANGOVER=django30
 
 install:
   - pip install tox
diff --git a/setup.py b/setup.py
index d87a2a7c9..125881f09 100644
--- a/setup.py
+++ b/setup.py
@@ -5,19 +5,37 @@
 with open('README.md', 'r') as fh:
     long_description = fh.read()
 
+REQUIREMENTS = [
+    'Django>=2.1,<3.1',
+    'django-filer>=1.7',
+    'django-ipware',
+    'django-fsm',
+    'django-fsm-admin',
+    'djangorestframework>=3.9,<4',
+    'django-rest-auth',
+    'django-angular',
+    'Django-Select2',
+    'django-rest-auth',
+    'django-admin-sortable2',
+    'django-formtools',
+    'django_polymorphic',
+    'django-post_office',
+    'django-cms>=3.7',
+    'djangocms-cascade>=1.3',
+]
+
 CLASSIFIERS = [
     'Environment :: Web Environment',
     'Framework :: Django',
     'Intended Audience :: Developers',
     'License :: OSI Approved :: BSD License',
     'Operating System :: OS Independent',
-    'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
-    'Framework :: Django :: 1.11',
-    'Framework :: Django :: 2.0',
+    'Programming Language :: Python :: 3.8',
     'Framework :: Django :: 2.1',
     'Framework :: Django :: 2.2',
+    'Framework :: Django :: 3.0',
     'Topic :: Software Development :: Libraries :: Application Frameworks',
     'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
 ]
@@ -37,22 +55,5 @@
     packages=find_packages(exclude=['tests', 'docs']),
     include_package_data=True,
     zip_safe=False,
-    install_requires=[
-        'Django>=2.1,<3.1',
-        'django-filer',
-        'django-ipware',
-        'django-fsm',
-        'django-fsm-admin',
-        'djangorestframework>=3.9,<4',
-        'django-rest-auth',
-        'django-angular',
-        'Django-Select2',
-        'django-rest-auth',
-        'django-admin-sortable2',
-        'django-formtools',
-        'django_polymorphic',
-        'django-post_office',
-        'django-cms>=3.7',
-        'djangocms-cascade',
-    ],
+    install_requires=REQUIREMENTS,
 )
diff --git a/tox.ini b/tox.ini
index 8eddd3f9f..de222c660 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36,37,38}-django{21,22}
+envlist = py{36,37,38}-django{21,22,30}
 
 [testenv]
 changedir = tests
@@ -10,5 +10,6 @@ commands =
 deps =
     django21: Django>=2.1,<2.2
     django22: Django>=2.2,<3.0
+    django30: Django>=3.0,<3.1
 setenv =
     DJANGO_DEBUG = 1