Merge branch 'main' into patch-4

Author: Gobot1234

.github/workflows/daily.yml

@@ -50,9 +50,6 @@ jobs:
           check-latest: true
       - name: Install dependencies
         run: pip install -r requirements-tests.txt
-      # Temporary to get @disjoint_base support; can remove once mypy 1.18 is released
-      - name: Install mypy from git
-        run: pip install git+https://github.com/python/mypy.git@116b92bae7b5dbf5e6bd36fd9b0c6804973e5554
       - name: Run stubtest
         run: python tests/stubtest_stdlib.py
 

.github/workflows/stubtest_stdlib.yml

@@ -46,8 +46,5 @@ jobs:
           check-latest: true
       - name: Install dependencies
         run: pip install -r requirements-tests.txt
-      # Temporary to get @disjoint_base support; can remove once mypy 1.18 is released
-      - name: Install mypy from git
-        run: pip install git+https://github.com/python/mypy.git@116b92bae7b5dbf5e6bd36fd9b0c6804973e5554
       - name: Run stubtest
         run: python tests/stubtest_stdlib.py

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
         args: [--fix=lf]
       - id: check-case-conflict
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.13.2 # must match requirements-tests.txt
+    rev: v0.13.3 # must match requirements-tests.txt
     hooks:
       - id: ruff
         name: Run ruff on stubs, tests and scripts

CONTRIBUTING.md

@@ -436,28 +436,24 @@ following criteria is met:
 * the upstream package was declared or appears to be unmaintained, and
   retaining the stubs causes maintenance issues in typeshed.
 
-If a package ships its own `py.typed` file, please follow these steps:
+Case 1: If a package ships its own `py.typed` file, please follow these steps:
 
-1. Open an issue with the earliest month of removal in the subject.
-2. A maintainer will add the
-   ["stubs: removal" label](https://github.com/python/typeshed/labels/%22stubs%3A%20removal%22).
-3. Open a PR that sets the `obsolete_since` field in the `METADATA.toml`
-   file to the first version of the package that shipped `py.typed`.
-4. After at least six months, open a PR to remove the stubs.
+1. Make sure **stubsabot** open a PR that sets the `obsolete_since` field in the
+   `METADATA.toml` file to the first version of the package that shipped `py.typed`.
+2. After at least six months, make sure **stubsabot** open a PR to remove the stubs.
 
-If third-party stubs should be removed for other reasons, please follow these
-steps:
+Case 2: If third-party stubs should be removed for other reasons, please follow
+these steps:
 
 1. Open an issue explaining why the stubs should be removed.
 2. A maintainer will add the
    ["stubs: removal" label](https://github.com/python/typeshed/labels/%22stubs%3A%20removal%22).
 3. Open a PR that sets the `no_longer_updated` field in the `METADATA.toml`
    file to `true`.
-4. When a new version of the package was automatically uploaded to PyPI
-   (which can take up to a day), open a PR to remove the stubs.
+4. When a new version of the package was automatically uploaded to PyPI (which
+   can take up to a day), make sure **stubsabot** open a PR to remove the stubs.
 
-Don't forget to make sure the library is not in the [`pyrightconfig.stricter.json`](./pyrightconfig.stricter.json)
-exclusion list. If feeling kindly, please update [mypy](https://github.com/python/mypy/blob/master/mypy/stubinfo.py)
+If feeling kindly, please update [mypy](https://github.com/python/mypy/blob/master/mypy/stubinfo.py)
 for any stub obsoletions or removals.
 
 ### Marking PRs as "deferred"

pyproject.toml

@@ -175,8 +175,6 @@ ignore = [
     "TD003", # Missing issue link for this TODO
     # Mostly from scripts and tests, it's ok to have messages passed directly to exceptions
     "TRY003", # Avoid specifying long messages outside the exception class
-    # Slower and more verbose https://github.com/astral-sh/ruff/issues/7871
-    "UP038", # Use `X | Y` in `isinstance` call instead of `(X, Y)`
     "PLC0205", # Sometimes __slots__ really is a string at runtime
     ###
     # False-positives, but already checked by type-checkers

pyrightconfig.stricter.json

@@ -92,6 +92,7 @@
         "stubs/tqdm",
         "stubs/vobject",
         "stubs/workalendar",
+        "stubs/xmldiff",
     ],
     "typeCheckingMode": "strict",
     // TODO: Complete incomplete stubs

stdlib/@tests/stubtest_allowlists/darwin-py310.txt

@@ -1,3 +1,11 @@
+# =======
+# <= 3.12
+# =======
+
+# Added in Python 3.10.18 (parameter `escapable`)
+html.parser.HTMLParser.set_cdata_mode
+
+
 # =======
 # <= 3.11
 # =======

stdlib/@tests/stubtest_allowlists/darwin-py311.txt

@@ -8,6 +8,14 @@ fcntl.F_OFD_SETLK
 fcntl.F_OFD_SETLKW
 
 
+# =======
+# <= 3.12
+# =======
+
+# Added in Python 3.11.13 (parameter `escapable`)
+html.parser.HTMLParser.set_cdata_mode
+
+
 # =======
 # <= 3.11
 # =======

stdlib/@tests/stubtest_allowlists/darwin-py312.txt

@@ -8,6 +8,14 @@ fcntl.F_OFD_SETLK
 fcntl.F_OFD_SETLKW
 
 
+# =======
+# <= 3.12
+# =======
+
+# Added in Python 3.12.11 (parameter `escapable`)
+html.parser.HTMLParser.set_cdata_mode
+
+
 # =============================================================
 # Allowlist entries that cannot or should not be fixed; <= 3.12
 # =============================================================

stdlib/@tests/stubtest_allowlists/darwin-py313.txt

@@ -3,11 +3,3 @@
 # =======
 
 (mmap.MAP_32BIT)?  # Exists locally on MacOS but not on GitHub
-
-
-# ================
-# Unclear problems
-# ================
-
-# Added in 3.11.1, flagged by stubtest on Python < 3.14 for unknown reasons
-errno.ENOTCAPABLE