Merge branch 'master' into feat/builtin-models-types

Author: FallenDeity

.github/workflows/test.yml

@@ -30,7 +30,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          pip install -U pip setuptools wheel
+          pip install -U pip "setuptools<79.0.0" wheel
           SETUPTOOLS_ENABLE_FEATURES=legacy-editable pip install -r ./requirements.txt
 
       - name: Run mypy on plugin code
@@ -63,7 +63,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          pip install -U pip setuptools wheel
+          pip install -U pip "setuptools<79.0.0" wheel
           SETUPTOOLS_ENABLE_FEATURES=legacy-editable pip install -r ./requirements.txt
 
       # Must match `shard` definition in the test matrix:
@@ -91,7 +91,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          pip install -U pip setuptools wheel
+          pip install -U pip "setuptools<79.0.0" wheel
           SETUPTOOLS_ENABLE_FEATURES=legacy-editable pip install -r ./requirements.txt
 
       - name: Run stubtest
@@ -112,7 +112,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          pip install -U pip setuptools wheel
+          pip install -U pip "setuptools<79.0.0" wheel
           SETUPTOOLS_ENABLE_FEATURES=legacy-editable pip install -r ./requirements.txt
       - name: Run pyright on the stubs
         uses: jakebailey/pyright-action@v2
@@ -146,7 +146,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          pip install -U pip setuptools wheel
+          pip install -U pip "setuptools<79.0.0" wheel
           SETUPTOOLS_ENABLE_FEATURES=legacy-editable pip install -r ./requirements.txt
           pip install "Django==${{ matrix.django-version }}"
           pip check

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
         args: [--fix=lf]
       - id: check-case-conflict
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.4
+    rev: v0.11.7
     hooks:
       - id: ruff
         args: ["--fix", "--exit-non-zero-on-fix"]

README.md

@@ -49,6 +49,7 @@ We rely on different `django` and `mypy` versions:
 
 | django-stubs   | Mypy version | Django version | Django partial support | Python version |
 |----------------|--------------|----------------|------------------------|----------------|
+| 5.2.0          | 1.13+        | 5.2            | 5.1                    | 3.10 - 3.13    |
 | 5.1.3          | 1.13+        | 5.1            | 4.2                    | 3.9 - 3.13     |
 | 5.1.2          | 1.13+        | 5.1            | 4.2                    | 3.9 - 3.13     |
 | 5.1.1          | 1.13.x       | 5.1            | 4.2                    | 3.8 - 3.12     |

django-stubs/apps/__init__.pyi

@@ -1,2 +1,4 @@
 from .config import AppConfig as AppConfig
 from .registry import apps as apps
+
+__all__ = ["AppConfig", "apps"]

django-stubs/contrib/admin/__init__.pyi

@@ -22,3 +22,28 @@ from .sites import AdminSite as AdminSite
 from .sites import site as site
 
 def autodiscover() -> None: ...
+
+__all__ = [
+    "action",
+    "display",
+    "register",
+    "ModelAdmin",
+    "HORIZONTAL",
+    "VERTICAL",
+    "StackedInline",
+    "TabularInline",
+    "AdminSite",
+    "site",
+    "ListFilter",
+    "SimpleListFilter",
+    "FieldListFilter",
+    "BooleanFieldListFilter",
+    "RelatedFieldListFilter",
+    "ChoicesFieldListFilter",
+    "DateFieldListFilter",
+    "AllValuesFieldListFilter",
+    "EmptyFieldListFilter",
+    "RelatedOnlyFieldListFilter",
+    "ShowFacets",
+    "autodiscover",
+]

django-stubs/contrib/admin/templatetags/admin_list.pyi

@@ -13,7 +13,6 @@ from django.utils.safestring import SafeString
 from .base import InclusionAdminNode
 
 register: Any
-DOT: str
 
 def paginator_number(cl: ChangeList, i: int) -> SafeString: ...
 def pagination(cl: ChangeList) -> dict[str, Any]: ...

django-stubs/contrib/admin/tests.pyi

@@ -23,4 +23,4 @@ class AdminSeleniumTestCase(SeleniumTestCase, StaticLiveServerTestCase):
     def deselect_option(self, selector: str, value: Any) -> None: ...
     def assertSelectOptions(self, selector: str, values: Any) -> None: ...
     def assertSelectedOptions(self, selector: str, values: Any) -> None: ...
-    def has_css_class(self, selector: str, klass: str) -> bool: ...
+    def is_disabled(self, selector: str) -> bool: ...

django-stubs/contrib/admin/utils.pyi

@@ -93,7 +93,7 @@ def label_for_field(
     form: BaseForm | None = ...,
 ) -> str: ...
 def help_text_for_field(name: str, model: type[Model]) -> str: ...
-def display_for_field(value: Any, field: Field, empty_value_display: str) -> str: ...
+def display_for_field(value: Any, field: Field, empty_value_display: str, avoid_link: bool = False) -> str: ...
 def display_for_value(value: Any, empty_value_display: str, boolean: bool = ...) -> str: ...
 
 class NotRelationField(Exception): ...

django-stubs/contrib/admin/widgets.pyi

@@ -133,6 +133,8 @@ class AdminUUIDInputWidget(forms.TextInput):
 
 SELECT2_TRANSLATIONS: dict[str, str]
 
+def get_select2_language() -> str | None: ...
+
 class AutocompleteMixin:
     url_name: str
     field: Any

django-stubs/contrib/admindocs/utils.pyi

@@ -1,4 +1,5 @@
 from collections.abc import Callable
+from re import Pattern
 from typing import Any
 
 from django.utils.safestring import SafeString
@@ -10,7 +11,9 @@ def parse_docstring(docstring: str) -> tuple[str, str, dict[str, str]]: ...
 def parse_rst(text: str, default_reference_context: Any, thing_being_parsed: Any | None = ...) -> SafeString: ...
 
 ROLES: dict[str, str]
+explicit_title_re: Pattern[str]
 
+def split_explicit_title(text: str) -> tuple[bool, str, str]: ...
 def create_reference_role(rolename: str, urlbase: str) -> None: ...
 def default_reference_role(
     name: str,
@@ -27,3 +30,4 @@ unnamed_group_matcher: Any
 
 def replace_named_groups(pattern: str) -> str: ...
 def replace_unnamed_groups(pattern: str) -> str: ...
+def strip_p_tags(value: str) -> SafeString: ...