From 51a4ca98a1d64b440845f2f69cd340ff6473eddf Mon Sep 17 00:00:00 2001
From: Rob Charlwood <368364+robcharlwood@users.noreply.github.com>
Date: Wed, 4 Dec 2019 19:17:28 +0000
Subject: [PATCH] Updated codebase for Django 3 and Python 3.8

Also removed the failing tox builds for python 3.5.7 and 3.6.8
---
 .travis.yml | 27 +++++++++++++++++++--------
 setup.py    |  4 +++-
 tox.ini     | 10 ++++++----
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 434f3ac2..f61c85da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,10 +21,8 @@ matrix:
       env: TOXENV=django2-py35
     - python: "3.5"
       env: TOXENV=django21-py35
-    - python: "3.5.7"
-      sudo: required
-      dist: xenial
-      env: TOXENV=django22-py357
+    - python: "3.5"
+      env: TOXENV=django22-py35
 
     - python: "3.6"
       env: TOXENV=django111-py36
@@ -32,10 +30,10 @@ matrix:
       env: TOXENV=django2-py36
     - python: "3.6"
       env: TOXENV=django21-py36
-    - python: "3.6.8"
-      sudo: required
-      dist: xenial
-      env: TOXENV=django22-py368
+    - python: "3.6"
+      env: TOXENV=django22-py36
+    - python: "3.6"
+      env: TOXENV=django3-py36
 
     - python: "3.7"
       sudo: required
@@ -53,11 +51,24 @@ matrix:
       sudo: required
       dist: xenial
       env: TOXENV=django22-py37
+    - python: "3.7"
+      sudo: required
+      dist: xenial
+      env: TOXENV=django3-py37
     - python: "3.7"
       sudo: required
       dist: xenial
       env: TOXENV=pycodestyle-py37
 
+    - python: "3.8"
+      sudo: required
+      dist: xenial
+      env: TOXENV=django3-py38
+    - python: "3.8"
+      sudo: required
+      dist: xenial
+      env: TOXENV=pycodestyle-py38
+
 cache: pip
 
 script:
diff --git a/setup.py b/setup.py
index 19ab5201..3bade3a5 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
     url='http://github.com/praekelt/django-recaptcha',
     packages=find_packages(),
     install_requires=[
-        'django>1.11,<3.0',
+        'django>1.11,<4.0',
     ],
     tests_require=[
         'tox',
@@ -25,6 +25,7 @@
     include_package_data=True,
     classifiers=[
         'Development Status :: 5 - Production/Stable',
+        'Framework :: Django :: 3.0',
         'Framework :: Django :: 2.2',
         'Framework :: Django :: 2.1',
         'Framework :: Django :: 2.0',
@@ -41,6 +42,7 @@
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
     zip_safe=False,
 )
diff --git a/tox.ini b/tox.ini
index 054dfa71..b8a67935 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,20 @@
 [tox]
 envlist =
-    pycodestyle-{py27,py37},
+    pycodestyle-{py27,py37,py38}
     django{111,2,21}-{py27,py35,py36,py37}
-    django{22}-{py357,py368,py37}
+    django{22}-{py35,py36,py37}
+    django{3}-{py36,py37,py38}
 
 [testenv]
 deps =
-    django{111,2,21,22}: coverage
+    django{111,2,21,22,3}: coverage
     django111: Django<2.0
     django2: Django<2.1
     django21: Django<2.2
     django22: Django<3.0
+    django3: Django<4.0
     py27: -rcaptcha/tests/requirements/py27.txt
     pycodestyle: pycodestyle
 commands =
-    django{111,2,21,22}: coverage run manage.py test
+    django{111,2,21,22,3}: coverage run manage.py test
     pycodestyle: pycodestyle captcha/