Skip to content

BUG: also handle macOS 10.X versions correctly #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2022
Merged

BUG: also handle macOS 10.X versions correctly #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions mesonpy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,11 @@ def platform_tag(self) -> str:
# latter specifies the target macOS version Python was built
# against.
parts[1] = platform.mac_ver()[0]
# Only pick up the major version
# https://github.com/FFY00/meson-python/issues/160
parts[1] = parts[1].split('.')[0]
if parts[1] >= '11':
# Only pick up the major version, which changed from 10.X
# to X.0 from macOS 11 onwards. See
# https://github.com/FFY00/meson-python/issues/160
parts[1] = parts[1].split('.')[0]

if parts[1] in ('11', '12'):
# Workaround for bug where pypa/packaging does not consider macOS
Expand Down
4 changes: 3 additions & 1 deletion tests/test_wheel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@
platform_ = sysconfig.get_platform()
if platform.system() == 'Darwin':
parts = platform_.split('-')
parts[1] = platform.mac_ver()[0].split('.')[0]
parts[1] = platform.mac_ver()[0]
if parts[1] >= '11':
parts[1] = parts[1].split('.')[0]
if parts[1] in ('11', '12'):
parts[1] += '.0'
platform_ = '-'.join(parts)
Expand Down