Merge branch 'main' into networkx-merge-from-python-type-stubs

Author: Avasam

.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

@@ -311,7 +311,7 @@ def foo(x: Incomplete | None) -> list[Incomplete]: ...
 ### What to do when a project's documentation and implementation disagree
 
 Type stubs are meant to be external type annotations for a given
-library.  While they are useful documentation in its own merit, they
+library.  While they are useful documentation in their own right, they
 augment the project's concrete implementation, not the project's
 documentation.  Whenever you find them disagreeing, model the type
 information after the actual implementation and file an issue on the
@@ -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"

README.md

@@ -7,10 +7,10 @@
 ## About
 
 Typeshed contains external type annotations for the Python standard library
-and Python builtins, as well as third party packages as contributed by
+and Python builtins, as well as third-party packages that are contributed by
 people external to those projects.
 
-This data can e.g. be used for static analysis, type checking, type inference,
+This data can, e.g., be used for static analysis, type checking, type inference,
 and autocompletion.
 
 For information on how to use typeshed, read below.  Information for
@@ -29,8 +29,8 @@ If you're just using a type checker (e.g. [mypy](https://github.com/python/mypy/
 [pyright](https://github.com/microsoft/pyright), or PyCharm's built-in type
 checker), as opposed to
 developing it, you don't need to interact with the typeshed repo at
-all: a copy of standard library part of typeshed is bundled with type checkers.
-And type stubs for third party packages and modules you are using can
+all: a copy of the standard library part of typeshed is bundled with type checkers.
+And type stubs for third-party packages and modules you are using can
 be installed from PyPI. For example, if you are using `html5lib` and `requests`,
 you can install the type stubs using
 
@@ -70,7 +70,7 @@ package you're using, each with its own tradeoffs:
    type checking due to changes in the stubs.
 
    Another risk of this strategy is that stubs often lag behind
-   the package being stubbed. You might want to force the package being stubbed
+   the package that is being stubbed. You might want to force the package being stubbed
    to a certain minimum version because it fixes a critical bug, but if
    correspondingly updated stubs have not been released, your type
    checking results may not be fully accurate.
