Merge branch 'master' into closed.keyword

Author: alicederyn

.github/workflows/docs.yml

@@ -44,7 +44,7 @@ jobs:
         with:
           python-version: '3.12'
       - name: Install tox
-        run: pip install tox==4.26.0
+        run: pip install tox==4.53.1
       - name: Setup tox environment
         run: tox run -e ${{ env.TOXENV }} --notest
       - name: Test

.github/workflows/test.yml

@@ -59,6 +59,12 @@ jobs:
           toxenv: py
           tox_extra_args: "-n 4"
           test_mypyc: true
+        - name: Test suite with py315-ubuntu, mypyc-compiled
+          python: '3.15'
+          os: ubuntu-24.04-arm
+          toxenv: py
+          tox_extra_args: "-n 4"
+          test_mypyc: true
         - name: Test suite with py314t-ubuntu, mypyc-compiled
           python: '3.14t'
           os: ubuntu-24.04-arm
@@ -196,6 +202,7 @@ jobs:
       if: ${{ !(matrix.debug_build || endsWith(matrix.python, '-dev')) }}
       with:
         python-version: ${{ matrix.python }}
+        allow-prereleases: true
 
     - name: Install tox
       run: |
@@ -206,7 +213,7 @@ jobs:
         echo debug build; python -c 'import sysconfig; print(bool(sysconfig.get_config_var("Py_DEBUG")))'
         echo os.cpu_count; python -c 'import os; print(os.cpu_count())'
         echo os.sched_getaffinity; python -c 'import os; print(len(getattr(os, "sched_getaffinity", lambda *args: [])(0)))'
-        pip install tox==4.26.0
+        pip install tox==4.53.1
 
     - name: Compiled with mypyc
       if: ${{ matrix.test_mypyc }}
@@ -271,7 +278,7 @@ jobs:
           default: 3.11.1
           command: python -c "import platform; print(f'{platform.architecture()=} {platform.machine()=}');"
       - name: Install tox
-        run: pip install tox==4.26.0
+        run: pip install tox==4.53.1
       - name: Setup tox environment
         run: tox run -e py --notest
       - name: Test

CHANGELOG.md

@@ -123,6 +123,18 @@ tox -e dev --override testenv:dev.allowlist_externals+=env -- env  # inspect the
 If you don't already have `tox` installed, you can use a virtual environment as
 described above to install `tox` via `pip` (e.g., ``python -m pip install tox``).
 
+## LLM-assisted contributions
+
+In general, mypy takes a neutral stance on using various LLM code assistants to
+make contributions. LLMs are just another tool, and contributors bear full
+responsibility for the code they are submitting. Disclosing the use of LLMs in
+pull request description is recommended, but not required.
+
+However, we discourage use of LLMs by *new* contributors. We are interested in
+growing long-term contributors who have good understanding of mypy code.
+Pull requests from new contributors that are mostly generated by LLMs
+with little human input will be closed.
+
 ## First time contributors
 
 If you're looking for things to help with, browse our [issue tracker](https://github.com/python/mypy/issues)!

CONTRIBUTING.md

@@ -1052,6 +1052,9 @@ enabled by default starting from mypy 2.0.
     disables parallel checking. Automatic detection of the optimal number
     of workers is not supported yet.
 
+    This setting will override the ``MYPY_NUM_WORKERS`` environment
+    variable if it is set.
+
 Notes:
 
 * An import cycle is always processed as a whole by a worker process. Thus,

docs/source/command_line.rst

@@ -1018,6 +1018,8 @@ These options may only be set in the global section (``[mypy]``).
 
     Use specific number of parallel worker processes for type-checking, see
     :ref:`parallel type-checking <parallel>` for more details.
+    This setting will be overridden by the ``MYPY_NUM_WORKERS`` environment
+    variable.
 
 
 Advanced options

docs/source/config_file.rst

@@ -550,7 +550,7 @@ Example:
 Check that overrides of mutable attributes are safe [mutable-override]
 ----------------------------------------------------------------------
 
-`mutable-override` will enable the check for unsafe overrides of mutable attributes.
+``mutable-override`` will enable the check for unsafe overrides of mutable attributes.
 For historical reasons, and because this is a relatively common pattern in Python,
 this check is not enabled by default. The example below is unsafe, and will be
 flagged when this error code is enabled:

docs/source/error_code_list2.rst

@@ -573,7 +573,7 @@ implementation, then the body is not type checked. If you want to
 force mypy to check the body anyways, use the :option:`--check-untyped-defs <mypy --check-untyped-defs>`
 flag (:ref:`more details here <untyped-definitions-and-calls>`).
 
-The variants must also also be compatible with the implementation
+The variants must also be compatible with the implementation
 type hints. In the ``MyList`` example, mypy will check that the
 parameter type ``int`` and the return type ``T`` are compatible with
 ``int | slice`` and ``T | Sequence`` for the

docs/source/more_types.rst

