Merge branch 'master' into sobolevn-patch-2

Author: intgr

.github/dependabot.yml

@@ -0,0 +1,13 @@
+{
+  "dependencyDashboard": true,
+  "mode": "full",
+  "lockFileMaintenance": {
+    "enabled": true,
+    "automerge": true,
+    "automergeType": "branch",
+    "schedule": ["* * * * 1"],
+    "automergeSchedule": ["* * * * 2"]
+  },
+  "packageRules": [
+  ]
+}

.github/renovate.json

@@ -20,7 +20,7 @@ jobs:
         shard-index: [0]  # e.g. change this to [0, 1, 2] and --num-shards below to 3
       fail-fast: false
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           path: django-stubs_to_test
           fetch-depth: 0
@@ -64,15 +64,15 @@ jobs:
         run: |
           echo ${{ github.event.pull_request.number }} | tee pr_number.txt
       - name: Upload mypy_primer diff + PR number
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         if: ${{ matrix.shard-index == 0 }}
         with:
           name: mypy_primer_diffs-${{ matrix.shard-index }}
           path: |
             diff_${{ matrix.shard-index }}.txt
             pr_number.txt
       - name: Upload mypy_primer diff
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         if: ${{ matrix.shard-index != 0 }}
         with:
           name: mypy_primer_diffs-${{ matrix.shard-index }}
@@ -86,7 +86,7 @@ jobs:
       contents: read
     steps:
       - name: Merge artifacts
-        uses: actions/upload-artifact/merge@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact/merge@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: mypy_primer_diffs
           pattern: mypy_primer_diffs-*

.github/workflows/mypy_primer.yml

@@ -49,7 +49,7 @@ jobs:
             return parseInt(fs.readFileSync("pr_number.txt", { encoding: "utf8" }))
 
       - name: Hide old comments
-        uses: int128/hide-comment-action@9803637eab610cca14ac6f64c42c0d7ffe9327e0  # v1.44.0
+        uses: int128/hide-comment-action@3580fff2b9b7c0e16466686530622f0eed93132a  # v1.47.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           issue-number: ${{ steps.get-pr-number.outputs.result }}

.github/workflows/mypy_primer_comment.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+      # Renovate "automerge" branches -- there is no PR, so branch tests are used instead
+      - "renovate/lock-file-maintenance"
   pull_request:
   workflow_dispatch:
 

.github/workflows/test.yml

@@ -15,7 +15,7 @@ repos:
         args: [--fix=lf]
       - id: check-case-conflict
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.13.3
+    rev: v0.14.5
     hooks:
       - id: ruff-check
         args: ["--fix", "--exit-non-zero-on-fix"]
@@ -26,10 +26,16 @@ repos:
       - id: codespell
         additional_dependencies:
           - tomli
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    rev: 0.9.9
+    hooks:
+      - id: uv-lock
 
 ci:
   autofix_commit_msg: "[pre-commit.ci] auto fixes from pre-commit.com hooks"
   autofix_prs: true
   autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate"
   autoupdate_schedule: weekly
   submodules: false
+  skip:
+    - uv-lock

.pre-commit-config.yaml

@@ -77,6 +77,10 @@ MANAGERS: _Admins
 # Content-Type header.
 DEFAULT_CHARSET: str
 
+# `SERIALIZATION_MODULES` is a dictionary (`dict[str, str]`) of modules containing serializer definitions.
+# Because Django doesn't define it, we can't provide its type here. Use `getattr` for type-safe access
+# e.g. `getattr(settings, "SERIALIZATION_MODULES")`
+
 # Email address that error messages come from.
 SERVER_EMAIL: str
 
@@ -96,6 +100,10 @@ DATABASE_ROUTERS: list[str | Router]
 # to a module that defines an EmailBackend class.
 EMAIL_BACKEND: str
 
+# `EMAIL_FILE_PATH` is a `str` indicating the directory used by the file email backend to store output files.
+# Because Django doesn't define it, we can't provide its type here. Use `getattr` for type-safe access
+# e.g. `getattr(settings, "EMAIL_FILE_PATH")`
+
 # Host for sending email.
 EMAIL_HOST: str
 
@@ -170,6 +178,10 @@ ABSOLUTE_URL_OVERRIDES: dict[str, Any]
 #    ]
 IGNORABLE_404_URLS: list[Pattern[str]]
 
+# `ROOT_URLCONF` is a string representing the full Python import path to the root `URLconf`.
+# Because Django doesn't define it, we can't provide its type here. Use `getattr` for type-safe access
+# e.g. `getattr(settings, "ROOT_URLCONF")`
+
 # A secret key for this particular Django installation. Used in secret-key
 # hashing algorithms. Set this in your settings, or Django will complain
 # loudly.
@@ -189,6 +201,10 @@ MEDIA_ROOT: str
 # Examples: "http://example.com/media/", "http://media.example.com/"
 MEDIA_URL: str
 
+# `SITE_ID` is the ID, as an integer, of the current site in the `django_site` database table.
+# Because Django doesn't define it, we can't provide its type here. Use `getattr` for type-safe access
+# e.g. `getattr(settings, "SITE_ID")`
+
 # Absolute path to the directory static files should be collected to.
 # Example: "/var/www/example.com/static/"
 STATIC_ROOT: str | None

django-stubs/conf/global_settings.pyi

@@ -1,10 +1,10 @@
-from typing import Any
+from typing import ClassVar
 
 from django.http.request import HttpRequest
-from django.http.response import HttpResponse
+from django.http.response import HttpResponse, HttpResponseBase, HttpResponseRedirectBase
 from django.utils.deprecation import MiddlewareMixin
 
 class RedirectFallbackMiddleware(MiddlewareMixin):
-    response_gone_class: Any
-    response_redirect_class: Any
+    response_gone_class: ClassVar[type[HttpResponseBase]]
+    response_redirect_class: ClassVar[type[HttpResponseRedirectBase]]
     def process_response(self, request: HttpRequest, response: HttpResponse) -> HttpResponse: ...

django-stubs/contrib/redirects/middleware.pyi

@@ -28,6 +28,7 @@ _OrderByFieldName: TypeAlias = str | Combinable
 
 MAX_GET_RESULTS: int
 REPR_OUTPUT_SIZE: int
+PROHIBITED_FILTER_KWARGS: frozenset[str]
 
 class BaseIterable(Generic[_T]):
     queryset: QuerySet[Model]

django-stubs/db/models/query.pyi

@@ -27,9 +27,11 @@ class PathInfo(NamedTuple):
 def subclasses(cls: type[RegisterLookupMixin]) -> Iterator[type[RegisterLookupMixin]]: ...
 
 class Q(tree.Node):
-    AND: str
-    OR: str
+    AND: Literal["AND"]
+    OR: Literal["OR"]
+    XOR: Literal["XOR"]
     conditional: bool
+    connectors: tuple[None, Literal["AND"], Literal["OR"], Literal["XOR"]]
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
     # Fake signature, the real is
     # def __init__(self, *args: Any, _connector: Any | None = ..., _negated: bool = ..., **kwargs: Any) -> None: ...