@@ -119,6 +119,6 @@ a review of your type annotations or stubs outside of typeshed, head over to
 [our discussion forum](https://github.com/python/typing/discussions).
 For less formal discussion, try the typing chat room on
 [gitter.im](https://gitter.im/python/typing).  Some typeshed maintainers
-are almost always present; feel free to find us there and we're happy
+are almost always present; feel free to find us there, and we're happy
 to chat.  Substantive technical discussion will be directed to the
 issue tracker.

pyproject.toml

@@ -26,6 +26,7 @@ exclude = [
 ]
 
 [tool.ruff.lint]
+future-annotations = true
 # Disable all rules on test cases by default:
 # test cases often deliberately contain code
 # that might not be considered idiomatic or modern.
@@ -69,15 +70,22 @@ select = [
     # Only include flake8-annotations rules that are autofixable. Otherwise leave this to mypy+pyright
     "ANN2",
     # Most refurb rules are in preview and can be opinionated,
-    # consider them individually as they come out of preview (last check: 0.8.4)
+    # consider them individually as they come out of preview (last check: 0.13.1)
     "FURB105", # Unnecessary empty string passed to `print`
+    "FURB116", # Replace `{function_name}` call with `{display}`
+    "FURB122", # Use of `{}.write` in a for loop
     "FURB129", # Instead of calling `readlines()`, iterate over file object directly
+    "FURB132", # Use `{suggestion}` instead of `check` and `remove`
     "FURB136", # Replace `if` expression with `{min_max}` call
+    "FURB157", # Verbose expression in `Decimal` constructor
+    "FURB162", # Unnecessary timezone replacement with zero offset
+    "FURB166", # Use of `int` with explicit `base={base}` after removing prefix
     "FURB167", # Use of regular expression alias `re.{}`
     "FURB168", # Prefer `is` operator over `isinstance` to check if an object is `None`
     "FURB169", # Compare the identities of `{object}` and None instead of their respective types
     "FURB177", # Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups
     "FURB187", # Use of assignment of `reversed` on list `{name}`
+    "FURB188", # Prefer `str.removeprefix()` over conditionally replacing with slice.
     # Used for lint.flake8-import-conventions.aliases
     "ICN001", # `{name}` should be imported as `{asname}`
     # PYI: only enable rules that have autofixes and that we always want to fix (even manually),
@@ -89,6 +97,7 @@ select = [
     "PYI014", # Only simple default values allowed for arguments
     "PYI015", # Only simple default values allowed for assignments
     "PYI016", # Duplicate union member `{}`
+    "PYI018", # Private `{type_var_like_kind}` `{type_var_like_name}` is never used
     "PYI019", # Methods like `{method_name}` should return `Self` instead of a custom `TypeVar`
     "PYI020", # Quoted annotations should not be included in stubs
     "PYI025", # Use `from collections.abc import Set as AbstractSet` to avoid confusion with the `set` builtin
@@ -99,7 +108,8 @@ select = [
     "PYI044", # `from __future__ import annotations` has no effect in stub files, since type checkers automatically treat stubs as having those semantics
     "PYI055", # Multiple `type[T]` usages in a union. Combine them into one, e.g., `type[{union_str}]`.
     "PYI058", # Use `{return_type}` as the return value for simple `{method}` methods
-    # "PYI061", # TODO: Enable when out of preview
+    # "PYI059", # TODO: Add when dropping Python 3.9 support
+    "PYI061", # Use `None` rather than `Literal[None]`
     "PYI062", # Duplicate literal member `{}`
     "PYI064", # `Final[Literal[{literal}]]` can be replaced with a bare Final
     # flake8-simplify, excluding rules that can reduce performance or readability due to long line formatting
@@ -124,6 +134,7 @@ select = [
     "SIM223", # Use `{expr}` instead of `{replaced}`
     "SIM300", # Yoda condition detected
     "SIM401", # Use `{contents}` instead of an if block
+    "SIM905", # Consider using a list literal instead of `str.{}`
     "SIM910", # Use `{expected}` instead of `{actual}` (dict-get-with-none-default)
     "SIM911", # Use `{expected}` instead of `{actual}` (zip-dict-keys-and-values)
     # Don't include TC rules that create a TYPE_CHECKING block or stringifies annotations
@@ -159,7 +170,7 @@ ignore = [
     # see https://github.com/astral-sh/ruff/issues/6465
     "E721", # Do not compare types, use `isinstance()`
     # Highly opinionated, and it's often necessary to violate it
-    "PLC0415",  # `import` should be at the top-level of a file
+    "PLC0415", # `import` should be at the top-level of a file
     # Leave the size and complexity of tests to human interpretation
     "PLR09", # Too many ...
     # Too many magic number "2" that are preferable inline. https://github.com/astral-sh/ruff/issues/10009
@@ -175,9 +186,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
     ###
@@ -208,6 +216,8 @@ ignore = [
     # Most pep8-naming rules don't apply for third-party stubs like typeshed.
     # N811 to N814 could apply, but we often use them to disambiguate a name whilst making it look like a more common one
     "N8", # pep8-naming
+    # Sometimes __slots__ really is a string at runtime
+    "PLC0205", # Class `__slots__` should be a non-string iterable
     # Stubs are allowed to use private variables (pyright's reportPrivateUsage is also disabled)
     "PLC2701", # Private name import from external module
     # Names in stubs should match implementation

pyrightconfig.stricter.json

@@ -88,10 +88,12 @@
         "stubs/seaborn",
         "stubs/setuptools/setuptools",
         "stubs/shapely",
+        "stubs/simple-websocket",
         "stubs/tensorflow",
         "stubs/tqdm",
         "stubs/vobject",
         "stubs/workalendar",
+        "stubs/xmldiff",
     ],
     "typeCheckingMode": "strict",
     // TODO: Complete incomplete stubs

requirements-tests.txt

@@ -1,7 +1,7 @@
 # Type checkers that we test our stubs against. These should always
 # be pinned to a specific version to make failure reproducible.
 mypy==1.18.2
-pyright==1.1.406
+pyright==1.1.407
 
 # Libraries used by our various scripts.
 aiohttp==3.12.15
@@ -19,7 +19,7 @@ termcolor>=2.3
 tomli==2.2.1; python_version < "3.11"
 tomlkit==0.13.3
 typing_extensions>=4.15.0rc1
-uv==0.8.22
+uv==0.9.6
 
 # Utilities for typeshed infrastructure scripts.
 ts_utils @ file:lib

scripts/stubsabot.py

@@ -161,7 +161,7 @@ def __str__(self) -> str:
 @dataclass
 class Remove:
     distribution: str
-    reason: str
+    reason: Literal["ships py.typed file", "unmaintained"]
     links: dict[str, str]
 
     def __str__(self) -> str:
@@ -171,7 +171,7 @@ def __str__(self) -> str:
 @dataclass
 class NoUpdate:
     distribution: str
-    reason: str
+    reason: Literal["obsolete", "no longer updated", "up to date"]
 
     def __str__(self) -> str:
         return f"{colored('skipping', 'green')} ({self.reason})"
@@ -642,7 +642,7 @@ async def determine_action_no_error_handling(
                 "Typeshed release": f"{pypi_info.pypi_root}",
                 "Typeshed stubs": f"https://github.com/{TYPESHED_OWNER}/typeshed/tree/main/stubs/{stub_info.distribution}",
             }
-            return Remove(stub_info.distribution, reason="older than 6 months", links=links)
+            return Remove(stub_info.distribution, reason="ships py.typed file", links=links)
         else:
             return NoUpdate(stub_info.distribution, "obsolete")
     if stub_info.no_longer_updated:
@@ -654,7 +654,7 @@ async def determine_action_no_error_handling(
                 "Typeshed release": f"{pypi_info.pypi_root}",
                 "Typeshed stubs": f"https://github.com/{TYPESHED_OWNER}/typeshed/tree/main/stubs/{stub_info.distribution}",
             }
-            return Remove(stub_info.distribution, reason="no longer updated", links=links)
+            return Remove(stub_info.distribution, reason="unmaintained", links=links)
         else:
             return NoUpdate(stub_info.distribution, "no longer updated")
 

stdlib/@tests/stubtest_allowlists/common.txt

@@ -170,6 +170,10 @@ sys.ps1  # Available in interactive mode
 sys.ps2  # Available in interactive mode
 sys.tracebacklimit  # Must be set first
 
+# This is only present if Python was built with zlib-ng.
+(zlib\.ZLIBNG_VERSION)?
+(compression\.zlib\.ZLIBNG_VERSION)?
+
 
 # ==========================================================
 # Other allowlist entries that cannot or should not be fixed
@@ -233,7 +237,6 @@ asyncio.locks.Condition.release
 builtins.memoryview.__contains__  # C type that implements __getitem__
 builtins.reveal_locals  # Builtins that type checkers pretends exist
 builtins.reveal_type  # Builtins that type checkers pretends exist
-builtins.type.__dict__  # read-only but not actually a property; stubtest thinks it's a mutable attribute.
 
 # The following CodecInfo properties are added in __new__
 codecs.CodecInfo.decode