diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9b826f6..dc3915a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,10 +7,10 @@ repos: - id: pyupgrade args: ['--keep-percent-format', '--py37-plus'] - repo: https://github.com/adamchainz/django-upgrade - rev: 1.10.0 + rev: 1.13.0 hooks: - id: django-upgrade - args: ['--target-version', '2.2'] + args: ['--target-version', '3.2'] - repo: https://github.com/psf/black rev: 22.3.0 hooks: diff --git a/README b/README index 86e0070..fe00b81 100644 --- a/README +++ b/README @@ -354,7 +354,7 @@ djhtml is used to automatically indent html files, using those parameters: django-upgrade is used to automatically upgrade Django syntax, using those parameters: - django-upgrade --target-version 2.2 + django-upgrade --target-version 3.2 There is .pre-commit-config.yaml to use pre-commit to automatically run these tools before commits. (execute `pre-commit install` to install the git hook.) diff --git a/tests/urls_tests.py b/tests/urls_tests.py index b6105d7..70377d9 100644 --- a/tests/urls_tests.py +++ b/tests/urls_tests.py @@ -14,7 +14,7 @@ # along with this program. If not, see . from django.http import HttpResponse -from django.urls import include, path, re_path +from django.urls import include, path def homepage(request): @@ -22,6 +22,6 @@ def homepage(request): urlpatterns = [ - re_path('^', include('mellon.urls')), + path('', include('mellon.urls')), path('', homepage, name='homepage'), ] diff --git a/tests/urls_tests_template_base.py b/tests/urls_tests_template_base.py index 4444aaa..b4a71d8 100644 --- a/tests/urls_tests_template_base.py +++ b/tests/urls_tests_template_base.py @@ -14,7 +14,7 @@ # along with this program. If not, see . from django.http import HttpResponse -from django.urls import include, path, re_path +from django.urls import include, path def homepage(request): @@ -22,6 +22,6 @@ def homepage(request): urlpatterns = [ - re_path('^', include('mellon.urls'), kwargs={'template_base': 'theme.html'}), + path('', include('mellon.urls'), kwargs={'template_base': 'theme.html'}), path('', homepage, name='homepage'), ] diff --git a/tests/urls_tests_template_hook.py b/tests/urls_tests_template_hook.py index fa3a22b..e53bda4 100644 --- a/tests/urls_tests_template_hook.py +++ b/tests/urls_tests_template_hook.py @@ -14,7 +14,7 @@ # along with this program. If not, see . from django.http import HttpResponse -from django.urls import include, path, re_path +from django.urls import include, path def homepage(request): @@ -26,8 +26,8 @@ def context_hook(context): urlpatterns = [ - re_path( - '^', + path( + '', include('mellon.urls'), kwargs={ 'template_base': 'theme.html',