diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index dc411c6da49b..da5554bf2e32 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,6 +39,14 @@ repos: rev: v1.0.1 hooks: - id: zizmor + - repo: local + hooks: + - id: bad-pr-link + name: Bad PR link + description: Detect PR links text that don't match their URL + language: pygrep + entry: '\[(\d+)\]\(https://github.com/python/mypy/pull/(?!\1/?\))\d+/?\)' + files: CHANGELOG.md # Should be the last one: - repo: meta hooks: diff --git a/CHANGELOG.md b/CHANGELOG.md index e5260104f3fe..a150262be896 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,79 @@ # Mypy Release Notes -## Next release +## Next Release -### Performance improvements +... + +## Mypy 1.15 + +We’ve just uploaded mypy 1.15 to the Python Package Index ([PyPI](https://pypi.org/project/mypy/)). +Mypy is a static type checker for Python. This release includes new features, performance +improvements and bug fixes. You can install it as follows: + + python3 -m pip install -U mypy + +You can read the full documentation for this release on [Read the Docs](http://mypy.readthedocs.io). + +### Performance Improvements + +Mypy is up to 40% faster in some use cases. This improvement comes largely from tuning the performance +of the garbage collector. Additionally, the release includes several micro-optimizations that may +be impactful for large projects. + +Contributed by Jukka Lehtosalo (PR [18306](https://github.com/python/mypy/pull/18306), +PR [18302](https://github.com/python/mypy/pull/18302, PR [18298](https://github.com/python/mypy/pull/18298, +PR [18299](https://github.com/python/mypy/pull/18299). + +### Mypyc Accelerated Mypy Wheels for ARM Linux -Mypy may be 5-30% faster. This improvement comes largely from tuning the performance of the -garbage collector. +For best performance, mypy can be compiled to C extension modules using mypyc. This makes +mypy 3-5x faster than when interpreted with pure Python. We now build and upload mypyc +accelerated mypy wheels for `manylinux_aarch64` to PyPI, making it easy for Linux users on +ARM platforms to realise this speedup -- just `pip install` the latest mypy. -Contributed by Jukka Lehtosalo (PR [18306](https://github.com/python/mypy/pull/18306)). +Contributed by Christian Bundy and Marc Mueller +(PR [mypy_mypyc-wheels#76](https://github.com/mypyc/mypy_mypyc-wheels/pull/76), +PR [mypy_mypyc-wheels#89](https://github.com/mypyc/mypy_mypyc-wheels/pull/89)). + +### `--strict-bytes` + +By default, mypy treats `bytearray` and `memoryview` values as assignable to the `bytes` +type, for historical reasons. Use the `--strict-bytes` flag to disable this +behavior. [PEP 688](https://peps.python.org/pep-0688) specified the removal of this +special case. The flag will be enabled by default in **mypy 2.0**. + +Contributed by Ali Hamdan (PR [18263](https://github.com/python/mypy/pull/18263)) and +Shantanu Jain (PR [13952](https://github.com/python/mypy/pull/13952)). + +### Improvements to Reachability Analysis and Partial Type Handling in Loops + +This change results in mypy better modelling control flow within loops and hence detecting +several previously ignored issues. In some cases, this change may require additional +explicit variable annotations. + +Contributed by Christoph Tyralla (PR [18180](https://github.com/python/mypy/pull/18180), +PR [18433](https://github.com/python/mypy/pull/18433)). + +(Speaking of partial types, remember that we plan to enable `--local-partial-types` +by default in **mypy 2.0**.) + +### Better Discovery of Configuration Files + +Mypy will now walk up the filesystem (up until a repository or file system root) to discover +configuration files. See the +[mypy configuration file documentation](https://mypy.readthedocs.io/en/stable/config_file.html) +for more details. + +Contributed by Mikhail Shiryaev and Shantanu Jain +(PR [16965](https://github.com/python/mypy/pull/16965), PR [18482](https://github.com/python/mypy/pull/18482)) + +### Better Line Numbers for Decorators and Slice Expressions + +Mypy now uses more correct line numbers for decorators and slice expressions. In some cases, +you may have to change the location of a `# type: ignore` comment. + +Contributed by Shantanu Jain (PR [18392](https://github.com/python/mypy/pull/18392), +PR [18397](https://github.com/python/mypy/pull/18397)). ### Drop Support for Python 3.8 @@ -18,43 +84,102 @@ Support for this will be dropped in the first half of 2025! Contributed by Marc Mueller (PR [17492](https://github.com/python/mypy/pull/17492)). -### Mypyc accelerated mypy wheels for aarch64 +### Mypyc Improvements -Mypy can compile itself to C extension modules using mypyc. This makes mypy 3-5x faster -than if mypy is interpreted with pure Python. We now build and upload mypyc accelerated -mypy wheels for `manylinux_aarch64` to PyPI, making it easy for users on such platforms -to realise this speedup. + * Fix `__init__` for classes with `@attr.s(slots=True)` (Advait Dixit, PR [18447](https://github.com/python/mypy/pull/18447)) + * Report error for nested class instead of crashing (Valentin Stanciu, PR [18460](https://github.com/python/mypy/pull/18460)) + * Fix `InitVar` for dataclasses (Advait Dixit, PR [18319](https://github.com/python/mypy/pull/18319)) + * Remove unnecessary mypyc files from wheels (Marc Mueller, PR [18416](https://github.com/python/mypy/pull/18416)) + * Fix issues with relative imports (Advait Dixit, PR [18286](https://github.com/python/mypy/pull/18286)) + * Add faster primitive for some list get item operations (Jukka Lehtosalo, PR [18136](https://github.com/python/mypy/pull/18136)) + * Fix iteration over `NamedTuple` objects (Advait Dixit, PR [18254](https://github.com/python/mypy/pull/18254)) + * Mark mypyc package with `py.typed` (bzoracler, PR [18253](https://github.com/python/mypy/pull/18253)) + * Fix list index while checking for `Enum` class (Advait Dixit, PR [18426](https://github.com/python/mypy/pull/18426)) -Contributed by Christian Bundy (PR [mypy_mypyc-wheels#76](https://github.com/mypyc/mypy_mypyc-wheels/pull/76)) +### Stubgen Improvements -### `--strict-bytes` + * Improve dataclass init signatures (Marc Mueller, PR [18430](https://github.com/python/mypy/pull/18430)) + * Preserve `dataclass_transform` decorator (Marc Mueller, PR [18418](https://github.com/python/mypy/pull/18418)) + * Fix `UnpackType` for 3.11+ (Marc Mueller, PR [18421](https://github.com/python/mypy/pull/18421)) + * Improve `self` annotations (Marc Mueller, PR [18420](https://github.com/python/mypy/pull/18420)) + * Print `InspectError` traceback in stubgen `walk_packages` when verbose is specified (Gareth, PR [18224](https://github.com/python/mypy/pull/18224)) -By default, mypy treats an annotation of ``bytes`` as permitting ``bytearray`` and ``memoryview``. -[PEP 688](https://peps.python.org/pep-0688) specified the removal of this special case. -Use this flag to disable this behavior. `--strict-bytes` will be enabled by default in **mypy 2.0**. +### Stubtest Improvements -Contributed by Ali Hamdan (PR [18137](https://github.com/python/mypy/pull/18263/)) and -Shantanu Jain (PR [13952](https://github.com/python/mypy/pull/13952)). + * Fix crash with numpy array default values (Ali Hamdan, PR [18353](https://github.com/python/mypy/pull/18353)) + * Distinguish metaclass attributes from class attributes (Stephen Morton, PR [18314](https://github.com/python/mypy/pull/18314)) -### Improvements to reachability analysis and partial type handling in loops +### Fixes to Crashes -This change results in mypy better modelling control flow within loops and hence detecting several -issues it previously did not detect. In some cases, this change may require use of an additional -explicit annotation of a variable. + * Prevent crash with `Unpack` of a fixed tuple in PEP695 type alias (Stanislav Terliakov, PR [18451](https://github.com/python/mypy/pull/18451)) + * Fix crash with `--cache-fine-grained --cache-dir=/dev/null` (Shantanu, PR [18457](https://github.com/python/mypy/pull/18457)) + * Prevent crashing when `match` arms use name of existing callable (Stanislav Terliakov, PR [18449](https://github.com/python/mypy/pull/18449)) + * Gracefully handle encoding errors when writing to stdout (Brian Schubert, PR [18292](https://github.com/python/mypy/pull/18292)) + * Prevent crash on generic NamedTuple with unresolved typevar bound (Stanislav Terliakov, PR [18585](https://github.com/python/mypy/pull/18585)) -Contributed by Christoph Tyralla (PR [18180](https://github.com/python/mypy/pull/18180), -[PR](https://github.com/python/mypy/pull/18433)). +### Documentation Updates -(Speaking of partial types, another reminder that mypy plans on enabling `--local-partial-types` -by default in **mypy 2.0**). + * Add inline tabs to documentation (Marc Mueller, PR [18262](https://github.com/python/mypy/pull/18262)) + * Document any `TYPE_CHECKING` name works (Shantanu, PR [18443](https://github.com/python/mypy/pull/18443)) + * Update documentation to not mention 3.8 where possible (sobolevn, PR [18455](https://github.com/python/mypy/pull/18455)) + * Mention `ignore_errors` in exclude documentation (Shantanu, PR [18412](https://github.com/python/mypy/pull/18412)) + * Add `Self` misuse to common issues (Shantanu, PR [18261](https://github.com/python/mypy/pull/18261)) -### Better line numbers for decorators and slice expressions +### Other Notable Fixes and Improvements -Mypy now uses more correct line numbers for decorators and slice expressions. In some cases, this -may necessitate changing the location of a `# type: ignore` comment. + * Fix literal context for ternary expressions (Ivan Levkivskyi, PR [18545](https://github.com/python/mypy/pull/18545)) + * Ignore `dataclass.__replace__` LSP violations (Marc Mueller, PR [18464](https://github.com/python/mypy/pull/18464)) + * Bind `self` to the class being defined when checking multiple inheritance (Stanislav Terliakov, PR [18465](https://github.com/python/mypy/pull/18465)) + * Fix attribute type resolution with multiple inheritance (Stanislav Terliakov, PR [18415](https://github.com/python/mypy/pull/18415)) + * Improve security of our GitHub Actions (sobolevn, PR [18413](https://github.com/python/mypy/pull/18413)) + * Unwrap `type[Union[...]]` when solving type variable constraints (Stanislav Terliakov, PR [18266](https://github.com/python/mypy/pull/18266)) + * Allow `Any` to match sequence patterns in match/case (Stanislav Terliakov, PR [18448](https://github.com/python/mypy/pull/18448)) + * Fix parent generics mapping when overriding generic attribute with property (Stanislav Terliakov, PR [18441](https://github.com/python/mypy/pull/18441)) + * Add dedicated error code for explicit `Any` (Shantanu, PR [18398](https://github.com/python/mypy/pull/18398)) + * Reject invalid `ParamSpec` locations (Stanislav Terliakov, PR [18278](https://github.com/python/mypy/pull/18278)) + * Stop suggesting stubs that have been removed from typeshed (Shantanu, PR [18373](https://github.com/python/mypy/pull/18373)) + * Allow inverting `--local-partial-types` (Shantanu, PR [18377](https://github.com/python/mypy/pull/18377)) + * Allow to use `Final` and `ClassVar` after Python 3.13 (정승원, PR [18358](https://github.com/python/mypy/pull/18358)) + * Update suggestions to include latest stubs in typeshed (Shantanu, PR [18366](https://github.com/python/mypy/pull/18366)) + * Fix `--install-types` masking failure details (wyattscarpenter, PR [17485](https://github.com/python/mypy/pull/17485)) + * Reject promotions when checking against protocols (Christoph Tyralla, PR [18360](https://github.com/python/mypy/pull/18360)) + * Don't erase type object arguments in diagnostics (Shantanu, PR [18352](https://github.com/python/mypy/pull/18352)) + * Clarify status in `dmypy status` output (Kcornw, PR [18331](https://github.com/python/mypy/pull/18331)) + * Disallow no-argument generic aliases when using PEP 613 explicit aliases (Brian Schubert, PR [18173](https://github.com/python/mypy/pull/18173)) + * Suppress errors for unreachable branches in conditional expressions (Brian Schubert, PR [18295](https://github.com/python/mypy/pull/18295)) + * Do not allow `ClassVar` and `Final` in `TypedDict` and `NamedTuple` (sobolevn, PR [18281](https://github.com/python/mypy/pull/18281)) + * Report error if not enough or too many types provided to `TypeAliasType` (bzoracler, PR [18308](https://github.com/python/mypy/pull/18308)) + * Use more precise context for `TypedDict` plugin errors (Brian Schubert, PR [18293](https://github.com/python/mypy/pull/18293)) + * Use more precise context for invalid type argument errors (Brian Schubert, PR [18290](https://github.com/python/mypy/pull/18290)) + * Do not allow `type[]` to contain `Literal` types (sobolevn, PR [18276](https://github.com/python/mypy/pull/18276)) + * Allow bytearray/bytes comparisons with `--strict-bytes` (Jukka Lehtosalo, PR [18255](https://github.com/python/mypy/pull/18255)) -Contributed by Shantanu Jain (PR [18392](https://github.com/python/mypy/pull/18392), -PR [18397](https://github.com/python/mypy/pull/18397)). +### Acknowledgements + +Thanks to all mypy contributors who contributed to this release: + +- Advait Dixit +- Ali Hamdan +- Brian Schubert +- bzoracler +- Cameron Matsui +- Christoph Tyralla +- Gareth +- Ivan Levkivskyi +- Jukka Lehtosalo +- Kcornw +- Marc Mueller +- Mikhail f. Shiryaev +- Shantanu +- sobolevn +- Stanislav Terliakov +- Stephen Morton +- Valentin Stanciu +- Viktor Szépe +- wyattscarpenter +- 정승원 + +I’d also like to thank my employer, Dropbox, for supporting mypy development. ## Mypy 1.14 diff --git a/docs/source/config_file.rst b/docs/source/config_file.rst index 747ef3a9fdaa..41dadbe7d2a3 100644 --- a/docs/source/config_file.rst +++ b/docs/source/config_file.rst @@ -7,22 +7,30 @@ Mypy is very configurable. This is most useful when introducing typing to an existing codebase. See :ref:`existing-code` for concrete advice for that situation. -Mypy supports reading configuration settings from a file with the following precedence order: +Mypy supports reading configuration settings from a file. By default, mypy will +discover configuration files by walking up the file system (up until the root of +a repository or the root of the filesystem). In each directory, it will look for +the following configuration files (in this order): - 1. ``./mypy.ini`` - 2. ``./.mypy.ini`` - 3. ``./pyproject.toml`` - 4. ``./setup.cfg`` - 5. ``$XDG_CONFIG_HOME/mypy/config`` - 6. ``~/.config/mypy/config`` - 7. ``~/.mypy.ini`` + 1. ``mypy.ini`` + 2. ``.mypy.ini`` + 3. ``pyproject.toml`` (containing a ``[tool.mypy]`` section) + 4. ``setup.cfg`` (containing a ``[mypy]`` section) + +If no configuration file is found by this method, mypy will then look for +configuration files in the following locations (in this order): + + 1. ``$XDG_CONFIG_HOME/mypy/config`` + 2. ``~/.config/mypy/config`` + 3. ``~/.mypy.ini`` + +The :option:`--config-file ` command-line flag has the +highest precedence and must point towards a valid configuration file; +otherwise mypy will report an error and exit. Without the command line option, +mypy will look for configuration files in the precedence order above. It is important to understand that there is no merging of configuration -files, as it would lead to ambiguity. The :option:`--config-file ` -command-line flag has the highest precedence and -must be correct; otherwise mypy will report an error and exit. Without the -command line option, mypy will look for configuration files in the -precedence order above. +files, as it would lead to ambiguity. Most flags correspond closely to :ref:`command-line flags ` but there are some differences in flag names and some diff --git a/mypy/checker.py b/mypy/checker.py index 47b08b683e36..131a8036508f 100644 --- a/mypy/checker.py +++ b/mypy/checker.py @@ -4372,7 +4372,7 @@ def check_simple_assignment( if ( isinstance(get_proper_type(lvalue_type), UnionType) # Skip literal types, as they have special logic (for better errors). - and not isinstance(get_proper_type(rvalue_type), LiteralType) + and not is_literal_type_like(rvalue_type) and not self.simple_rvalue(rvalue) ): # Try re-inferring r.h.s. in empty context, and use that if it @@ -8347,6 +8347,11 @@ def visit_type_var(self, t: TypeVarType) -> bool: # multi-step type inference. return t.id.is_meta_var() + def visit_tuple_type(self, t: TupleType, /) -> bool: + # Exclude fallback to avoid bogus "need type annotation" errors + # TODO: Maybe erase plain tuples used as fallback in TupleType constructor? + return self.query_types(t.items) + class SetNothingToAny(TypeTranslator): """Replace all ambiguous Uninhabited types with Any (to avoid spurious extra errors).""" diff --git a/mypy/config_parser.py b/mypy/config_parser.py index a0f93f663522..4161f7e04dd3 100644 --- a/mypy/config_parser.py +++ b/mypy/config_parser.py @@ -15,7 +15,7 @@ else: import tomli as tomllib -from collections.abc import Iterable, Mapping, MutableMapping, Sequence +from collections.abc import Mapping, MutableMapping, Sequence from typing import Any, Callable, Final, TextIO, Union from typing_extensions import TypeAlias as _TypeAlias @@ -217,6 +217,72 @@ def split_commas(value: str) -> list[str]: ) +def _parse_individual_file( + config_file: str, stderr: TextIO | None = None +) -> tuple[MutableMapping[str, Any], dict[str, _INI_PARSER_CALLABLE], str] | None: + + if not os.path.exists(config_file): + return None + + parser: MutableMapping[str, Any] + try: + if is_toml(config_file): + with open(config_file, "rb") as f: + toml_data = tomllib.load(f) + # Filter down to just mypy relevant toml keys + toml_data = toml_data.get("tool", {}) + if "mypy" not in toml_data: + return None + toml_data = {"mypy": toml_data["mypy"]} + parser = destructure_overrides(toml_data) + config_types = toml_config_types + else: + parser = configparser.RawConfigParser() + parser.read(config_file) + config_types = ini_config_types + + except (tomllib.TOMLDecodeError, configparser.Error, ConfigTOMLValueError) as err: + print(f"{config_file}: {err}", file=stderr) + return None + + if os.path.basename(config_file) in defaults.SHARED_CONFIG_NAMES and "mypy" not in parser: + return None + + return parser, config_types, config_file + + +def _find_config_file( + stderr: TextIO | None = None, +) -> tuple[MutableMapping[str, Any], dict[str, _INI_PARSER_CALLABLE], str] | None: + + current_dir = os.path.abspath(os.getcwd()) + + while True: + for name in defaults.CONFIG_NAMES + defaults.SHARED_CONFIG_NAMES: + config_file = os.path.relpath(os.path.join(current_dir, name)) + ret = _parse_individual_file(config_file, stderr) + if ret is None: + continue + return ret + + if any( + os.path.exists(os.path.join(current_dir, cvs_root)) for cvs_root in (".git", ".hg") + ): + break + parent_dir = os.path.dirname(current_dir) + if parent_dir == current_dir: + break + current_dir = parent_dir + + for config_file in defaults.USER_CONFIG_FILES: + ret = _parse_individual_file(config_file, stderr) + if ret is None: + continue + return ret + + return None + + def parse_config_file( options: Options, set_strict_flags: Callable[[], None], @@ -233,47 +299,20 @@ def parse_config_file( stdout = stdout or sys.stdout stderr = stderr or sys.stderr - if filename is not None: - config_files: tuple[str, ...] = (filename,) - else: - config_files_iter: Iterable[str] = map(os.path.expanduser, defaults.CONFIG_FILES) - config_files = tuple(config_files_iter) - - config_parser = configparser.RawConfigParser() - - for config_file in config_files: - if not os.path.exists(config_file): - continue - try: - if is_toml(config_file): - with open(config_file, "rb") as f: - toml_data = tomllib.load(f) - # Filter down to just mypy relevant toml keys - toml_data = toml_data.get("tool", {}) - if "mypy" not in toml_data: - continue - toml_data = {"mypy": toml_data["mypy"]} - parser: MutableMapping[str, Any] = destructure_overrides(toml_data) - config_types = toml_config_types - else: - config_parser.read(config_file) - parser = config_parser - config_types = ini_config_types - except (tomllib.TOMLDecodeError, configparser.Error, ConfigTOMLValueError) as err: - print(f"{config_file}: {err}", file=stderr) - else: - if config_file in defaults.SHARED_CONFIG_FILES and "mypy" not in parser: - continue - file_read = config_file - options.config_file = file_read - break - else: + ret = ( + _parse_individual_file(filename, stderr) + if filename is not None + else _find_config_file(stderr) + ) + if ret is None: return + parser, config_types, file_read = ret - os.environ["MYPY_CONFIG_FILE_DIR"] = os.path.dirname(os.path.abspath(config_file)) + options.config_file = file_read + os.environ["MYPY_CONFIG_FILE_DIR"] = os.path.dirname(os.path.abspath(file_read)) if "mypy" not in parser: - if filename or file_read not in defaults.SHARED_CONFIG_FILES: + if filename or os.path.basename(file_read) not in defaults.SHARED_CONFIG_NAMES: print(f"{file_read}: No [mypy] section in config file", file=stderr) else: section = parser["mypy"] diff --git a/mypy/defaults.py b/mypy/defaults.py index ed0b8d0dc6d9..67628d544edf 100644 --- a/mypy/defaults.py +++ b/mypy/defaults.py @@ -12,50 +12,15 @@ # mypy, at least version PYTHON3_VERSION is needed. PYTHON3_VERSION_MIN: Final = (3, 8) # Keep in sync with typeshed's python support +CACHE_DIR: Final = ".mypy_cache" -def find_pyproject() -> str: - """Search for file pyproject.toml in the parent directories recursively. - - It resolves symlinks, so if there is any symlink up in the tree, it does not respect them - - If the file is not found until the root of FS or repository, PYPROJECT_FILE is used - """ - - def is_root(current_dir: str) -> bool: - parent = os.path.join(current_dir, os.path.pardir) - return os.path.samefile(current_dir, parent) or any( - os.path.isdir(os.path.join(current_dir, cvs_root)) for cvs_root in (".git", ".hg") - ) - - # Preserve the original behavior, returning PYPROJECT_FILE if exists - if os.path.isfile(PYPROJECT_FILE) or is_root(os.path.curdir): - return PYPROJECT_FILE - - # And iterate over the tree - current_dir = os.path.pardir - while not is_root(current_dir): - config_file = os.path.join(current_dir, PYPROJECT_FILE) - if os.path.isfile(config_file): - return config_file - parent = os.path.join(current_dir, os.path.pardir) - current_dir = parent - - return PYPROJECT_FILE - +CONFIG_NAMES: Final = ["mypy.ini", ".mypy.ini"] +SHARED_CONFIG_NAMES: Final = ["pyproject.toml", "setup.cfg"] -CACHE_DIR: Final = ".mypy_cache" -CONFIG_FILE: Final = ["mypy.ini", ".mypy.ini"] -PYPROJECT_FILE: Final = "pyproject.toml" -PYPROJECT_CONFIG_FILES: Final = [find_pyproject()] -SHARED_CONFIG_FILES: Final = ["setup.cfg"] USER_CONFIG_FILES: Final = ["~/.config/mypy/config", "~/.mypy.ini"] if os.environ.get("XDG_CONFIG_HOME"): USER_CONFIG_FILES.insert(0, os.path.join(os.environ["XDG_CONFIG_HOME"], "mypy/config")) -CONFIG_FILES: Final = ( - CONFIG_FILE + PYPROJECT_CONFIG_FILES + SHARED_CONFIG_FILES + USER_CONFIG_FILES -) - # This must include all reporters defined in mypy.report. This is defined here # to make reporter names available without importing mypy.report -- this speeds # up startup. diff --git a/mypy/main.py b/mypy/main.py index ae7a3b9d5c86..79147f8bf0bd 100644 --- a/mypy/main.py +++ b/mypy/main.py @@ -564,7 +564,7 @@ def add_invertible_flag( "--config-file", help=( f"Configuration file, must have a [mypy] section " - f"(defaults to {', '.join(defaults.CONFIG_FILES)})" + f"(defaults to {', '.join(defaults.CONFIG_NAMES + defaults.SHARED_CONFIG_NAMES)})" ), ) add_invertible_flag( diff --git a/mypy/semanal.py b/mypy/semanal.py index 034d8fb28b42..febb9590887e 100644 --- a/mypy/semanal.py +++ b/mypy/semanal.py @@ -4022,7 +4022,6 @@ def check_and_set_up_type_alias(self, s: AssignmentStmt) -> bool: and not res.args and not empty_tuple_index and not pep_695 - and not pep_613 ) if isinstance(res, ProperType) and isinstance(res, Instance): if not validate_instance(res, self.fail, empty_tuple_index): diff --git a/mypy/test/test_config_parser.py b/mypy/test/test_config_parser.py new file mode 100644 index 000000000000..597143738f23 --- /dev/null +++ b/mypy/test/test_config_parser.py @@ -0,0 +1,130 @@ +from __future__ import annotations + +import contextlib +import os +import tempfile +import unittest +from collections.abc import Iterator +from pathlib import Path + +from mypy.config_parser import _find_config_file +from mypy.defaults import CONFIG_NAMES, SHARED_CONFIG_NAMES + + +@contextlib.contextmanager +def chdir(target: Path) -> Iterator[None]: + # Replace with contextlib.chdir in Python 3.11 + dir = os.getcwd() + os.chdir(target) + try: + yield + finally: + os.chdir(dir) + + +def write_config(path: Path, content: str | None = None) -> None: + if path.suffix == ".toml": + if content is None: + content = "[tool.mypy]\nstrict = true" + path.write_text(content) + else: + if content is None: + content = "[mypy]\nstrict = True" + path.write_text(content) + + +class FindConfigFileSuite(unittest.TestCase): + + def test_no_config(self) -> None: + with tempfile.TemporaryDirectory() as _tmpdir: + tmpdir = Path(_tmpdir) + (tmpdir / ".git").touch() + with chdir(tmpdir): + result = _find_config_file() + assert result is None + + def test_parent_config_with_and_without_git(self) -> None: + for name in CONFIG_NAMES + SHARED_CONFIG_NAMES: + with tempfile.TemporaryDirectory() as _tmpdir: + tmpdir = Path(_tmpdir) + + config = tmpdir / name + write_config(config) + + child = tmpdir / "child" + child.mkdir() + + with chdir(child): + result = _find_config_file() + assert result is not None + assert Path(result[2]).resolve() == config.resolve() + + git = child / ".git" + git.touch() + + result = _find_config_file() + assert result is None + + git.unlink() + result = _find_config_file() + assert result is not None + hg = child / ".hg" + hg.touch() + + result = _find_config_file() + assert result is None + + def test_precedence(self) -> None: + with tempfile.TemporaryDirectory() as _tmpdir: + tmpdir = Path(_tmpdir) + + pyproject = tmpdir / "pyproject.toml" + setup_cfg = tmpdir / "setup.cfg" + mypy_ini = tmpdir / "mypy.ini" + dot_mypy = tmpdir / ".mypy.ini" + + child = tmpdir / "child" + child.mkdir() + + for cwd in [tmpdir, child]: + write_config(pyproject) + write_config(setup_cfg) + write_config(mypy_ini) + write_config(dot_mypy) + + with chdir(cwd): + result = _find_config_file() + assert result is not None + assert os.path.basename(result[2]) == "mypy.ini" + + mypy_ini.unlink() + result = _find_config_file() + assert result is not None + assert os.path.basename(result[2]) == ".mypy.ini" + + dot_mypy.unlink() + result = _find_config_file() + assert result is not None + assert os.path.basename(result[2]) == "pyproject.toml" + + pyproject.unlink() + result = _find_config_file() + assert result is not None + assert os.path.basename(result[2]) == "setup.cfg" + + def test_precedence_missing_section(self) -> None: + with tempfile.TemporaryDirectory() as _tmpdir: + tmpdir = Path(_tmpdir) + + child = tmpdir / "child" + child.mkdir() + + parent_mypy = tmpdir / "mypy.ini" + child_pyproject = child / "pyproject.toml" + write_config(parent_mypy) + write_config(child_pyproject, content="") + + with chdir(child): + result = _find_config_file() + assert result is not None + assert Path(result[2]).resolve() == parent_mypy.resolve() diff --git a/mypy/type_visitor.py b/mypy/type_visitor.py index f62d67bc26cc..d935b9a47a51 100644 --- a/mypy/type_visitor.py +++ b/mypy/type_visitor.py @@ -410,7 +410,7 @@ def visit_callable_type(self, t: CallableType, /) -> T: return self.query_types(t.arg_types + [t.ret_type]) def visit_tuple_type(self, t: TupleType, /) -> T: - return self.query_types(t.items) + return self.query_types([t.partial_fallback] + t.items) def visit_typeddict_type(self, t: TypedDictType, /) -> T: return self.query_types(t.items.values()) @@ -550,7 +550,7 @@ def visit_callable_type(self, t: CallableType, /) -> bool: return args and ret def visit_tuple_type(self, t: TupleType, /) -> bool: - return self.query_types(t.items) + return self.query_types([t.partial_fallback] + t.items) def visit_typeddict_type(self, t: TypedDictType, /) -> bool: return self.query_types(list(t.items.values())) diff --git a/mypy/version.py b/mypy/version.py index 8ad0efd03cdb..8e5cf5a0aace 100644 --- a/mypy/version.py +++ b/mypy/version.py @@ -8,7 +8,7 @@ # - Release versions have the form "1.2.3". # - Dev versions have the form "1.2.3+dev" (PLUS sign to conform to PEP 440). # - Before 1.0 we had the form "0.NNN". -__version__ = "1.15.0+dev" +__version__ = "1.15.0" base_version = __version__ mypy_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) diff --git a/test-data/unit/check-incremental.test b/test-data/unit/check-incremental.test index 77170280ecae..5a9f5d3b3174 100644 --- a/test-data/unit/check-incremental.test +++ b/test-data/unit/check-incremental.test @@ -6745,3 +6745,22 @@ from typing_extensions import TypeAlias IntOrStr: TypeAlias = int | str assert isinstance(1, IntOrStr) [builtins fixtures/type.pyi] + +[case testSerializeDeferredGenericNamedTuple] +import pkg +[file pkg/__init__.py] +from .lib import NT +[file pkg/lib.py] +from typing import Generic, NamedTuple, TypeVar +from pkg import does_not_exist # type: ignore +from pkg.missing import also_missing # type: ignore + +T = TypeVar("T", bound=does_not_exist) +class NT(NamedTuple, Generic[T]): + values: also_missing[T] +[file pkg/__init__.py.2] +# touch +from .lib import NT +[builtins fixtures/tuple.pyi] +[out] +[out2] diff --git a/test-data/unit/check-inference.test b/test-data/unit/check-inference.test index 0da1c092efe8..bdd0ac305904 100644 --- a/test-data/unit/check-inference.test +++ b/test-data/unit/check-inference.test @@ -3886,3 +3886,11 @@ def a4(x: List[str], y: List[Never]) -> None: reveal_type(z2) # N: Revealed type is "builtins.list[builtins.object]" z1[1].append("asdf") # E: "object" has no attribute "append" [builtins fixtures/dict.pyi] + +[case testTupleJoinFallbackInference] +foo = [ + (1, ("a", "b")), + (2, []), +] +reveal_type(foo) # N: Revealed type is "builtins.list[Tuple[builtins.int, typing.Sequence[builtins.str]]]" +[builtins fixtures/tuple.pyi] diff --git a/test-data/unit/check-literal.test b/test-data/unit/check-literal.test index 296956334d20..246ce455c576 100644 --- a/test-data/unit/check-literal.test +++ b/test-data/unit/check-literal.test @@ -2984,7 +2984,7 @@ class C(Base): sep = "a" if int() else "b" reveal_type(sep) # N: Revealed type is "Union[Literal['a'], Literal['b']]" return super().feed_data(sep) -[builtins fixtures/tuple.pyi] +[builtins fixtures/primitives.pyi] [case testLiteralInsideAType] from typing_extensions import Literal diff --git a/test-data/unit/check-type-aliases.test b/test-data/unit/check-type-aliases.test index f04bd777ee4e..9527c85ed26a 100644 --- a/test-data/unit/check-type-aliases.test +++ b/test-data/unit/check-type-aliases.test @@ -1243,31 +1243,22 @@ A = Union[int, List[A]] def func(x: A) -> int: ... [builtins fixtures/tuple.pyi] -[case testAliasExplicitNoArgsBasic] -from typing import Any, List, assert_type +[case testAliasNonGeneric] from typing_extensions import TypeAlias +class Foo: ... -Implicit = List -Explicit: TypeAlias = List +ImplicitFoo = Foo +ExplicitFoo: TypeAlias = Foo -x1: Implicit[str] -x2: Explicit[str] # E: Bad number of arguments for type alias, expected 0, given 1 -assert_type(x1, List[str]) -assert_type(x2, List[Any]) -[builtins fixtures/tuple.pyi] - -[case testAliasExplicitNoArgsGenericClass] -# flags: --python-version 3.9 -from typing import Any, assert_type -from typing_extensions import TypeAlias +x1: ImplicitFoo[str] # E: "Foo" expects no type arguments, but 1 given +x2: ExplicitFoo[str] # E: "Foo" expects no type arguments, but 1 given -Implicit = list -Explicit: TypeAlias = list +def is_foo(x: object): + if isinstance(x, ImplicitFoo): + pass + if isinstance(x, ExplicitFoo): + pass -x1: Implicit[str] -x2: Explicit[str] # E: Bad number of arguments for type alias, expected 0, given 1 -assert_type(x1, list[str]) -assert_type(x2, list[Any]) [builtins fixtures/tuple.pyi] [case testAliasExplicitNoArgsTuple] diff --git a/test-data/unit/cmdline.pyproject.test b/test-data/unit/cmdline.pyproject.test index e6e5f113a844..57e6facad032 100644 --- a/test-data/unit/cmdline.pyproject.test +++ b/test-data/unit/cmdline.pyproject.test @@ -133,38 +133,3 @@ Neither is this! description = "Factory ⸻ A code generator 🏭" \[tool.mypy] [file x.py] - -[case testSearchRecursively] -# cmd: mypy x.py -[file ../pyproject.toml] -\[tool.mypy] -\[tool.mypy.overrides] -module = "x" -disallow_untyped_defs = false -[file x.py] -pass -[out] -../pyproject.toml: tool.mypy.overrides sections must be an array. Please make sure you are using double brackets like so: [[tool.mypy.overrides]] -== Return code: 0 - -[case testSearchRecursivelyStopsGit] -# cmd: mypy x.py -[file .git/test] -[file ../pyproject.toml] -\[tool.mypy] -\[tool.mypy.overrides] -module = "x" -disallow_untyped_defs = false -[file x.py] -i: int = 0 - -[case testSearchRecursivelyStopsHg] -# cmd: mypy x.py -[file .hg/test] -[file ../pyproject.toml] -\[tool.mypy] -\[tool.mypy.overrides] -module = "x" -disallow_untyped_defs = false -[file x.py] -i: int = 0 diff --git a/test-data/unit/diff.test b/test-data/unit/diff.test index b7c71c7f37f2..4acf451e2c34 100644 --- a/test-data/unit/diff.test +++ b/test-data/unit/diff.test @@ -1563,6 +1563,7 @@ type H[T] = int __main__.A __main__.C __main__.D +__main__.E __main__.G __main__.H diff --git a/test-data/unit/fixtures/primitives.pyi b/test-data/unit/fixtures/primitives.pyi index fc220a4e2ee0..2f8623c79b9f 100644 --- a/test-data/unit/fixtures/primitives.pyi +++ b/test-data/unit/fixtures/primitives.pyi @@ -19,6 +19,7 @@ class int: def __init__(self, x: object = ..., base: int = ...) -> None: pass def __add__(self, i: int) -> int: pass def __rmul__(self, x: int) -> int: pass + def __bool__(self) -> bool: pass class float: def __float__(self) -> float: pass def __add__(self, x: float) -> float: pass diff --git a/test-data/unit/fixtures/tuple.pyi b/test-data/unit/fixtures/tuple.pyi index 3b62d7fc1513..d01cd0034d26 100644 --- a/test-data/unit/fixtures/tuple.pyi +++ b/test-data/unit/fixtures/tuple.pyi @@ -1,13 +1,14 @@ # Builtins stub used in tuple-related test cases. import _typeshed -from typing import Iterable, Iterator, TypeVar, Generic, Sequence, Optional, overload, Tuple, Type +from typing import Iterable, Iterator, TypeVar, Generic, Sequence, Optional, overload, Tuple, Type, Self _T = TypeVar("_T") _Tco = TypeVar('_Tco', covariant=True) class object: def __init__(self) -> None: pass + def __new__(cls) -> Self: ... class type: def __init__(self, *a: object) -> None: pass