From 753cd43f75e69ad006a88c416ae9ad913ae0fdb9 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Sat, 11 May 2024 13:51:47 +0200 Subject: [PATCH 1/4] Apply ruff rull RUF022 RUF022 `__all__` is not sorted --- src/packaging/markers.py | 2 +- src/packaging/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/packaging/markers.py b/src/packaging/markers.py index 7ac7bb69..4c959e71 100644 --- a/src/packaging/markers.py +++ b/src/packaging/markers.py @@ -18,9 +18,9 @@ __all__ = [ "InvalidMarker", + "Marker", "UndefinedComparison", "UndefinedEnvironmentName", - "Marker", "default_environment", ] diff --git a/src/packaging/version.py b/src/packaging/version.py index 46bc2613..c328343c 100644 --- a/src/packaging/version.py +++ b/src/packaging/version.py @@ -15,7 +15,7 @@ from ._structures import Infinity, InfinityType, NegativeInfinity, NegativeInfinityType -__all__ = ["VERSION_PATTERN", "parse", "Version", "InvalidVersion"] +__all__ = ["VERSION_PATTERN", "InvalidVersion", "Version", "parse"] LocalType = Tuple[Union[int, str], ...] From fc67eb92cb9c111a493c464904d367172ad1b218 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Sat, 11 May 2024 13:53:24 +0200 Subject: [PATCH 2/4] Apply ruff rule RUF023 RUF023 `Tag.__slots__` is not sorted --- src/packaging/tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packaging/tags.py b/src/packaging/tags.py index 6667d299..c21b5b69 100644 --- a/src/packaging/tags.py +++ b/src/packaging/tags.py @@ -47,7 +47,7 @@ class Tag: is also supported. """ - __slots__ = ["_interpreter", "_abi", "_platform", "_hash"] + __slots__ = ["_abi", "_hash", "_interpreter", "_platform"] def __init__(self, interpreter: str, abi: str, platform: str) -> None: self._interpreter = interpreter.lower() From 53c77275fa909906a376603d57d878f54763e3cf Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Sat, 11 May 2024 13:57:41 +0200 Subject: [PATCH 3/4] Apply ruff rule RUF027 RUF027 Possible f-string without an `f` prefix --- src/packaging/metadata.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/packaging/metadata.py b/src/packaging/metadata.py index eb8dc844..697afe49 100644 --- a/src/packaging/metadata.py +++ b/src/packaging/metadata.py @@ -688,8 +688,8 @@ def from_raw(cls, data: RawMetadata, *, validate: bool = True) -> Metadata: field = _RAW_TO_EMAIL_MAPPING[key] exc = InvalidMetadata( field, - "{field} introduced in metadata version " - "{field_metadata_version}, not {metadata_version}", + f"{field} introduced in metadata version " + f"{field_metadata_version}, not {metadata_version}", ) exceptions.append(exc) continue From a7e49baee9955f2ca33e46bc19087fe3eb9e811d Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Sat, 11 May 2024 14:01:32 +0200 Subject: [PATCH 4/4] Enable ruff rules (RUF) --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4f6aca04..fed706aa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -70,6 +70,7 @@ extend-select = [ "I", "N", "UP", + "RUF", "W" ] ignore = [ @@ -80,8 +81,10 @@ ignore = [ "B028", "B904", "N818", - "UP032", + "RUF003", + "RUF012", "UP030", + "UP032", # https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules "W191", "E111",