diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2023-12-18 23:51:58 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-18 23:51:58 (GMT) |
| commit | 893c9ccf48eacb02fa6ae93632f2d0cb6778dbb6 (patch) | |
| tree | c8d5d8692de08520ee0a87a84a15a673142f5ab9 | |
| parent | 4cfce3a4da7ca9513e7f2c8ec94d50f8bddfa41b (diff) | |
| download | cpython-893c9ccf48eacb02fa6ae93632f2d0cb6778dbb6.zip cpython-893c9ccf48eacb02fa6ae93632f2d0cb6778dbb6.tar.gz cpython-893c9ccf48eacb02fa6ae93632f2d0cb6778dbb6.tar.bz2 | |
gh-102362: Fix macOS version number in result of sysconfig.get_platform() (GH-112942)
Change _osx_support.get_platform_osx() to make sure that the
version number in the result includes at least a major and
minor version (e.g. 14.2) even if MACOSX_DEPLOYMENT_TARGET is
set to just a major version (e.g. 14).
This matches the versions expected by pip when selecting
appropriate wheels for installation.
| -rw-r--r-- | Lib/_osx_support.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/macOS/2023-12-10-20-30-06.gh-issue-102362.y8svbF.rst | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py index aa66c8b..0cb064f 100644 --- a/Lib/_osx_support.py +++ b/Lib/_osx_support.py @@ -507,6 +507,11 @@ def get_platform_osx(_config_vars, osname, release, machine): # MACOSX_DEPLOYMENT_TARGET. macver = _config_vars.get('MACOSX_DEPLOYMENT_TARGET', '') + if macver and '.' not in macver: + # Ensure that the version includes at least a major + # and minor version, even if MACOSX_DEPLOYMENT_TARGET + # is set to a single-label version like "14". + macver += '.0' macrelease = _get_system_version() or macver macver = macver or macrelease diff --git a/Misc/NEWS.d/next/macOS/2023-12-10-20-30-06.gh-issue-102362.y8svbF.rst b/Misc/NEWS.d/next/macOS/2023-12-10-20-30-06.gh-issue-102362.y8svbF.rst new file mode 100644 index 0000000..55c5ac0 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2023-12-10-20-30-06.gh-issue-102362.y8svbF.rst @@ -0,0 +1,3 @@ +Make sure the result of :func:`sysconfig.get_plaform` includes at least a +major and minor versions, even if ``MACOSX_DEPLOYMENT_TARGET`` is set to +only a major version during build to match the format expected by pip. |