Merge branch 'master' into class-constraint-tuple-tests

Author: hauntsaninja

.github/workflows/mypy_primer.yml

@@ -13,7 +13,6 @@ on:
     - 'mypy/stubgen.py'
     - 'mypy/stubgenc.py'
     - 'mypy/test/**'
-    - 'scripts/**'
     - 'test-data/**'
 
 jobs:
@@ -24,7 +23,7 @@ jobs:
       contents: read
     strategy:
       matrix:
-        shard-index: [0, 1, 2]
+        shard-index: [0, 1, 2, 3, 4]
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
@@ -57,7 +56,7 @@ jobs:
             mypy_primer \
             --repo mypy_to_test \
             --new $GITHUB_SHA --old base_commit \
-            --num-shards 3 --shard-index ${{ matrix.shard-index }} \
+            --num-shards 5 --shard-index ${{ matrix.shard-index }} \
             --debug \
             --output concise \
             | tee diff_${{ matrix.shard-index }}.txt

.pre-commit-config.yaml

@@ -8,9 +8,9 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/pycqa/flake8
-    rev: 3.9.2  # must match test-requirements.txt
+    rev: 5.0.4  # must match test-requirements.txt
     hooks:
       - id: flake8
         additional_dependencies:
-          - flake8-bugbear==22.7.1  # must match test-requirements.txt
-          - flake8-noqa==1.2.8      # must match test-requirements.txt
+          - flake8-bugbear==22.8.23  # must match test-requirements.txt
+          - flake8-noqa==1.2.9       # must match test-requirements.txt

CONTRIBUTING.md

@@ -54,10 +54,16 @@ python3 runtests.py
 You can also use `tox` to run tests (`tox` handles setting up the test environment for you):
 ```
 tox -e py
+
+# Or some specific python version:
+tox -e py39
+
+# Or some specific command:
+tox -e lint
 ```
 
 Some useful commands for running specific tests include:
-```
+```bash
 # Use mypy to check mypy's own code
 python3 runtests.py self
 # or equivalently:

build-requirements.txt

@@ -1,3 +1,4 @@
 -r mypy-requirements.txt
+types-psutil
 types-setuptools
-types-typed-ast>=1.5.0,<1.6.0
+types-typed-ast>=1.5.8,<1.6.0

docs/source/cheat_sheet_py3.rst

@@ -119,7 +119,7 @@ Python 3 supports an annotation syntax for function declarations.
                   sender: str,
                   cc: Optional[list[str]],
                   bcc: Optional[list[str]],
-                  subject='',
+                  subject: str = '',
                   body: Optional[list[str]] = None
                   ) -> bool:
        ...

docs/source/command_line.rst

@@ -830,7 +830,8 @@ in developing or debugging mypy internals.
     submitting them upstream, but also allows you to use a forked version of
     typeshed.
 
-    Note that this doesn't affect third-party library stubs.
+    Note that this doesn't affect third-party library stubs. To test third-party stubs,
+    for example try ``MYPYPATH=stubs/six mypy ...``.
 
 .. _warn-incomplete-stub:
 

docs/source/common_issues.rst

@@ -187,7 +187,13 @@ Ignoring a whole file
 ---------------------
 
 A ``# type: ignore`` comment at the top of a module (before any statements,
-including imports or docstrings) has the effect of ignoring the *entire* module.
+including imports or docstrings) has the effect of ignoring the entire contents of the module.
+
+To only ignore errors, use a top-level ``# mypy: ignore-errors`` comment instead.
+To only ignore errors with a specific error code, use a top-level
+``# mypy: disable-error-code=...`` comment.
+To replace the contents of the module with ``Any``, use a per-module ``follow_imports = skip``.
+See :ref:`Following imports <follow-imports>` for details.
 
 .. code-block:: python
 

docs/source/config_file.rst

@@ -574,14 +574,6 @@ Suppressing errors
 Note: these configuration options are available in the config file only. There is
 no analog available via the command line options.
 
-.. confval:: show_none_errors
-
-    :type: boolean
-    :default: True
-
-    Shows errors related to strict ``None`` checking, if the global :confval:`strict_optional`
-    flag is enabled.
-
 .. confval:: ignore_errors
 
     :type: boolean
