From 41b905c92eb408fdca94831af5ba9b22a16c39d7 Mon Sep 17 00:00:00 2001
From: John Franey <jfraney@nepfin.com>
Date: Wed, 11 Sep 2019 15:06:24 -0400
Subject: [PATCH] Update tested Python & Django versions

Replaces `django.utils.six` with `six` to support newer Django versions.

Updates Tox config to:
- remove unsupported Django versions
- add pypy3
- add Django 2.2
- update djmaster Python versions
---
 configurations/base.py   |  2 +-
 configurations/utils.py  |  2 +-
 configurations/values.py |  2 +-
 setup.py                 |  2 +-
 tests/settings/main.py   |  1 -
 tests/urls.py            |  4 ----
 tox.ini                  | 11 ++++++-----
 7 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/configurations/base.py b/configurations/base.py
index c9778fb..1f38cf0 100644
--- a/configurations/base.py
+++ b/configurations/base.py
@@ -1,7 +1,7 @@
 import os
 import re
+import six
 
-from django.utils import six
 from django.conf import global_settings
 from django.core.exceptions import ImproperlyConfigured
 
diff --git a/configurations/utils.py b/configurations/utils.py
index 1d4a401..7f972e7 100644
--- a/configurations/utils.py
+++ b/configurations/utils.py
@@ -1,10 +1,10 @@
 import inspect
+import six
 import sys
 
 from importlib import import_module
 
 from django.core.exceptions import ImproperlyConfigured
-from django.utils import six
 
 
 def isuppercase(name):
diff --git a/configurations/values.py b/configurations/values.py
index 0f96e3d..8f10338 100644
--- a/configurations/values.py
+++ b/configurations/values.py
@@ -2,11 +2,11 @@ import ast
 import copy
 import decimal
 import os
+import six
 import sys
 
 from django.core import validators
 from django.core.exceptions import ValidationError, ImproperlyConfigured
-from django.utils import six
 
 from .utils import import_by_path, getargspec
 
diff --git a/setup.py b/setup.py
index 7a2efdf..7134712 100644
--- a/setup.py
+++ b/setup.py
@@ -41,6 +41,7 @@ setup(
             'django-cadmin = configurations.management:execute_from_command_line',
         ],
     },
+    install_requires=['six'],
     extras_require={
         'cache': ['django-cache-url'],
         'database': ['dj-database-url'],
@@ -53,7 +54,6 @@ setup(
             'dj-database-url',
             'dj-email-url',
             'dj-search-url',
-            'six',
             'Sphinx>=1.4',
         ],
     },
diff --git a/tests/settings/main.py b/tests/settings/main.py
index 2e0b779..90e252f 100644
--- a/tests/settings/main.py
+++ b/tests/settings/main.py
@@ -31,7 +31,6 @@ class Test(Configuration):
         'django.contrib.contenttypes',
         'django.contrib.sites',
         'django.contrib.auth',
-        'django.contrib.admin',
         'tests',
     ]
 
diff --git a/tests/urls.py b/tests/urls.py
index ede2ec9..1170d21 100644
--- a/tests/urls.py
+++ b/tests/urls.py
@@ -1,6 +1,2 @@
-from django.conf.urls import url
-from django.contrib import admin
-
 urlpatterns = [
-    url(r'^admin/', admin.site.urls),
 ]
diff --git a/tox.ini b/tox.ini
index 233ad84..78f3055 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,9 +6,10 @@ whitelist_externals = sphinx-build
 envlist =
     checkqa,
     readme-py27,
-    py{27,34,35,36,py}-dj{18,110,111}
-    py{34,35,36,37}-dj20
-    py{35,36,37}-dj{21,master}
+    py{27,34,35,36,py}-dj111
+    py{34,35,36,37,py3}-dj20
+    py{35,36,37,py3}-dj{21,22}
+    py{36,37,38,py3}-dj{30,master}
 
 [testenv]
 usedevelop = true
@@ -18,11 +19,11 @@ setenv =
     coverage: COVERAGE_PROCESS_START = {toxinidir}/setup.cfg
     coverage: _TEST_RUN_PREFIX=coverage run
 deps =
-    dj18: django>=1.8,<1.9
-    dj110: django>=1.10,<1.11
     dj111: django>=1.11,<2.0
     dj20: django>=2.0a1,<2.1
     dj21: django>=2.1a1,<2.2
+    dj22: django>=2.2a1,<3.0
+    dj30: django>=3.0a1<3.1
     djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django
     py27,pypy: mock
     coverage: coverage