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

Author: Avasam

.github/workflows/daily.yml

@@ -30,12 +30,12 @@ env:
 jobs:
   stubtest-stdlib:
     name: "stubtest: stdlib"
-    if: ${{ github.repository == 'python/typeshed' || github.event_name == 'workflow_dispatch' }}
+    if: ${{ github.repository == 'python/typeshed' || github.event_name != 'schedule' }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
 
     steps:
@@ -50,12 +50,15 @@ 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
 
   stubtest-third-party:
     name: "stubtest: third party"
-    if: ${{ github.repository == 'python/typeshed' || github.event_name == 'workflow_dispatch' }}
+    if: ${{ github.repository == 'python/typeshed' || github.event_name != 'schedule' }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -73,7 +76,7 @@ jobs:
             stubs/**/METADATA.toml
       - name: Install dependencies
         run: pip install -r requirements-tests.txt
-      - name: Run stubtest
+      - name: Install required system packages
         shell: bash
         run: |
           PACKAGES=$(python tests/get_stubtest_system_requirements.py)
@@ -83,8 +86,6 @@ jobs:
               printf "Installing APT packages:\n  $(echo $PACKAGES | sed 's/ /\n  /g')\n"
               sudo apt-get update -q && sudo apt-get install -qy $PACKAGES
             fi
-
-            PYTHON_EXECUTABLE="xvfb-run python"
           else
             if [ "${{ runner.os }}" = "macOS" ] && [ -n "$PACKAGES" ]; then
               printf "Installing Homebrew packages:\n  $(echo $PACKAGES | sed 's/ /\n  /g')\n"
@@ -95,15 +96,21 @@ jobs:
               printf "Installing Chocolatey packages:\n  $(echo $PACKAGES | sed 's/ /\n  /g')\n"
               choco install -y $PACKAGES
             fi
-
+          fi
+      - name: Run stubtest
+        shell: bash
+        run: |
+          if [ "${{ runner.os }}" = "Linux" ]; then
+            PYTHON_EXECUTABLE="xvfb-run python"
+          else
             PYTHON_EXECUTABLE="python"
           fi
 
           $PYTHON_EXECUTABLE tests/stubtest_third_party.py --ci-platforms-only --num-shards 4 --shard-index ${{ matrix.shard-index }}
 
   stub-uploader:
     name: stub_uploader tests
-    if: ${{ github.repository == 'python/typeshed' || github.event_name == 'workflow_dispatch' }}
+    if: ${{ github.repository == 'python/typeshed' || github.event_name != 'schedule' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout typeshed

.github/workflows/stubtest_stdlib.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
 
     steps:
@@ -46,5 +46,8 @@ 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_third_party.yml

@@ -48,29 +48,29 @@ jobs:
             stubs/**/METADATA.toml
       - name: Install dependencies
         run: pip install -r requirements-tests.txt
-      - name: Run stubtest
+      - name: Determine changed stubs
         shell: bash
         run: |
           # This only runs stubtest on changed stubs, because it is much faster.
           # Use the daily.yml workflow to run stubtest on all third party stubs.
           function find_stubs {
             git diff --name-only origin/${{ github.base_ref }} HEAD | \
             egrep ^stubs/ | cut -d "/" -f 2 | sort -u | \
-            (while read stub; do [ -d "stubs/$stub" ] && echo "$stub" || true; done)
+            (while read stub; do [ -d "stubs/$stub" ] && echo -n "$stub " || true; done)
           }
           STUBS=$(find_stubs || echo '')
-
+          echo "Changed stubs: $STUBS"
+          echo "STUBS=$STUBS" >> $GITHUB_ENV
+      - name: Install required system packages
+        shell: bash
+        run: |
           if [ -n "$STUBS" ]; then
-            echo "Testing $STUBS..."
             PACKAGES=$(python tests/get_stubtest_system_requirements.py $STUBS)
-
             if [ "${{ runner.os }}" = "Linux" ]; then
               if [ -n "$PACKAGES" ]; then
                 printf "Installing APT packages:\n  $(echo $PACKAGES | sed 's/ /\n  /g')\n"
                 sudo apt-get update -q && sudo apt-get install -qy $PACKAGES
               fi
-
-              PYTHON_EXECUTABLE="xvfb-run python"
             else
               if [ "${{ runner.os }}" = "macOS" ] && [ -n "$PACKAGES" ]; then
                 printf "Installing Homebrew packages:\n  $(echo $PACKAGES | sed 's/ /\n  /g')\n"
@@ -81,7 +81,17 @@ jobs:
                 printf "Installing Chocolatey packages:\n  $(echo $PACKAGES | sed 's/ /\n  /g')\n"
                 choco install -y $PACKAGES
               fi
+            fi
+          fi
+      - name: Run stubtest
+        shell: bash
+        run: |
+          if [ -n "$STUBS" ]; then
+            echo "Testing $STUBS..."
 
+            if [ "${{ runner.os }}" = "Linux" ]; then
+              PYTHON_EXECUTABLE="xvfb-run python"
+            else
               PYTHON_EXECUTABLE="python"
             fi
 

.github/workflows/tests.yml

@@ -42,14 +42,14 @@ jobs:
     strategy:
       matrix:
         platform: ["linux", "win32", "darwin"]
-        # TODO (2025-05-10) "3.13.2" should be "3.14-dev", see below.
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.13.2"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
       - uses: astral-sh/setup-uv@v6
         with:
           version-file: "requirements-tests.txt"
@@ -63,15 +63,9 @@ jobs:
           fi
       - name: Run mypy_test.py
         run: |
-          # TODO: (2025-05-10) This is a bad hack to work around mypy crashing
-          # when running on Python 3.14. See https://github.com/python/mypy/pull/19020.
-          if [[ "${{ matrix.python-version }}" == "3.13.2" ]]; then
-              MYPY_PY_VERSION="3.14"
-          else
-            # python-version can sometimes be pinned to a specific version or to "-dev", but
-            # mypy understands only X.Y version numbers.
-            MYPY_PY_VERSION=$(echo ${{ matrix.python-version }} | cut -d - -f 1 | cut -d . -f 1-2)
-          fi
+          # python-version can sometimes be pinned to a specific version or to "-dev", but
+          # mypy understands only X.Y version numbers.
+          MYPY_PY_VERSION=$(echo ${{ matrix.python-version }} | cut -d - -f 1 | cut -d . -f 1-2)
           python ./tests/mypy_test.py --platform=${{ matrix.platform }} --python-version=${MYPY_PY_VERSION}
 
   regression-tests:

pyproject.toml

@@ -177,6 +177,7 @@ ignore = [
     "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
     ###

requirements-tests.txt

@@ -1,12 +1,10 @@
 # Type checkers that we test our stubs against. These should always
 # be pinned to a specific version to make failure reproducible.
-mypy==1.16.1
-pyright==1.1.403
+mypy==1.18.1
+pyright==1.1.405
 
 # Libraries used by our various scripts.
-# TODO (2025-05-09): Installing this on Python 3.14 on Windows fails at
-# the moment.
-aiohttp==3.12.14; python_version < "3.14"
+aiohttp==3.12.15
 # TODO (2025-05-09): No wheels exist for Python 3.14 yet, slowing down CI
 # considerably and prone to fail.
 grpcio-tools>=1.66.2; python_version < "3.14" # For grpc_tools.protoc
@@ -16,8 +14,7 @@ pathspec>=0.11.1
 pre-commit
 # Required by create_baseline_stubs.py. Must match .pre-commit-config.yaml.
 ruff==0.12.2
-# TODO (2025-05-07): Dependency libcst doesn't support Python 3.14 yet.
-stubdefaulter==0.1.0; python_version < "3.14"
+stubdefaulter==0.1.0
 termcolor>=2.3
 tomli==2.2.1; python_version < "3.11"
 tomlkit==0.13.3

scripts/stubsabot.py

@@ -204,7 +204,7 @@ async def with_extracted_archive(
         with zipfile.ZipFile(body) as zf:
             return handler(zf)
     elif packagetype == "sdist":
-        # sdist defaults to `.tar.gz` on Lunix and to `.zip` on Windows:
+        # sdist defaults to `.tar.gz` on Linux and to `.zip` on Windows:
         # https://docs.python.org/3.11/distutils/sourcedist.html
         if release_to_download.filename.endswith(".tar.gz"):
             with tarfile.open(fileobj=body, mode="r:gz") as zf:

stdlib/@tests/stubtest_allowlists/common.txt

@@ -4,15 +4,13 @@
 
 # Please keep sorted alphabetically
 
-collections\.ChainMap\.fromkeys  # https://github.com/python/mypy/issues/17023
-http.client.HTTPConnection.response_class  # the actual type at runtime is abc.ABCMeta
 importlib.abc.Loader.exec_module  # See Lib/importlib/_abc.py. Might be defined for backwards compatibility
 importlib.abc.MetaPathFinder.find_spec  # Not defined on the actual class, but expected to exist.
 importlib.abc.PathEntryFinder.find_spec  # Not defined on the actual class, but expected to exist.
 tkinter.simpledialog.[A-Z_]+
 tkinter.simpledialog.TclVersion
 tkinter.simpledialog.TkVersion
-tkinter.Text.count  # stubtest somehow thinks that index1 parameter has a default value, but it doesn't in any of the overloads
+tarfile.TarInfo.__slots__  # it's a big dictionary at runtime and the dictionary values are a bit long
 
 
 # ===============================================================
@@ -183,6 +181,12 @@ _collections_abc.AsyncGenerator.__anext__
 _collections_abc.AsyncGenerator.aclose
 _collections_abc.AsyncIterator.__anext__
 
+# Pretend typing.ByteString is a Union, to better match its documented semantics.
+# As a side effect, this changes the definition of collections.abc.ByteString, which is okay,
+# because it's not an ABC that makes any sense and was deprecated in 3.12
+_collections_abc\.ByteString
+typing\.ByteString
+
 _collections_abc.Callable  # Typing-related weirdness
 _collections_abc.Mapping.get  # Adding None to the Union messed up mypy
 _collections_abc.Sequence.index  # Supporting None in end is not mandatory
@@ -201,7 +205,6 @@ _markupbase.ParserBase.parse_marked_section
 
 _pydecimal.*  # See comments in file
 _typeshed.*  # Utility types for typeshed, doesn't exist at runtime
-argparse.ArgumentParser.__init__  # stubtest doesn't recognise the runtime default (a class) as being compatible with a callback protocol (the stub annotation)
 argparse.Namespace.__getattr__  # The whole point of this class is its attributes are dynamic
 
 # Runtime AST node runtime constructor behaviour is too loose.
@@ -218,8 +221,6 @@ argparse.Namespace.__setattr__  # should allow setting any attribute
 
 ast.ImportFrom.level  # None on the class, but never None on instances
 ast.NodeVisitor.visit_\w+  # Methods are discovered dynamically, see #3796
-_?asyncio.Future.__init__  # Usually initialized from c object
-asyncio.futures.Future.__init__  # Usually initialized from c object
 
 # Condition functions are exported in __init__
 asyncio.Condition.acquire
@@ -230,7 +231,6 @@ asyncio.locks.Condition.locked
 asyncio.locks.Condition.release
 
 builtins.memoryview.__contains__  # C type that implements __getitem__
-builtins.object.__init__  # default C signature is incorrect
 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.
@@ -260,8 +260,6 @@ configparser.SectionProxy.getint  # SectionProxy get functions are set in __init
 contextlib.AbstractAsyncContextManager.__class_getitem__
 contextlib.AbstractContextManager.__class_getitem__
 
-_?contextvars.Context.__init__  # C signature is broader than what is actually accepted
-
 copy.PyStringMap  # defined only in Jython
 
 # The Dialect properties are initialized as None in Dialect but their values are enforced in _Dialect
@@ -329,9 +327,6 @@ importlib.machinery.ExtensionFileLoader.get_filename
 inspect.Parameter.__init__
 inspect.Signature.__init__
 
-inspect.Parameter.empty  # set as private marker _empty
-inspect.Signature.empty  # set as private marker _empty
-
 logging.LogRecord.__setattr__  # doesn't exist, but makes things easy if we pretend it does
 
 # Iterable classes that don't define __iter__ at runtime (usually iterable via __getitem__)
@@ -377,11 +372,6 @@ multiprocessing.queues.JoinableQueue.__init__
 multiprocessing.queues.Queue.__init__
 multiprocessing.queues.SimpleQueue.__init__
 
-# alias for a class defined elsewhere,
-# mypy infers the variable has type `(*args) -> ForkingPickler`
-# but stubtest infers the runtime type as <class ForkingPickler>
-multiprocessing.reduction.AbstractReducer.ForkingPickler
-
 # These methods are dynamically created after object initialization,
 # copied from a wrapped lock object. Stubtest doesn't think they exist
 # because of that.
@@ -406,7 +396,6 @@ os.PathLike.__class_getitem__  # PathLike is a protocol; we don't expect all Pat
 
 pickle._Pickler\..*  # Best effort typing for undocumented internals
 pickle._Unpickler\..*  # Best effort typing for undocumented internals
-_?queue.SimpleQueue.__init__  # C signature is broader than what is actually accepted
 shutil.rmtree  # function with attributes, which we approximate with a callable protocol
 socketserver.BaseServer.get_request  # Not implemented, but expected to exist on subclasses.
 ssl.PROTOCOL_SSLv2  # Depends on the existence and flags of SSL
@@ -466,7 +455,6 @@ typing._Final.__init_subclass__
 typing\.Protocol
 typing(_extensions)?\._TypedDict
 typing(_extensions)?\.Any.*
-typing(_extensions)?\.Generic
 typing(_extensions)?\.TypedDict
 typing_extensions\.ParamSpec.*
 typing_extensions\.TypeVar.*

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

@@ -1,6 +1,6 @@
-# ===========
-# 3.9 to 3.11
-# ===========
+# =======
+# <= 3.11
+# =======
 
 # Added in Python 3.10.15
 email._header_value_parser.NLSET
@@ -41,6 +41,7 @@ xml.etree.cElementTree.XMLPullParser.flush
 xml.parsers.expat.XMLParserType.GetReparseDeferralEnabled
 xml.parsers.expat.XMLParserType.SetReparseDeferralEnabled
 xml.sax.expatreader.ExpatParser.flush
+zipfile.ZipInfo.__slots__
 
 
 # =============================================================

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

@@ -8,12 +8,11 @@ fcntl.F_OFD_SETLK
 fcntl.F_OFD_SETLKW
 
 
-# ===========
-# 3.9 to 3.11
-# ===========
+# =======
+# <= 3.11
+# =======
 
-# Incompatible changes introduced in Python 3.11.10
-# (Remove once 3.11.10 becomes available for MacOS)
+# Added in Python 3.11.10
 email._header_value_parser.NLSET
 email._header_value_parser.SPECIALSNL
 email.errors.HeaderWriteError
@@ -30,3 +29,11 @@ _msi
 msilib(.[a-z]+)?
 ossaudiodev
 spwd
+
+
+# ================
+# Unclear problems
+# ================
+
+# Added in 3.11.1, flagged by stubtest on Python < 3.14 for unknown reasons
+errno.ENOTCAPABLE