Skip to content

Commit 9aab6c9

Browse files
authored
Fix GitHub Actions configuration (jazzband#419)
* Fix GitHub Actions configuration * Remove deprecated import
1 parent c8df2cd commit 9aab6c9

File tree

2 files changed

+9
-24
lines changed

2 files changed

+9
-24
lines changed

dbbackup/tests/testapp/urls.py

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
try:
2-
from django.conf.urls import patterns, include, url
3-
urlpatterns = patterns(
4-
'',
5-
# url(r'^admin/', include(admin.site.urls)),
6-
)
7-
except ImportError:
8-
from django.conf.urls import include, url
9-
urlpatterns = (
10-
# url(r'^admin/', include(admin.site.urls)),
11-
)
1+
from django.urls import include, re_path
2+
3+
urlpatterns = (
4+
# url(r'^admin/', include(admin.site.urls)),
5+
)

tox.ini

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
11
[tox]
2-
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
2+
envlist = py{36,37,38,39}-django22,py{36,37,38,39,310}-django{32,40,master},lint,docs,functional
33

44
[testenv]
55
passenv = *
66
setenv =
77
PYTHONDONTWRITEBYTECODE=1
8-
basepython =
9-
py3.6: python3.6
10-
py3.7: python3.7
11-
py3.8: python3.8
12-
py3.9: python3.9
13-
py3.10: python3.10
14-
pypypy: pypy
15-
pypypy3: pypy3
16-
pynightly: python
178
deps =
189
-rrequirements-tests.txt
19-
django2.2: Django>=2.2,<2.3
20-
django3.2: Django>=3.2,<3.3
21-
django4.0: Django>=4.0,<4.1
10+
django22: Django>=2.2,<2.3
11+
django32: Django>=3.2,<3.3
12+
django40: Django>=4.0,<4.1
2213
djangomaster: https://github.com/django/django/archive/master.zip
2314
commands = {posargs:coverage run runtests.py}
2415

0 commit comments

Comments
 (0)