From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 19 Dec 2023 18:51:17 +0000 (+0100)
Subject: [3.12] gh-102362: Fix macOS version number in result of sysconfig.get_platform()... 
X-Git-Tag: v3.12.2~289
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce49a9f60e185e80717c0393b948e12774bfd2a6;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-102362: Fix macOS version number in result of sysconfig.get_platform() (GH-112942) (#113264)

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.
(cherry picked from commit 893c9ccf48eacb02fa6ae93632f2d0cb6778dbb6)

Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com>
---

diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py
index aa66c8b9f418..0cb064fcd791 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 000000000000..55c5ac014346
--- /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.