@@ -0,0 +1,91 @@
+From 7f38b86464d59188a87ff8c9913c257e788a2f0b Mon Sep 17 00:00:00 2001
+From: hauntsaninja <hauntsaninja@gmail.com>
+Date: Wed, 6 May 2026 19:49:41 -0700
+Subject: [PATCH] Revert operator changes
+
+---
+ mypy/typeshed/stdlib/_operator.pyi | 51 ++++++++----------------------
+ 1 file changed, 14 insertions(+), 37 deletions(-)
+
+diff --git a/mypy/typeshed/stdlib/_operator.pyi b/mypy/typeshed/stdlib/_operator.pyi
+index e7d85f811..8c705065b 100644
+--- a/mypy/typeshed/stdlib/_operator.pyi
++++ b/mypy/typeshed/stdlib/_operator.pyi
+@@ -1,15 +1,5 @@
+ import sys
+-from _typeshed import (
+-    SupportsAdd,
+-    SupportsGetItem,
+-    SupportsMod,
+-    SupportsMul,
+-    SupportsRAdd,
+-    SupportsRMod,
+-    SupportsRMul,
+-    SupportsRSub,
+-    SupportsSub,
+-)
++from _typeshed import SupportsGetItem
+ from collections.abc import Callable, Container, Iterable, MutableMapping, MutableSequence, Sequence
+ from operator import attrgetter as attrgetter, itemgetter as itemgetter, methodcaller as methodcaller
+ from typing import Any, AnyStr, Protocol, SupportsAbs, SupportsIndex, TypeVar, overload, type_check_only
+@@ -18,7 +8,6 @@ from typing_extensions import ParamSpec, TypeAlias, TypeIs
+ _R = TypeVar("_R")
+ _T = TypeVar("_T")
+ _T_co = TypeVar("_T_co", covariant=True)
+-_T_contra = TypeVar("_T_contra", contravariant=True)
+ _K = TypeVar("_K")
+ _V = TypeVar("_V")
+ _P = ParamSpec("_P")
+@@ -69,36 +58,24 @@ def truth(a: object, /) -> bool: ...
+ def is_(a: object, b: object, /) -> bool: ...
+ def is_not(a: object, b: object, /) -> bool: ...
+ def abs(a: SupportsAbs[_T], /) -> _T: ...
+-@overload
+-def add(a: SupportsAdd[_T_contra, _T_co], b: _T_contra, /) -> _T_co: ...
+-@overload
+-def add(a: _T_contra, b: SupportsRAdd[_T_contra, _T_co], /) -> _T_co: ...
+-def and_(a, b, /): ...
+-def floordiv(a, b, /): ...
++def add(a: Any, b: Any, /) -> Any: ...
++def and_(a: Any, b: Any, /) -> Any: ...
++def floordiv(a: Any, b: Any, /) -> Any: ...
+ def index(a: SupportsIndex, /) -> int: ...
+ def inv(a: _SupportsInversion[_T_co], /) -> _T_co: ...
+ def invert(a: _SupportsInversion[_T_co], /) -> _T_co: ...
+-def lshift(a, b, /): ...
+-@overload
+-def mod(a: SupportsMod[_T_contra, _T_co], b: _T_contra, /) -> _T_co: ...
+-@overload
+-def mod(a: _T_contra, b: SupportsRMod[_T_contra, _T_co], /) -> _T_co: ...
+-@overload
+-def mul(a: SupportsMul[_T_contra, _T_co], b: _T_contra, /) -> _T_co: ...
+-@overload
+-def mul(a: _T_contra, b: SupportsRMul[_T_contra, _T_co], /) -> _T_co: ...
+-def matmul(a, b, /): ...
++def lshift(a: Any, b: Any, /) -> Any: ...
++def mod(a: Any, b: Any, /) -> Any: ...
++def mul(a: Any, b: Any, /) -> Any: ...
++def matmul(a: Any, b: Any, /) -> Any: ...
+ def neg(a: _SupportsNeg[_T_co], /) -> _T_co: ...
+-def or_(a, b, /): ...
++def or_(a: Any, b: Any, /) -> Any: ...
+ def pos(a: _SupportsPos[_T_co], /) -> _T_co: ...
+-def pow(a, b, /): ...
+-def rshift(a, b, /): ...
+-@overload
+-def sub(a: SupportsSub[_T_contra, _T_co], b: _T_contra, /) -> _T_co: ...
+-@overload
+-def sub(a: _T_contra, b: SupportsRSub[_T_contra, _T_co], /) -> _T_co: ...
+-def truediv(a, b, /): ...
+-def xor(a, b, /): ...
++def pow(a: Any, b: Any, /) -> Any: ...
++def rshift(a: Any, b: Any, /) -> Any: ...
++def sub(a: Any, b: Any, /) -> Any: ...
++def truediv(a: Any, b: Any, /) -> Any: ...
++def xor(a: Any, b: Any, /) -> Any: ...
+ def concat(a: Sequence[_T], b: Sequence[_T], /) -> Sequence[_T]: ...
+ def contains(a: Container[object], b: object, /) -> bool: ...
+ def countOf(a: Iterable[object], b: object, /) -> int: ...
+-- 
+2.53.0
+

misc/typeshed_patches/0001-Revert-operator-changes.patch

@@ -5,5 +5,5 @@ typing_extensions>=4.14.0; python_version>='3.15'
 mypy_extensions>=1.0.0
 pathspec>=1.0.0
 tomli>=1.1.0; python_version<'3.11'
-librt>=0.9.0; platform_python_implementation != 'PyPy'
-ast-serialize>=0.3.0,<1.0.0
+librt>=0.11.0; platform_python_implementation != 'PyPy'
+ast-serialize>=0.5.0,<1.0.0