From 1e00742acc9fb33f6e71460c3844c2b66532af7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= Date: Fri, 10 May 2024 00:11:03 +0300 Subject: [PATCH] Revert "Apply new ruff/pyupgrade rule UP032 (#617)" This reverts commit 16206e67f161135cf964eb069296dcee994e4db3. --- src/wheel/vendored/packaging/markers.py | 2 +- src/wheel/vendored/packaging/tags.py | 24 +++++++++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/wheel/vendored/packaging/markers.py b/src/wheel/vendored/packaging/markers.py index 603f9218..c96d22a5 100644 --- a/src/wheel/vendored/packaging/markers.py +++ b/src/wheel/vendored/packaging/markers.py @@ -166,7 +166,7 @@ def _evaluate_markers(markers: MarkerList, environment: Dict[str, str]) -> bool: def format_full_version(info: "sys._version_info") -> str: - version = f"{info.major}.{info.minor}.{info.micro}" + version = "{0.major}.{0.minor}.{0.micro}".format(info) kind = info.releaselevel if kind != "final": version += kind[0] + str(info.serial) diff --git a/src/wheel/vendored/packaging/tags.py b/src/wheel/vendored/packaging/tags.py index 6314ca20..89f19261 100644 --- a/src/wheel/vendored/packaging/tags.py +++ b/src/wheel/vendored/packaging/tags.py @@ -238,7 +238,9 @@ def cpython_tags( if use_abi3: for minor_version in range(python_version[1] - 1, 1, -1): for platform_ in platforms: - interpreter = f"cp{_version_nodot((python_version[0], minor_version))}" + interpreter = "cp{version}".format( + version=_version_nodot((python_version[0], minor_version)) + ) yield Tag(interpreter, "abi3", platform_) @@ -440,7 +442,9 @@ def mac_platforms( compat_version = 10, minor_version binary_formats = _mac_binary_formats(compat_version, arch) for binary_format in binary_formats: - yield f"macosx_10_{minor_version}_{binary_format}" + yield "macosx_{major}_{minor}_{binary_format}".format( + major=10, minor=minor_version, binary_format=binary_format + ) if version >= (11, 0): # Starting with Mac OS 11, each yearly release bumps the major version @@ -449,7 +453,9 @@ def mac_platforms( compat_version = major_version, 0 binary_formats = _mac_binary_formats(compat_version, arch) for binary_format in binary_formats: - yield f"macosx_{major_version}_0_{binary_format}" + yield "macosx_{major}_{minor}_{binary_format}".format( + major=major_version, minor=0, binary_format=binary_format + ) if version >= (11, 0): # Mac OS 11 on x86_64 is compatible with binaries from previous releases. @@ -464,12 +470,20 @@ def mac_platforms( compat_version = 10, minor_version binary_formats = _mac_binary_formats(compat_version, arch) for binary_format in binary_formats: - yield f"macosx_{compat_version[0]}_{compat_version[1]}_{binary_format}" + yield "macosx_{major}_{minor}_{binary_format}".format( + major=compat_version[0], + minor=compat_version[1], + binary_format=binary_format, + ) else: for minor_version in range(16, 3, -1): compat_version = 10, minor_version binary_format = "universal2" - yield f"macosx_{compat_version[0]}_{compat_version[1]}_{binary_format}" + yield "macosx_{major}_{minor}_{binary_format}".format( + major=compat_version[0], + minor=compat_version[1], + binary_format=binary_format, + ) def _linux_platforms(is_32bit: bool = _32_BIT_INTERPRETER) -> Iterator[str]: