Merge tag '1.7-forkpoint' into merge-1.7-fork

# Conflicts:
#	.github/ISSUE_TEMPLATE/feature.md
#	.github/workflows/test.yml
#	CHANGELOG.md
#	MANIFEST.in
#	mypy/checker.py
#	mypy/checkexpr.py
#	mypy/checkstrformat.py
#	mypy/constraints.py
#	mypy/errors.py
#	mypy/fixup.py
#	mypy/maptype.py
#	mypy/meet.py
#	mypy/messages.py
#	mypy/options.py
#	mypy/plugins/dataclasses.py
#	mypy/plugins/default.py
#	mypy/semanal.py
#	mypy/stubgen.py
#	mypy/subtypes.py
#	mypy/test/testtypes.py
#	mypy/types.py
#	mypy/typeshed/stdlib/builtins.pyi
#	mypy/typeshed/stdlib/importlib/machinery.pyi
#	mypy/typeshed/stdlib/pathlib.pyi
#	mypy_self_check.ini
#	pyproject.toml
#	setup.py
#	test-data/unit/check-expressions.test
#	test-data/unit/check-inference-context.test
#	test-data/unit/check-inference.test
#	test-data/unit/check-optional.test
#	test-data/unit/check-python310.test
#	test-data/unit/check-type-aliases.test
#	test-data/unit/check-unions.test
#	test-data/unit/check-varargs.test
#	test-data/unit/fine-grained-modules.test
#	test-data/unit/pythoneval.test

Author: KotlinIsland

.github/ISSUE_TEMPLATE/feature.md

@@ -8,4 +8,4 @@ Before you raise this, consider if it's better suited to a discussion: https://g
 
 <!-- Please explain why this feature is based -->
 
-<!-- Please include a full usage example of this feature  -->
+<!-- Please explain why this feature should be implemented and how it would be used. Please include a full usage example. -->

.github/workflows/build_wheels.yml

@@ -5,12 +5,15 @@ on:
     branches: [main, master, 'release*']
     tags: ['*']
 
+permissions:
+  contents: write
+
 jobs:
   build-wheels:
     if: github.repository == 'KotlinIsland/basedmypy'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: '3.11'

.github/workflows/docs.yml

@@ -8,12 +8,23 @@ on:
   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'
     - '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
@@ -22,7 +33,7 @@ jobs:
       TOX_SKIP_MISSING_INTERPRETERS: False
       VERIFY_MYPY_ERROR_CODES: 1
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: '3.8'

.github/workflows/mypy_primer.yml

@@ -15,6 +15,9 @@ on:
     - 'mypy/test/**'
     - 'test-data/**'
 
+permissions:
+  contents: read
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
@@ -30,7 +33,7 @@ jobs:
         shard-index: [0, 1, 2, 3, 4]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: mypy_to_test
           fetch-depth: 0

.github/workflows/sync_typeshed.yml

@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'python/mypy'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
         # TODO: use whatever solution ends up working for

.github/workflows/test.yml

@@ -15,6 +15,9 @@ on:
     - CREDITS
     - LICENSE
 
+permissions:
+  contents: read
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
@@ -61,15 +64,15 @@ jobs:
           tox_extra_args: "-n 2"
           test_mypyc: true
         - name: Test suite with py312-ubuntu, mypyc-compiled
-          python: '3.12-dev'
+          python: '3.12'
           arch: x64
           os: ubuntu-latest
           toxenv: py
           tox_extra_args: "-n 2"
           test_mypyc: true
 
-        - name: mypyc runtime tests with py38-macos
-          python: '3.8.17'
+        - name: mypyc runtime tests with py39-macos
+          python: '3.9.18'
           arch: x64
           os: macos-latest
           toxenv: py
@@ -112,7 +115,7 @@ jobs:
       # Pytest
       PYTEST_ADDOPTS: --color=yes
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
@@ -126,7 +129,7 @@ jobs:
         ./misc/build-debug-python.sh $PYTHONVERSION $PYTHONDIR $VENV
         source $VENV/bin/activate
     - name: Install tox
