From 9aab6c95e754e0c6487759fce26dc970c1eddb3d Mon Sep 17 00:00:00 2001
From: johnthagen <johnthagen@users.noreply.github.com>
Date: Sun, 9 Jan 2022 13:48:34 -0500
Subject: [PATCH] Fix GitHub Actions configuration (#419)

* Fix GitHub Actions configuration

* Remove deprecated import
---
 dbbackup/tests/testapp/urls.py | 16 +++++-----------
 tox.ini                        | 17 ++++-------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/dbbackup/tests/testapp/urls.py b/dbbackup/tests/testapp/urls.py
index 44ca7b73..df25a40a 100644
--- a/dbbackup/tests/testapp/urls.py
+++ b/dbbackup/tests/testapp/urls.py
@@ -1,11 +1,5 @@
-try:
-    from django.conf.urls import patterns, include, url
-    urlpatterns = patterns(
-        '',
-        # url(r'^admin/', include(admin.site.urls)),
-    )
-except ImportError:
-    from django.conf.urls import include, url
-    urlpatterns = (
-        # url(r'^admin/', include(admin.site.urls)),
-    )
+from django.urls import include, re_path
+
+urlpatterns = (
+    # url(r'^admin/', include(admin.site.urls)),
+)
diff --git a/tox.ini b/tox.ini
index 82b58af1..97295bd5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,24 +1,15 @@
 [tox]
-envlist = py{3.6,3.7,3.8,nightly}-django2.2,py{3.6,3.7,3.8,3.9,3.10,nightly}-django{3.2,4.0,master},lint,docs,functional
+envlist = py{36,37,38,39}-django22,py{36,37,38,39,310}-django{32,40,master},lint,docs,functional
 
 [testenv]
 passenv = *
 setenv =
     PYTHONDONTWRITEBYTECODE=1
-basepython =
-    py3.6: python3.6
-    py3.7: python3.7
-    py3.8: python3.8
-    py3.9: python3.9
-    py3.10: python3.10
-    pypypy: pypy
-    pypypy3: pypy3
-    pynightly: python
 deps =
     -rrequirements-tests.txt
-    django2.2: Django>=2.2,<2.3
-    django3.2: Django>=3.2,<3.3
-    django4.0: Django>=4.0,<4.1
+    django22: Django>=2.2,<2.3
+    django32: Django>=3.2,<3.3
+    django40: Django>=4.0,<4.1
     djangomaster: https://github.com/django/django/archive/master.zip
 commands = {posargs:coverage run runtests.py}