Skip to content

Commit 16206e6

Browse files
Apply new ruff/pyupgrade rule UP032 (#617)
UP032 Use f-string instead of `format` call
1 parent 0b7771e commit 16206e6

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
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 = "{0.major}.{0.minor}.{0.micro}".format(info)
169+
version = f"{info.major}.{info.minor}.{info.micro}"
170170
kind = info.releaselevel
171171
if kind != "final":
172172
version += kind[0] + str(info.serial)

src/wheel/vendored/packaging/tags.py

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,7 @@ 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 = "cp{version}".format(
242-
version=_version_nodot((python_version[0], minor_version))
243-
)
241+
interpreter = f"cp{_version_nodot((python_version[0], minor_version))}"
244242
yield Tag(interpreter, "abi3", platform_)
245243

246244

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

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

460454
if version >= (11, 0):
461455
# Mac OS 11 on x86_64 is compatible with binaries from previous releases.
@@ -470,20 +464,12 @@ def mac_platforms(
470464
compat_version = 10, minor_version
471465
binary_formats = _mac_binary_formats(compat_version, arch)
472466
for binary_format in binary_formats:
473-
yield "macosx_{major}_{minor}_{binary_format}".format(
474-
major=compat_version[0],
475-
minor=compat_version[1],
476-
binary_format=binary_format,
477-
)
467+
yield f"macosx_{compat_version[0]}_{compat_version[1]}_{binary_format}"
478468
else:
479469
for minor_version in range(16, 3, -1):
480470
compat_version = 10, minor_version
481471
binary_format = "universal2"
482-
yield "macosx_{major}_{minor}_{binary_format}".format(
483-
major=compat_version[0],
484-
minor=compat_version[1],
485-
binary_format=binary_format,
486-
)
472+
yield f"macosx_{compat_version[0]}_{compat_version[1]}_{binary_format}"
487473

488474

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

0 commit comments

Comments
 (0)