diff --git a/rest_framework/schemas/generators.py b/rest_framework/schemas/generators.py index f59e25c213..49a561fecf 100644 --- a/rest_framework/schemas/generators.py +++ b/rest_framework/schemas/generators.py @@ -7,7 +7,12 @@ from importlib import import_module from django.conf import settings -from django.contrib.admindocs.views import simplify_regex + +try: + from django.contrib.admindocs.regex import simplify_regex +except ImportError: + from django.contrib.admindocs.views import simplify_regex + from django.core.exceptions import PermissionDenied from django.http import Http404 from django.urls import URLPattern, URLResolver diff --git a/tox.ini b/tox.ini index f565a12819..ee4f4ca953 100644 --- a/tox.ini +++ b/tox.ini @@ -3,8 +3,8 @@ envlist = {py38,py39}-{django42} {py310}-{django42,django50,django51,djangomain} {py311}-{django42,django50,django51,djangomain} - {py312}-{django42,django50,django51,djangomain} - {py313}-{django51,djangomain} + {py312}-{django42,django50,django51,djangomain,djangofork} + {py313}-{django51,djangomain,djangofork} base dist docs @@ -20,6 +20,7 @@ deps = django50: Django>=5.0,<5.1 django51: Django>=5.1,<5.2 djangomain: https://github.com/django/django/archive/main.tar.gz + djangofork: https://github.com/browniebroke/django/archive/split-admindocs-regexes-utils.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt setuptools @@ -52,3 +53,12 @@ ignore_outcome = true [testenv:py312-djangomain] ignore_outcome = true + +[testenv:py313-djangomain] +ignore_outcome = true + +[testenv:py312-djangofork] +ignore_outcome = true + +[testenv:py313-djangofork] +ignore_outcome = true