diff options
| author | Alex Grönholm <alex.gronholm@nextday.fi> | 2021-02-08 23:20:45 +0200 |
|---|---|---|
| committer | Alex Grönholm <alex.gronholm@nextday.fi> | 2021-02-08 23:20:45 +0200 |
| commit | a6fa4839ba1c74a37cb43eefb959c0766594ec63 (patch) | |
| tree | e8b71e50a898b0a0bf8eb0fd930ba725ea93f769 /src | |
| parent | 52ec92055abc0bc1416331371ddf64abb3cfd06d (diff) | |
| download | wheel-git-a6fa4839ba1c74a37cb43eefb959c0766594ec63.tar.gz | |
Updated vendored packaging to v20.9
Diffstat (limited to 'src')
| -rw-r--r-- | src/wheel/vendored/packaging/tags.py | 24 | ||||
| -rw-r--r-- | src/wheel/vendored/vendor.txt | 2 |
2 files changed, 20 insertions, 6 deletions
diff --git a/src/wheel/vendored/packaging/tags.py b/src/wheel/vendored/packaging/tags.py index 3306c69..c2a140c 100644 --- a/src/wheel/vendored/packaging/tags.py +++ b/src/wheel/vendored/packaging/tags.py @@ -458,14 +458,28 @@ def mac_platforms(version=None, arch=None): major=major_version, minor=0, binary_format=binary_format ) - if version >= (11, 0) and arch == "x86_64": + if version >= (11, 0): # Mac OS 11 on x86_64 is compatible with binaries from previous releases. # Arm64 support was introduced in 11.0, so no Arm binaries from previous # releases exist. - for minor_version in range(16, 3, -1): - compat_version = 10, minor_version - binary_formats = _mac_binary_formats(compat_version, arch) - for binary_format in binary_formats: + # + # However, the "universal2" binary format can have a + # macOS version earlier than 11.0 when the x86_64 part of the binary supports + # that version of macOS. + if arch == "x86_64": + for minor_version in range(16, 3, -1): + compat_version = 10, minor_version + binary_formats = _mac_binary_formats(compat_version, arch) + for binary_format in binary_formats: + 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 "macosx_{major}_{minor}_{binary_format}".format( major=compat_version[0], minor=compat_version[1], diff --git a/src/wheel/vendored/vendor.txt b/src/wheel/vendored/vendor.txt index 99f5122..57233e1 100644 --- a/src/wheel/vendored/vendor.txt +++ b/src/wheel/vendored/vendor.txt @@ -1 +1 @@ -packaging==20.8 +packaging==20.9 |