diff --git a/docs/source/command_line.rst b/docs/source/command_line.rst index 7b6b75b98b6f9..3fee6431f8cd5 100644 --- a/docs/source/command_line.rst +++ b/docs/source/command_line.rst @@ -692,9 +692,8 @@ of the above sections. .. option:: --extra-checks This flag enables additional checks that are technically correct but may be - impractical in real code. In particular, it prohibits partial overlap in - ``TypedDict`` updates, and makes arguments prepended via ``Concatenate`` - positional-only. For example: + impractical. In particular, it prohibits partial overlap in ``TypedDict`` updates, + and makes arguments prepended via ``Concatenate`` positional-only. For example: .. code-block:: python @@ -717,6 +716,13 @@ of the above sections. bad: Bad = {"a": 0, "b": "no"} test(bad, bar) + In future more checks may be added to this flag if: + + * The corresponding use cases are rare, thus not justifying a dedicated + strictness flag. + + * The new check cannot be supported as an opt-in error code. + .. option:: --strict This flag mode enables all optional error checking flags. You can see the diff --git a/docs/source/config_file.rst b/docs/source/config_file.rst index 41dadbe7d2a31..e06303777ea9c 100644 --- a/docs/source/config_file.rst +++ b/docs/source/config_file.rst @@ -748,7 +748,7 @@ section of the command line docs. :type: boolean :default: False - This flag enables additional checks that are technically correct but may be impractical in real code. + This flag enables additional checks that are technically correct but may be impractical. See :option:`mypy --extra-checks` for more info. .. confval:: implicit_reexport @@ -771,13 +771,6 @@ section of the command line docs. from foo import bar __all__ = ['bar'] -.. confval:: strict_concatenate - - :type: boolean - :default: False - - Make arguments prepended via ``Concatenate`` be truly positional-only. - .. confval:: strict_equality :type: boolean diff --git a/docs/source/existing_code.rst b/docs/source/existing_code.rst index 0a5ac2bfa8f64..dfdc7ef19e163 100644 --- a/docs/source/existing_code.rst +++ b/docs/source/existing_code.rst @@ -199,9 +199,8 @@ The following config is equivalent to ``--strict`` (as of mypy 1.0): warn_redundant_casts = True warn_unused_ignores = True - # Getting these passing should be easy + # Getting this passing should be easy strict_equality = True - strict_concatenate = True # Strongly recommend enabling this one as soon as you can check_untyped_defs = True @@ -223,6 +222,10 @@ The following config is equivalent to ``--strict`` (as of mypy 1.0): # This one can be tricky to get passing if you use a lot of untyped libraries warn_return_any = True + # This one is a catch-all flag for the rest of strict checks that are technically + # correct but may not be practical + extra_checks = True + Note that you can also start with ``--strict`` and subtract, for instance: .. code-block:: text