Merge branch 'main' into fix/boltons-tbutils-to-dict

Author: LuisFigueroaG

CONTRIBUTING.md

@@ -366,6 +366,16 @@ documentation.  Whenever you find them disagreeing, model the type
 information after the actual implementation and file an issue on the
 project's tracker to fix their documentation.
 
+### Byte Types
+
+[PEP 688](https://www.python.org/dev/peps/pep-0688/) removes
+the implicit promotion from `bytearray` and `memoryview` to `bytes`.
+Typeshed stubs should be written assuming that these promotions
+do not happen, so a parameter that accepts either `bytes` or
+`bytearray` should be typed as `bytes | bytearray`.
+Often one of the aliases from `_typeshed`, such as
+`_typeshed.ReadableBuffer`, can be used instead.
+
 ### Deprecations (using the `@deprecated` decorator)
 
 Generally deprecactions using the `@deprecated` decorator are added more
@@ -410,27 +420,18 @@ When the script has finished running, it will print instructions telling you wha
 If it has been a while since you set up the virtualenv, make sure you have
 the latest mypy (`pip install -r requirements-tests.txt`) before running the script.
 
-### Supported type system features
-
-Since [PEP 484](https://peps.python.org/pep-0484/) was accepted, there have been
-many other PEPs that added new features to the Python type system. In general,
-new features can be used in typeshed as soon as the PEP has been accepted and
-implemented and most type checkers support the new feature.
-
-Supported features include:
-- [PEP 544](https://peps.python.org/pep-0544/) (`Protocol`)
-- [PEP 585](https://peps.python.org/pep-0585/) (builtin generics)
-- [PEP 586](https://peps.python.org/pep-0586/) (`Literal`)
-- [PEP 591](https://peps.python.org/pep-0591/) (`Final`/`@final`)
-- [PEP 589](https://peps.python.org/pep-0589/) (`TypedDict`)
-- [PEP 604](https://peps.python.org/pep-0604/) (`Foo | Bar` union syntax)
-- [PEP 612](https://peps.python.org/pep-0612/) (`ParamSpec`)
-- [PEP 647](https://peps.python.org/pep-0647/) (`TypeGuard`):
-  see [#5406](https://github.com/python/typeshed/issues/5406)
-- [PEP 655](https://peps.python.org/pep-0655/) (`Required` and `NotRequired`)
-- [PEP 673](https://peps.python.org/pep-0673/) (`Self`)
-- [PEP 675](https://peps.python.org/pep-0675/) (`LiteralString`)
-- [PEP 702](https://peps.python.org/pep-0702/) (`@deprecated()`)
+### Unsupported Type System Features
+
+Unless listed here, all type system features that have been added to the
+[Python typing specification](https://typing.python.org/en/latest/spec/)
+can be used. The following features are *not* supported:
+
+- [PEP 695](https://peps.python.org/pep-0695/) type parameter syntax.
+  (See [issue #10869](https://github.com/python/typeshed/issues/10869).) Use
+  explicit `TypeVar` definitions.
+- [PEP 695](https://peps.python.org/pep-0695/) type statement for aliases.
+  (See [issue #10870](https://github.com/python/typeshed/issues/10870).) Use
+  `TypeAlias` annotations.
 
 Features from the `typing` module that are not present in all
 supported Python versions must be imported from `typing_extensions`
@@ -443,16 +444,7 @@ instead in typeshed stubs. This currently affects:
 - `Required` and `NotRequired` (new in Python 3.11)
 - `Buffer` (new in Python 3.12; in the `collections.abc` module)
 - `@deprecated` (new in Python 3.13; in the `warnings` module)
-
-Some type checkers implicitly promote the `bytearray` and
-`memoryview` types to `bytes`.
-[PEP 688](https://www.python.org/dev/peps/pep-0688/) removes
-this implicit promotion.
-Typeshed stubs should be written assuming that these promotions
-do not happen, so a parameter that accepts either `bytes` or
-`bytearray` should be typed as `bytes | bytearray`.
-Often one of the aliases from `_typeshed`, such as
-`_typeshed.ReadableBuffer`, can be used instead.
+- `TypeForm` (new in Python 3.15)
 
 ## Submitting Changes
 

lib/ts_utils/utils.py

@@ -23,7 +23,7 @@
     from termcolor import colored as colored  # pyright: ignore[reportAssignmentType]
 except ImportError:
 
-    def colored(text: str, color: str | None = None, **kwargs: Any) -> str:  # type: ignore[misc] # noqa: ARG001
+    def colored(text: str, color: str | None = None, **kwargs: Any) -> str:  # type: ignore[misc] # ruff: ignore[unused-function-argument]
         return text
 
 
@@ -179,7 +179,7 @@ def parse_stdlib_versions_file() -> SupportedVersions:
     with VERSIONS_PATH.open(encoding="UTF-8") as f:
         for line in f:
             stripped_line = strip_comments(line)
-            if stripped_line == "":
+            if not stripped_line:
                 continue
             m = VERSION_LINE_RE.match(stripped_line)
             assert m, f"invalid VERSIONS line: {stripped_line}"
@@ -255,15 +255,21 @@ def allowlists(distribution_name: str) -> list[str]:
 # For details, see https://github.com/python/typeshed/pull/13620#discussion_r1990185997
 # Python 3.12 added a cross-platform solution with `tempfile.NamedTemporaryFile("w+", delete_on_close=False)`
 if sys.platform != "win32":
-    NamedTemporaryFile = tempfile.NamedTemporaryFile  # noqa: TID251
+    # We ignore the Ruff error here because this defines the helper that callers should use
+    # instead of `tempfile.NamedTemporaryFile`, which is banned by `banned-api`.
+    #
+    NamedTemporaryFile = tempfile.NamedTemporaryFile  # ruff: ignore[banned-api]
 else:
 
-    def NamedTemporaryFile(mode: OpenTextMode) -> TemporaryFileWrapper[str]:  # noqa: N802
+    def NamedTemporaryFile(mode: OpenTextMode) -> TemporaryFileWrapper[str]:  # ruff: ignore[invalid-function-name]
         def close(self: TemporaryFileWrapper[str]) -> None:
             TemporaryFileWrapper.close(self)  # pyright: ignore[reportUnknownMemberType]
             Path(self.name).unlink()
 
-        temp = tempfile.NamedTemporaryFile(mode, delete=False)  # noqa: SIM115, TID251
+        # We ignore the `banned-api` Ruff error here because this call is part of the helper that callers should use
+        # instead of `tempfile.NamedTemporaryFile`.
+        #
+        temp = tempfile.NamedTemporaryFile(mode, delete=False)  # ruff: ignore[open-file-with-context-handler, banned-api]
         temp.close = MethodType(close, temp)  # type: ignore[method-assign]
         return temp