Merge branch 'main' into add-coverage

Author: Daraan

.github/workflows/third_party.yml

@@ -1,11 +1,10 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.6
+    rev: v0.12.3
     hooks:
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -22,7 +21,7 @@ repos:
     hooks:
       - id: sphinx-lint
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.33.0
+    rev: 0.33.2
     hooks:
       - id: check-dependabot
       - id: check-github-workflows
@@ -48,3 +47,6 @@ repos:
   - repo: meta
     hooks:
       - id: check-hooks-apply
+
+ci:
+  autoupdate_schedule: quarterly

.pre-commit-config.yaml

@@ -1,3 +1,11 @@
+# Unreleased
+
+- Add `typing_extensions.type_repr`, a backport of
+  [`annotationlib.type_repr`](https://docs.python.org/3.14/library/annotationlib.html#annotationlib.type_repr),
+  introduced in Python 3.14 (CPython PR [#124551](https://github.com/python/cpython/pull/124551),
+  originally by Jelle Zijlstra). Patch by Semyon Moroz.
+
+
 # Release 4.14.1 (July 4, 2025)
 
 - Fix usage of `typing_extensions.TypedDict` nested inside other types

CHANGELOG.md

@@ -24,6 +24,11 @@ Starting with version 4.0.0, `typing_extensions` uses
 [Semantic Versioning](https://semver.org/). See the documentation
 for more detail.
 
+## Development version
+After a release the version is increased once in [pyproject.toml](/pyproject.toml) and
+appended with a `.dev` suffix, e.g. `4.0.1.dev`.
+Further subsequent updates are not planned between releases.
+
 # Type stubs
 
 A stub file for `typing_extensions` is maintained
@@ -79,7 +84,7 @@ pipx run pre-commit run -a
 # Workflow for PyPI releases
 
 - Make sure you follow the versioning policy in the documentation
-  (e.g., release candidates before any feature release)
+  (e.g., release candidates before any feature release, do not release development versions)
 
 - Ensure that GitHub Actions reports no errors.
 
@@ -93,3 +98,5 @@ pipx run pre-commit run -a
 
 - Release automation will finish the release. You'll have to manually
   approve the last step before upload.
+
+- After the release has been published on PyPI upgrade the version in number in [pyproject.toml](/pyproject.toml) to a `dev` version of the next planned release. For example, change 4.1.1 to 4.X.X.dev, see also [Development versions](#development-version). # TODO decide on major vs. minor increase.

CONTRIBUTING.md

@@ -23,8 +23,12 @@ way as equivalent forms in `typing`.
 [Semantic Versioning](https://semver.org/). The
 major version will be incremented only for backwards-incompatible changes.
 Therefore, it's safe to depend
-on `typing_extensions` like this: `typing_extensions >=x.y, <(x+1)`,
+on `typing_extensions` like this: `typing_extensions ~=x.y`,
 where `x.y` is the first version that includes all features you need.
+[This](https://packaging.python.org/en/latest/specifications/version-specifiers/#compatible-release)
+is equivalent to `typing_extensions >=x.y, <(x+1)`. Do not depend on `~= x.y.z`
+unless you really know what you're doing; that defeats the purpose of
+semantic versioning.
 
 ## Included items
 

README.md

@@ -933,6 +933,15 @@ Functions
 
    .. versionadded:: 4.1.0
 
+.. function:: type_repr(value)
+
+   See :py:func:`annotationlib.type_repr`. In ``annotationlib`` since 3.14.
+
+   Convert an arbitrary Python value to a format suitable for use by
+   the :attr:`Format.STRING`.
+
+   .. versionadded:: 4.15.0
+
 Enums
 ~~~~~
 

doc/index.rst

@@ -91,10 +91,13 @@ ignore = [
     "UP019",
     "UP035",
     "UP038",
+    "UP045",  # X | None instead of Optional[X]
     # Not relevant here
-    "RUF012",
-    "RUF022",
-    "RUF023",
+    "RUF012",  # Use ClassVar for mutables
+    "RUF022",  # Unsorted __all__
+    "RUF023",  # Unsorted __slots__
+    "B903",  # Use dataclass / namedtuple
+    "RUF031",  # parentheses for tuples in subscripts
     # Ruff doesn't understand the globals() assignment; we test __all__
     # directly in test_all_names_in___all__.
     "F822",
@@ -109,6 +112,9 @@ ignore = [
     "E306",
     "E501",
     "E701",
+    # Harmful for tests if applied.
+    "RUF036",  # None not at end of Union
+    "RUF041",  # nested Literal
 ]
 
 [tool.ruff.lint.isort]

pyproject.toml

@@ -101,6 +101,7 @@
     reveal_type,
     runtime,
     runtime_checkable,
+    type_repr,
 )
 
 NoneType = type(None)
@@ -1207,13 +1208,15 @@ class My(enum.Enum):
 
         self.assertEqual(Literal[My.A].__args__, (My.A,))
 
-    def test_illegal_parameters_do_not_raise_runtime_errors(self):
+    def test_strange_parameters_are_allowed(self):
+        # These are explicitly allowed by the typing spec
+        Literal[Literal[1, 2], Literal[4, 5]]
+        Literal[b"foo", "bar"]
+
         # Type checkers should reject these types, but we do not
         # raise errors at runtime to maintain maximum flexibility
         Literal[int]
-        Literal[Literal[1, 2], Literal[4, 5]]
         Literal[3j + 2, ..., ()]
-        Literal[b"foo", "bar"]
         Literal[{"foo": 3, "bar": 4}]
         Literal[T]
 
@@ -8366,6 +8369,44 @@ def test_capsule_type(self):
         self.assertIsInstance(_datetime.datetime_CAPI, typing_extensions.CapsuleType)
 
 
+class MyClass:
+    def __repr__(self):
+        return "my repr"
+
+
+class TestTypeRepr(BaseTestCase):
+    def test_custom_types(self):
+
+        class Nested:
+            pass
+
+        def nested():
+            pass
+
+        self.assertEqual(type_repr(MyClass), f"{__name__}.MyClass")
+        self.assertEqual(
+            type_repr(Nested),
+            f"{__name__}.TestTypeRepr.test_custom_types.<locals>.Nested",
+        )
+        self.assertEqual(
+            type_repr(nested),
+            f"{__name__}.TestTypeRepr.test_custom_types.<locals>.nested",
+        )
+        self.assertEqual(type_repr(times_three), f"{__name__}.times_three")
+        self.assertEqual(type_repr(Format.VALUE), repr(Format.VALUE))
+        self.assertEqual(type_repr(MyClass()), "my repr")
+
+    def test_builtin_types(self):
+        self.assertEqual(type_repr(int), "int")
+        self.assertEqual(type_repr(object), "object")
+        self.assertEqual(type_repr(None), "None")
+        self.assertEqual(type_repr(len), "len")
+        self.assertEqual(type_repr(1), "1")
+        self.assertEqual(type_repr("1"), "'1'")
+        self.assertEqual(type_repr(''), "''")
+        self.assertEqual(type_repr(...), "...")
+
+
 def times_three(fn):
     @functools.wraps(fn)
     def wrapper(a, b):