-      run: pip install --upgrade 'setuptools!=50' tox==4.11.0
+      run: pip install setuptools==68.2.2 tox==4.11.0
     - name: Compiled with mypyc
       if: ${{ matrix.test_mypyc }}
       run: |
@@ -151,7 +154,7 @@ jobs:
       CXX: i686-linux-gnu-g++
       CC: i686-linux-gnu-gcc
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install 32-bit build dependencies
         run: |
           sudo dpkg --add-architecture i386 && \
@@ -174,7 +177,7 @@ jobs:
           default: 3.11.1
           command: python -c "import platform; print(f'{platform.architecture()=} {platform.machine()=}');"
       - name: Install tox
-        run: pip install --upgrade 'setuptools!=50' tox==4.11.0
+        run: pip install setuptools==68.2.2 tox==4.11.0
       - name: Setup tox environment
         run: tox run -e py --notest
       - name: Test

.github/workflows/test_stubgenc.yml

@@ -12,14 +12,21 @@ on:
     - 'mypy/stubdoc.py'
     - 'test-data/stubgen/**'
 
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   stubgenc:
     # Check stub file generation for a small pybind11 project
     # (full text match is required to pass)
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup 🐍 3.8
       uses: actions/setup-python@v4

.pre-commit-config.yaml

@@ -1,17 +1,17 @@
 exclude: '^(mypyc/external/)|(mypy/typeshed/)'  # Exclude all vendored code from lints
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0  # must match test-requirements.txt
+    rev: v4.5.0  # must match test-requirements.txt
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
         exclude: "^.mypy/baseline.json$"
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 23.7.0  # must match test-requirements.txt
+    rev: 23.9.1  # must match test-requirements.txt
     hooks:
       - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.281  # must match test-requirements.txt
+    rev: v0.1.0  # must match test-requirements.txt
     hooks:
       - id: ruff
         args: [--exit-non-zero-on-fix]

CONTRIBUTING.md

@@ -62,18 +62,6 @@ like this:
 python3 runtests.py
 ```
 
-You can also use `tox` to run tests (`tox` handles setting up the test environment for you):
-
-```bash
-tox run -e py
-
-# Or some specific python version:
-tox run -e py39
-
-# Or some specific command:
-tox run -e lint
-```
-
 Some useful commands for running specific tests include:
 
 ```bash
@@ -95,6 +83,36 @@ python runtests.py lint
 For an in-depth guide on running and writing tests,
 see [the README in the test-data directory](test-data/unit/README.md).
 