@@ -858,9 +850,16 @@ These options may only be set in the global section (``[mypy]``).
 
     :type: string
 
-    Specifies an alternative directory to look for stubs instead of the
-    default ``typeshed`` directory. User home directory and environment
-    variables will be expanded.
+    This specifies the directory where mypy looks for standard library typeshed
+    stubs, instead of the typeshed that ships with mypy.  This is
+    primarily intended to make it easier to test typeshed changes before
+    submitting them upstream, but also allows you to use a forked version of
+    typeshed.
+
+    User home directory and environment variables will be expanded.
+
+    Note that this doesn't affect third-party library stubs. To test third-party stubs,
+    for example try ``MYPYPATH=stubs/six mypy ...``.
 
 .. confval:: warn_incomplete_stub
 

docs/source/error_codes.rst

@@ -69,3 +69,47 @@ which enables the ``no-untyped-def`` error code.
 You can use :option:`--enable-error-code <mypy --enable-error-code>` to
 enable specific error codes that don't have a dedicated command-line
 flag or config file setting.
+
+Per-module enabling/disabling error codes
+-----------------------------------------
+
+You can use :ref:`configuration file <config-file>` sections to enable or
+disable specific error codes only in some modules. For example, this ``mypy.ini``
+config will enable non-annotated empty containers in tests, while keeping
+other parts of code checked in strict mode:
+
+.. code-block:: ini
+
+   [mypy]
+   strict = True
+
+   [mypy-tests.*]
+   allow_untyped_defs = True
+   allow_untyped_calls = True
+   disable_error_code = var-annotated, has-type
+
+Note that per-module enabling/disabling acts as override over the global
+options. So that you don't need to repeat the error code lists for each
+module if you have them in global config section. For example:
+
+.. code-block:: ini
+
+   [mypy]
+   enable_error_code = truthy-bool, ignore-without-code, unused-awaitable
+
+   [mypy-extensions.*]
+   disable_error_code = unused-awaitable
+
+The above config will allow unused awaitables in extension modules, but will
+still keep the other two error codes enabled. The overall logic is following:
+
+* Command line and/or config main section set global error codes
+
+* Individual config sections *adjust* them per glob/module
+
+* Inline ``# mypy: ...`` comments can further *adjust* them for a specific
+  module
+
+So one can e.g. enable some code globally, disable it for all tests in
+the corresponding config section, and then re-enable it with an inline
+comment in some specific test.

misc/actions_stubs.py

@@ -30,7 +30,7 @@ def __init__(
         self.meta_size = meta_size
 
     @property
-    def total_size(self):
+    def total_size(self) -> int:
         return self.data_size + self.meta_size
 
 
@@ -75,7 +75,7 @@ def pluck(name: str, chunks: Iterable[JsonDict]) -> Iterable[JsonDict]:
     return (chunk for chunk in chunks if chunk[".class"] == name)
 
 
-def report_counter(counter: Counter, amount: int | None = None) -> None:
+def report_counter(counter: Counter[str], amount: int | None = None) -> None:
     for name, count in counter.most_common(amount):
         print(f"    {count: <8} {name}")
     print()
@@ -89,7 +89,7 @@ def compress(chunk: JsonDict) -> JsonDict:
     cache: dict[int, JsonDict] = {}
     counter = 0
 
-    def helper(chunk: Any) -> Any:
+    def helper(chunk: JsonDict) -> JsonDict:
         nonlocal counter
         if not isinstance(chunk, dict):
             return chunk
@@ -121,7 +121,7 @@ def helper(chunk: Any) -> Any:
 def decompress(chunk: JsonDict) -> JsonDict:
     cache: dict[int, JsonDict] = {}
 
-    def helper(chunk: Any) -> Any:
+    def helper(chunk: JsonDict) -> JsonDict:
         if not isinstance(chunk, dict):
             return chunk
         if ".id" in chunk:
@@ -167,6 +167,7 @@ def main() -> None:
         if "build.*.json" in chunk.filename:
             build = chunk
             break
+    assert build is not None
     original = json.dumps(build.data, sort_keys=True)
     print(f"Size of build.data.json, in kilobytes: {len(original) / 1024:.3f}")