Sync with python/mypy master

.github/workflows/docs.yml

@@ -0,0 +1,51 @@
+name: Check documentation build
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [main, master, 'release*']
+    tags: ['*']
+  pull_request:
+    paths:
+    - 'docs/**'
+    # We now have a docs check that fails if any error codes don't have documentation,
+    # so it's important to do the docs build on all PRs touching mypy/errorcodes.py
+    # in case somebody's adding a new error code without any docs
+    - 'mypy/errorcodes.py'
+    # Part of the documentation is automatically generated from the options
+    # definitions in mypy/main.py
+    - 'mypy/main.py'
+    - 'mypyc/doc/**'
+    - '**/*.rst'
+    - '**/*.md'
+    - CREDITS
+    - LICENSE
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  docs:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    env:
+      TOXENV: docs
+      TOX_SKIP_MISSING_INTERPRETERS: False
+      VERIFY_MYPY_ERROR_CODES: 1
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+      - name: Install tox
+        run: pip install tox==4.53.1
+      - name: Setup tox environment
+        run: tox run -e ${{ env.TOXENV }} --notest
+      - name: Test
+        run: tox run -e ${{ env.TOXENV }} --skip-pkg-install

.github/workflows/test.yml

@@ -58,6 +58,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
@@ -138,6 +144,7 @@ jobs:
     timeout-minutes: 60
     env:
       TOX_SKIP_MISSING_INTERPRETERS: False
+      VIRTUALENV_SYSTEM_SITE_PACKAGES: ${{ matrix.test_mypyc && 1 || 0 }}
       # Rich (pip) -- Disable color for windows + pytest
       FORCE_COLOR: ${{ !(startsWith(matrix.os, 'windows-') && startsWith(matrix.toxenv, 'py')) && 1 || 0 }}
       # Tox
@@ -194,6 +201,7 @@ jobs:
       if: ${{ !(matrix.debug_build || endsWith(matrix.python, '-dev')) }}
       with:
         python-version: ${{ matrix.python }}
+        allow-prereleases: true
 
     - name: Install tox
       run: |
@@ -204,12 +212,14 @@ 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 }}
+      # Use local version of librt during self-compilation in tests.
       run: |
         pip install -r test-requirements.txt
+        pip install -U mypyc/lib-rt
         CC=clang MYPYC_OPT_LEVEL=0 MYPY_USE_MYPYC=1 pip install -e .
 
     - name: Setup tox environment
@@ -267,7 +277,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

CONTRIBUTING.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)!

MANIFEST.in

@@ -5,6 +5,7 @@
 prune mypy/typeshed
 include mypy/typeshed/LICENSE
 include mypy/typeshed/stdlib/VERSIONS
+include mypy/typeshed/stdlib/_typeshed/README.md
 recursive-include mypy/typeshed *.pyi
 
 # mypy and mypyc
@@ -46,8 +47,8 @@ include conftest.py
 include runtests.py
 include tox.ini
 
-include LICENSE mypyc/README.md CHANGELOG.md
-exclude .gitmodules CONTRIBUTING.md CREDITS ROADMAP.md action.yml .editorconfig
+include LICENSE mypyc/README.md CHANGELOG.md CREDITS
+exclude .gitmodules CONTRIBUTING.md ROADMAP.md action.yml .editorconfig
 exclude .git-blame-ignore-revs .pre-commit-config.yaml
 
 global-exclude *.py[cod]

docs/source/builtin_types.rst

@@ -40,8 +40,7 @@ See :ref:`dynamic-typing` for more details.
 Generic types
 .............
 
-In Python 3.9 and later, built-in collection type objects support
-indexing:
+Built-in collection type objects support indexing:
 
 ====================== ===============================
 Type                   Description
@@ -65,13 +64,11 @@ strings and ``dict[Any, Any]`` is a dictionary of dynamically typed
 Python protocols. For example, a ``str`` object or a ``list[str]`` object is
 valid when ``Iterable[str]`` or ``Sequence[str]`` is expected.
 You can import them from :py:mod:`collections.abc` instead of importing from
-:py:mod:`typing` in Python 3.9.
+:py:mod:`typing`.
 
-See :ref:`generic-builtins` for more details, including how you can
-use these in annotations also in Python 3.7 and 3.8.
+See :ref:`generic-builtins` for more details.
 
-These legacy types defined in :py:mod:`typing` are needed if you need to support
-Python 3.8 and earlier:
+These legacy types defined in :py:mod:`typing` are also supported:
 
 ====================== ===============================
 Type                   Description
@@ -80,17 +77,5 @@ Type                   Description
 ``Tuple[int, int]``    tuple of two ``int`` objects (``Tuple[()]`` is the empty tuple)
 ``Tuple[int, ...]``    tuple of an arbitrary number of ``int`` objects
 ``Dict[str, int]``     dictionary from ``str`` keys to ``int`` values
-``Iterable[int]``      iterable object containing ints
-``Sequence[bool]``     sequence of booleans (read-only)
-``Mapping[str, int]``  mapping from ``str`` keys to ``int`` values (read-only)
 ``Type[C]``            type object of ``C`` (``C`` is a class/type variable/union of types)
 ====================== ===============================
-
-``List`` is an alias for the built-in type ``list`` that supports
-indexing (and similarly for ``dict``/``Dict`` and
-``tuple``/``Tuple``).
-
-Note that even though ``Iterable``, ``Sequence`` and ``Mapping`` look
-similar to abstract base classes defined in :py:mod:`collections.abc`
-(formerly ``collections``), they are not identical, since the latter
-don't support indexing prior to Python 3.9.

docs/source/cheat_sheet_py3.rst

@@ -43,18 +43,18 @@ Useful built-in types
    x: str = "test"
    x: bytes = b"test"
 
-   # For collections on Python 3.9+, the type of the collection item is in brackets
+   # For collections, the type of the collection item is in brackets
    x: list[int] = [1]
    x: set[int] = {6, 7}
 
    # For mappings, we need the types of both keys and values
-   x: dict[str, float] = {"field": 2.0}  # Python 3.9+
+   x: dict[str, float] = {"field": 2.0}
 
    # For tuples of fixed size, we specify the types of all the elements
-   x: tuple[int, str, float] = (3, "yes", 7.5)  # Python 3.9+
+   x: tuple[int, str, float] = (3, "yes", 7.5)
 
    # For tuples of variable size, we use one type and ellipsis
-   x: tuple[int, ...] = (1, 2, 3)  # Python 3.9+
+   x: tuple[int, ...] = (1, 2, 3)
 
    # On Python 3.8 and earlier, the name of the collection type is
    # capitalized, and the type is imported from the 'typing' module
@@ -67,13 +67,12 @@ Useful built-in types
 
    from typing import Union, Optional
 
-   # On Python 3.10+, use the | operator when something could be one of a few types
-   x: list[int | str] = [3, 5, "test", "fun"]  # Python 3.10+
-   # On earlier versions, use Union
+   # Use the | operator when something could be one of a few types
+   x: list[int | str] = [3, 5, "test", "fun"]
+   # Union is equivalent
    x: list[Union[int, str]] = [3, 5, "test", "fun"]
 
-   # Use X | None for a value that could be None on Python 3.10+
-   # Use Optional[X] on 3.9 and earlier; Optional[X] is the same as 'X | None'
+   # Use X | None for a value that could be None; Optional[X] is the same as X | None
    x: str | None = "something" if some_condition() else None
    if x is not None:
        # Mypy understands x won't be None here because of the if-statement