Revert "Apply new ruff/pyupgrade rule UP032 (#617)" · pypa/wheel@1e00742 (original) (raw)

`@@ -238,7 +238,9 @@ def cpython_tags(

`

238

238

`if use_abi3:

`

239

239

`for minor_version in range(python_version[1] - 1, 1, -1):

`

240

240

`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

`+

)

`

242

244

`yield Tag(interpreter, "abi3", platform_)

`

243

245

``

244

246

``

`@@ -440,7 +442,9 @@ def mac_platforms(

`

440

442

`compat_version = 10, minor_version

`

441

443

`binary_formats = _mac_binary_formats(compat_version, arch)

`

442

444

`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

`+

)

`

444

448

``

445

449

`if version >= (11, 0):

`

446

450

`# Starting with Mac OS 11, each yearly release bumps the major version

`

`@@ -449,7 +453,9 @@ def mac_platforms(

`

449

453

`compat_version = major_version, 0

`

450

454

`binary_formats = _mac_binary_formats(compat_version, arch)

`

451

455

`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

`+

)

`

453

459

``

454

460

`if version >= (11, 0):

`

455

461

`# Mac OS 11 on x86_64 is compatible with binaries from previous releases.

`

`@@ -464,12 +470,20 @@ def mac_platforms(

`

464

470

`compat_version = 10, minor_version

`

465

471

`binary_formats = _mac_binary_formats(compat_version, arch)

`

466

472

`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

`+

)

`

468

478

`else:

`

469

479

`for minor_version in range(16, 3, -1):

`

470

480

`compat_version = 10, minor_version

`

471

481

`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

`+

)

`

473

487

``

474

488

``

475

489

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

`