Skip to content

PoC: use moved module django.contrib.admindocs.regex if available #9636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

PoC: use moved module django.contrib.admindocs.regex if available #9636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6f683b
PoC: use moved module django.contrib.admindocs.regex if available
browniebroke Jan 29, 2025
70e5555
PoC: use moved module django.contrib.admindocs.regex if available
browniebroke Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion rest_framework/schemas/generators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 12 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Loading