Skip to content

Commit 1e00742

Browse files
committed
Revert "Apply new ruff/pyupgrade rule UP032 (#617)"
This reverts commit 16206e6.
1 parent 16206e6 commit 1e00742

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

src/wheel/vendored/packaging/markers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ def _evaluate_markers(markers: MarkerList, environment: Dict[str, str]) -> bool:
166166

167167

168168
def format_full_version(info: "sys._version_info") -> str:
169-
version = f"{info.major}.{info.minor}.{info.micro}"
169+
version = "{0.major}.{0.minor}.{0.micro}".format(info)
170170
kind = info.releaselevel
171171
if kind != "final":
172172
version += kind[0] + str(info.serial)

src/wheel/vendored/packaging/tags.py

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,9 @@ def cpython_tags(
238238
if use_abi3:
239239
for minor_version in range(python_version[1] - 1, 1, -1):
240240
for platform_ in platforms:
241-
interpreter = f"cp{_version_nodot((python_version[0], minor_version))}"
241+
interpreter = "cp{version}".format(
242+
version=_version_nodot((python_version[0], minor_version))
243+
)
242244
yield Tag(interpreter, "abi3", platform_)
243245

244246

@@ -440,7 +442,9 @@ def mac_platforms(
440442
compat_version = 10, minor_version
441443
binary_formats = _mac_binary_formats(compat_version, arch)
442444
for binary_format in binary_formats:
443-
yield f"macosx_10_{minor_version}_{binary_format}"
445+
yield "macosx_{major}_{minor}_{binary_format}".format(
446+
major=10, minor=minor_version, binary_format=binary_format
447+
)
444448

445449
if version >= (11, 0):
446450
# Starting with Mac OS 11, each yearly release bumps the major version
@@ -449,7 +453,9 @@ def mac_platforms(
449453
compat_version = major_version, 0
450454
binary_formats = _mac_binary_formats(compat_version, arch)
451455
for binary_format in binary_formats:
452-
yield f"macosx_{major_version}_0_{binary_format}"
456+
yield "macosx_{major}_{minor}_{binary_format}".format(
457+
major=major_version, minor=0, binary_format=binary_format
458+
)
453459

454460
if version >= (11, 0):
455461
# Mac OS 11 on x86_64 is compatible with binaries from previous releases.
@@ -464,12 +470,20 @@ def mac_platforms(
464470
compat_version = 10, minor_version
465471
binary_formats = _mac_binary_formats(compat_version, arch)
466472
for binary_format in binary_formats:
467-
yield f"macosx_{compat_version[0]}_{compat_version[1]}_{binary_format}"
473+
yield "macosx_{major}_{minor}_{binary_format}".format(
474+
major=compat_version[0],
475+
minor=compat_version[1],
476+
binary_format=binary_format,
477+
)
468478
else:
469479
for minor_version in range(16, 3, -1):
470480
compat_version = 10, minor_version
471481
binary_format = "universal2"
472-
yield f"macosx_{compat_version[0]}_{compat_version[1]}_{binary_format}"
482+
yield "macosx_{major}_{minor}_{binary_format}".format(
483+
major=compat_version[0],
484+
minor=compat_version[1],
485+
binary_format=binary_format,
486+
)
473487

474488

475489
def _linux_platforms(is_32bit: bool = _32_BIT_INTERPRETER) -> Iterator[str]:

0 commit comments

Comments
 (0)