From 68a31d38b0932dfa248ef2523a9874316c2f7a2d Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 21 Feb 2025 08:44:48 +0800 Subject: [PATCH 1/4] Document the wheels tags corresponding to each universal SDK. --- Doc/using/configure.rst | 16 ++++++++-------- ...025-02-21-08-44-31.gh-issue-129712.4AcfWQ.rst | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 Misc/NEWS.d/next/Documentation/2025-02-21-08-44-31.gh-issue-129712.4AcfWQ.rst diff --git a/Doc/using/configure.rst b/Doc/using/configure.rst index 72912cea2f0c28..adf1002e84a2b3 100644 --- a/Doc/using/configure.rst +++ b/Doc/using/configure.rst @@ -978,14 +978,14 @@ See :source:`Mac/README.rst`. Options: - * ``universal2``; - * ``32-bit``; - * ``64-bit``; - * ``3-way``; - * ``intel``; - * ``intel-32``; - * ``intel-64``; - * ``all``. + * ``universal2`` (supports x86-64 and arm64; supports ``universal2`` wheels); + * ``32-bit`` (supports PPC and i386; supports ``fat`` wheels); + * ``64-bit`` (supports PPC64 and x86-64; supports ``fat64`` wheels); + * ``3-way`` (supports i386, PPC and x86-64; supports ``fat3`` wheels); + * ``intel`` (supports i386 and x86-64; supports ``intel`` wheels); + * ``intel-32`` (supports i386; supports ``i386`` wheels); + * ``intel-64`` (supports x86-64; supports ``x86-64`` wheels); + * ``all`` (supports PPC, i386, PPC64 and x86-64; supports ``universal`` wheels). .. option:: --with-framework-name=FRAMEWORK diff --git a/Misc/NEWS.d/next/Documentation/2025-02-21-08-44-31.gh-issue-129712.4AcfWQ.rst b/Misc/NEWS.d/next/Documentation/2025-02-21-08-44-31.gh-issue-129712.4AcfWQ.rst new file mode 100644 index 00000000000000..82ad17c199a65e --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2025-02-21-08-44-31.gh-issue-129712.4AcfWQ.rst @@ -0,0 +1,2 @@ +The wheel tags supported by each macOS universal SDK option are now +documented. From ec6c886dcaa052aa380d27e55935e9ceeb4512f8 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 21 Feb 2025 08:56:44 +0800 Subject: [PATCH 2/4] Correct -/_ discrepancy in x86_64 wheel tag. --- Doc/using/configure.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/using/configure.rst b/Doc/using/configure.rst index adf1002e84a2b3..e9ab47aecf99ff 100644 --- a/Doc/using/configure.rst +++ b/Doc/using/configure.rst @@ -984,7 +984,7 @@ See :source:`Mac/README.rst`. * ``3-way`` (supports i386, PPC and x86-64; supports ``fat3`` wheels); * ``intel`` (supports i386 and x86-64; supports ``intel`` wheels); * ``intel-32`` (supports i386; supports ``i386`` wheels); - * ``intel-64`` (supports x86-64; supports ``x86-64`` wheels); + * ``intel-64`` (supports x86-64; supports ``x86_64`` wheels); * ``all`` (supports PPC, i386, PPC64 and x86-64; supports ``universal`` wheels). .. option:: --with-framework-name=FRAMEWORK From 07d5d1e57b1e5afb1a08d0c311241a68ed707583 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 21 Feb 2025 08:57:48 +0800 Subject: [PATCH 3/4] Removed a duplicate word in descriptions. --- Doc/using/configure.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Doc/using/configure.rst b/Doc/using/configure.rst index e9ab47aecf99ff..4f8ce24a19082d 100644 --- a/Doc/using/configure.rst +++ b/Doc/using/configure.rst @@ -978,14 +978,14 @@ See :source:`Mac/README.rst`. Options: - * ``universal2`` (supports x86-64 and arm64; supports ``universal2`` wheels); - * ``32-bit`` (supports PPC and i386; supports ``fat`` wheels); - * ``64-bit`` (supports PPC64 and x86-64; supports ``fat64`` wheels); - * ``3-way`` (supports i386, PPC and x86-64; supports ``fat3`` wheels); - * ``intel`` (supports i386 and x86-64; supports ``intel`` wheels); - * ``intel-32`` (supports i386; supports ``i386`` wheels); - * ``intel-64`` (supports x86-64; supports ``x86_64`` wheels); - * ``all`` (supports PPC, i386, PPC64 and x86-64; supports ``universal`` wheels). + * ``universal2`` (x86-64 and arm64; supports ``universal2`` wheels); + * ``32-bit`` (PPC and i386; supports ``fat`` wheels); + * ``64-bit`` (PPC64 and x86-64; supports ``fat64`` wheels); + * ``3-way`` (i386, PPC and x86-64; supports ``fat3`` wheels); + * ``intel`` (i386 and x86-64; supports ``intel`` wheels); + * ``intel-32`` (i386; supports ``i386`` wheels); + * ``intel-64`` (x86-64; supports ``x86_64`` wheels); + * ``all`` (PPC, i386, PPC64 and x86-64; supports ``universal`` wheels). .. option:: --with-framework-name=FRAMEWORK From 8043f0b9bc369b432affbbfbda09250a684a8ace Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 21 Feb 2025 15:18:03 +0800 Subject: [PATCH 4/4] Revised approach referencing Python packaging guide. --- Doc/using/configure.rst | 22 ++++++++++++++-------- Mac/README.rst | 10 ++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/Doc/using/configure.rst b/Doc/using/configure.rst index 4f8ce24a19082d..4d47cf945219dd 100644 --- a/Doc/using/configure.rst +++ b/Doc/using/configure.rst @@ -978,14 +978,20 @@ See :source:`Mac/README.rst`. Options: - * ``universal2`` (x86-64 and arm64; supports ``universal2`` wheels); - * ``32-bit`` (PPC and i386; supports ``fat`` wheels); - * ``64-bit`` (PPC64 and x86-64; supports ``fat64`` wheels); - * ``3-way`` (i386, PPC and x86-64; supports ``fat3`` wheels); - * ``intel`` (i386 and x86-64; supports ``intel`` wheels); - * ``intel-32`` (i386; supports ``i386`` wheels); - * ``intel-64`` (x86-64; supports ``x86_64`` wheels); - * ``all`` (PPC, i386, PPC64 and x86-64; supports ``universal`` wheels). + * ``universal2`` (x86-64 and arm64); + * ``32-bit`` (PPC and i386); + * ``64-bit`` (PPC64 and x86-64); + * ``3-way`` (i386, PPC and x86-64); + * ``intel`` (i386 and x86-64); + * ``intel-32`` (i386); + * ``intel-64`` (x86-64); + * ``all`` (PPC, i386, PPC64 and x86-64). + + Note that values for this configuration item are *not* the same as the + identifiers used for universal binary wheels on macOS. See the Python + Packaging User Guide for details on the `packaging platform compatibility + tags used on macOS + `_ .. option:: --with-framework-name=FRAMEWORK diff --git a/Mac/README.rst b/Mac/README.rst index e32566d5475ae3..8a6e52725615aa 100644 --- a/Mac/README.rst +++ b/Mac/README.rst @@ -200,6 +200,16 @@ a ``python3.x-32`` binary and use the value of ``sys.executable`` as the Likewise, use ``python3.x-intel64`` to force execution in ``x86_64`` mode with ``universal2`` binaries. +3. How do I specify binary universal wheels +------------------------------------------- + +Binary wheels can also be universal. The platform tag name used to identify +universal binary wheels differs from the naming scheme used when configuring a +universal build with ``--with-universal-archs``. See the Python Packaging User +Guide for details on the `packaging platform compatibility tags used on macOS +`_. + + Building and using a framework-based Python on macOS ====================================================