From 7e0200c8ea3e9adce6273147f83c996f6092caa6 Mon Sep 17 00:00:00 2001 From: danieleades <33452915+danieleades@users.noreply.github.com> Date: Fri, 28 Jan 2022 19:27:11 +0000 Subject: [PATCH] de-glob mypy whitelist (#272) --- pyproject.toml | 17 +++++++++++++---- src/poetry/core/semver/empty_constraint.py | 11 +++++------ src/poetry/core/version/markers.py | 10 +++++----- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5f2794825..fea5d16c3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -96,14 +96,23 @@ ignore_missing_imports = true [[tool.mypy.overrides]] module = [ # src modules - 'poetry.core.masonry.builders.*', + 'poetry.core.masonry.builders.builder', + 'poetry.core.masonry.builders.sdist', + 'poetry.core.masonry.builders.wheel', 'poetry.core.packages.utils.utils', 'poetry.core.packages.dependency', 'poetry.core.packages.package', 'poetry.core.packages.project_package', - 'poetry.core.semver.*', - 'poetry.core.toml.*', - 'poetry.core.version.*', + 'poetry.core.semver.helpers', + 'poetry.core.semver.version', + 'poetry.core.semver.version_range', + 'poetry.core.semver.version_union', + 'poetry.core.toml.exceptions', + 'poetry.core.toml.file', + 'poetry.core.version.markers', + 'poetry.core.version.pep440.parser', + 'poetry.core.version.pep440.segments', + 'poetry.core.version.pep440.version', # test modules 'tests.conftest', 'tests.integration.test_pep517', diff --git a/src/poetry/core/semver/empty_constraint.py b/src/poetry/core/semver/empty_constraint.py index ebf1e8b5c..ba5083481 100644 --- a/src/poetry/core/semver/empty_constraint.py +++ b/src/poetry/core/semver/empty_constraint.py @@ -4,7 +4,6 @@ if TYPE_CHECKING: - from poetry.core.semver import VersionTypes from poetry.core.semver.version import Version @@ -18,19 +17,19 @@ def is_any(self) -> bool: def allows(self, version: "Version") -> bool: return False - def allows_all(self, other: "VersionTypes") -> bool: + def allows_all(self, other: VersionConstraint) -> bool: return other.is_empty() - def allows_any(self, other: "VersionTypes") -> bool: + def allows_any(self, other: VersionConstraint) -> bool: return False - def intersect(self, other: "VersionTypes") -> "EmptyConstraint": + def intersect(self, other: VersionConstraint) -> "EmptyConstraint": return self - def union(self, other: "VersionTypes") -> "VersionTypes": + def union(self, other: VersionConstraint) -> VersionConstraint: return other - def difference(self, other: "VersionTypes") -> "EmptyConstraint": + def difference(self, other: VersionConstraint) -> "EmptyConstraint": return self def __str__(self) -> str: diff --git a/src/poetry/core/version/markers.py b/src/poetry/core/version/markers.py index a4afa4d76..7b2e98627 100644 --- a/src/poetry/core/version/markers.py +++ b/src/poetry/core/version/markers.py @@ -123,7 +123,7 @@ def __repr__(self) -> str: def __hash__(self) -> int: return hash(("", "")) - def __eq__(self, other: MarkerTypes) -> bool: + def __eq__(self, other: object) -> bool: if not isinstance(other, BaseMarker): return NotImplemented @@ -167,7 +167,7 @@ def __repr__(self) -> str: def __hash__(self) -> int: return hash(("", "")) - def __eq__(self, other: MarkerTypes) -> bool: + def __eq__(self, other: object) -> bool: if not isinstance(other, BaseMarker): return NotImplemented @@ -362,7 +362,7 @@ def invert(self) -> MarkerTypes: return parse_marker(f"{self._name} {operator} '{self._value}'") - def __eq__(self, other: MarkerTypes) -> bool: + def __eq__(self, other: object) -> bool: if not isinstance(other, SingleMarker): return False @@ -516,7 +516,7 @@ def invert(self) -> MarkerTypes: return MarkerUnion.of(*markers) - def __eq__(self, other: MarkerTypes) -> bool: + def __eq__(self, other: object) -> bool: if not isinstance(other, MultiMarker): return False @@ -674,7 +674,7 @@ def invert(self) -> MarkerTypes: return MultiMarker.of(*markers) - def __eq__(self, other: MarkerTypes) -> bool: + def __eq__(self, other: object) -> bool: if not isinstance(other, MarkerUnion): return False