+#### Using `tox`
+
+You can also use [`tox`](https://tox.wiki/en/latest/) to run tests and other commands.
+`tox` handles setting up test environments for you.
+
+```bash
+# Run tests
+tox run -e py
+
+# Run tests using some specific Python version
+tox run -e py311
+
+# Run a specific command
+tox run -e lint
+
+# Run a single test from the test suite
+tox run -e py -- -n0 -k 'test_name'
+
+# Run all test cases in the "test-data/unit/check-dataclasses.test" file using
+# Python 3.11 specifically
+tox run -e py311 -- mypy/test/testcheck.py::TypeCheckSuite::check-dataclasses.test
+
+# Set up a development environment with all the project libraries and run a command
+tox -e dev -- mypy --verbose test_case.py
+tox -e dev --override testenv:dev.allowlist_externals+=env -- env  # inspect the environment
+```
+
+If you don't already have `tox` installed, you can use a virtual environment as
+described above to install `tox` via `pip` (e.g., ``python3 -m pip install tox``).
+
 ## First time contributors
 
 If you're looking for things to help with, browse our [issue tracker](https://github.com/python/mypy/issues)!

MANIFEST.in

@@ -31,19 +31,19 @@ graft mypyc/doc
 # files necessary for testing sdist
 include mypy-requirements.txt
 include build-requirements.txt
+include test-requirements.in
 include test-requirements.txt
 include mypy_self_check.ini
 prune misc
-include misc/proper_plugin.py
 graft test-data
 include conftest.py
 include runtests.py
 include pytest.ini
 include tox.ini
 
 include LICENSE mypyc/README.md
-exclude .gitmodules CONTRIBUTING.md CREDITS ROADMAP.md action.yml .editorconfig
-exclude mypy_self_check_strict.ini CHANGELOG.md .mypy/baseline.json
+exclude .gitmodules CONTRIBUTING.md CREDITS ROADMAP.md CHANGELOG.md action.yml .editorconfig
+exclude mypy_self_check_strict.ini .mypy/baseline.json
 exclude .git-blame-ignore-revs .pre-commit-config.yaml
 
 global-exclude *.py[cod]

docs/README.md

@@ -15,13 +15,13 @@ Install Sphinx and other dependencies (i.e. theme) needed for the documentation.
 From the `docs` directory, use `pip`:
 
 ```
-$ pip install -r requirements-docs.txt
+pip install -r requirements-docs.txt
 ```
 
 Build the documentation like this:
 
 ```
-$ make html
+make html
 ```
 
 The built documentation will be placed in the `docs/build` directory. Open
@@ -33,13 +33,13 @@ Helpful documentation build commands
 Clean the documentation build:
 
 ```
-$ make clean
+make clean
 ```
 
 Test and check the links found in the documentation:
 
 ```
-$ make linkcheck
+make linkcheck
 ```
 
 Documentation on Read The Docs

docs/source/additional_features.rst

@@ -71,12 +71,12 @@ and :pep:`557`.
 Caveats/Known Issues
 ====================
 
-Some functions in the :py:mod:`dataclasses` module, such as :py:func:`~dataclasses.replace` and :py:func:`~dataclasses.asdict`,
+Some functions in the :py:mod:`dataclasses` module, such as :py:func:`~dataclasses.asdict`,
 have imprecise (too permissive) types. This will be fixed in future releases.
 
 Mypy does not yet recognize aliases of :py:func:`dataclasses.dataclass <dataclasses.dataclass>`, and will
-probably never recognize dynamically computed decorators. The following examples
-do **not** work:
+probably never recognize dynamically computed decorators. The following example
+does **not** work:
 
 .. code-block:: python
 
@@ -94,16 +94,37 @@ do **not** work:
       """
       attribute: int
 
-    @dataclass_wrapper
-    class DynamicallyDecorated:
-      """
-      Mypy doesn't recognize this as a dataclass because it is decorated by a
-      function returning `dataclass` rather than by `dataclass` itself.
-      """
-      attribute: int
-
     AliasDecorated(attribute=1) # error: Unexpected keyword argument
-    DynamicallyDecorated(attribute=1) # error: Unexpected keyword argument
+
+
+To have Mypy recognize a wrapper of :py:func:`dataclasses.dataclass <dataclasses.dataclass>`
+as a dataclass decorator, consider using the :py:func:`~typing.dataclass_transform` decorator:
+
+.. code-block:: python
+
+    from dataclasses import dataclass, Field
+    from typing import TypeVar, dataclass_transform
+
+    T = TypeVar('T')
+
+    @dataclass_transform(field_specifiers=(Field,))
+    def my_dataclass(cls: type[T]) -> type[T]:
+        ...
+        return dataclass(cls)
+
+
+Data Class Transforms
+*********************
+
+Mypy supports the :py:func:`~typing.dataclass_transform` decorator as described in
+`PEP 681 <https://www.python.org/dev/peps/pep-0681/#the-dataclass-transform-decorator>`_.
+
+.. note::
+
+    Pragmatically, mypy will assume such classes have the internal attribute :code:`__dataclass_fields__`
+    (even though they might lack it in runtime) and will assume functions such as :py:func:`dataclasses.is_dataclass`
+    and :py:func:`dataclasses.fields` treat them as if they were dataclasses
+    (even though they may fail at runtime).
 
 .. _attrs_package: