From 68160d67294b9925868bf4259f514dc3d563d8fc Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 26 Oct 2026 06:08:52 +0000 Subject: [PATCH 1/3] updated v3.15.2 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2472e7ec9..1ab595463 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.15.1" %} +{% set version = "3.15.2" %} {% set dev = "" %} {% set dev_ = "" %} {% set ver2 = '.'.join(version.split('.')[0:2]) %} @@ -64,7 +64,7 @@ package: source: - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz # sha256 from: https://www.python.org/downloads/release/python-{{ ver3nd }}{{ dev }}/ - sha256: 673ae7232d84c894729882c8257d300ef2d26523911bfd3917ec8ce7f526f99b + sha256: 8b5536d280142ecf6cdfe15d12a21ba1c65e300bbf7b28a8d0cdb849575797de patches: - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch - patches/0002-Win32-Do-not-download-externals.patch From b8a5e638ad0976cab51da0086755bb519797d223 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 26 Oct 2026 06:08:53 +0000 Subject: [PATCH 2/3] rebase patches --- ...2-Change-FD_SETSIZE-from-512-to-2048.patch | 2 +- ...0002-Win32-Do-not-download-externals.patch | 2 +- ...-so-that-it-looks-in-sys.prefix-lib-.patch | 8 +- ...-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch | 8 +- recipe/patches/0005-Unvendor-openssl.patch | 10 +- recipe/patches/0006-Unvendor-sqlite3.patch | 6 +- ...dd-CondaEcosystemModifyDllSearchPath.patch | 2 +- recipe/patches/0008-Doing-d1trimfile.patch | 102 +++++++++--------- .../patches/0009-cross-compile-darwin.patch | 6 +- .../patches/0010-Fix-TZPATH-on-windows.patch | 4 +- ...ch-work-with-SYSTEM_VERSION_COMPAT-1.patch | 6 +- recipe/patches/0012-Unvendor-bzip2.patch | 4 +- recipe/patches/0013-Unvendor-libffi.patch | 2 +- recipe/patches/0014-Unvendor-tcltk.patch | 4 +- recipe/patches/0015-unvendor-xz.patch | 2 +- recipe/patches/0016-unvendor-zlib.patch | 10 +- ...-not-pass-g-to-GCC-when-not-Py_DEBUG.patch | 4 +- recipe/patches/0018-Unvendor-expat.patch | 8 +- .../patches/0019-Remove-unused-readelf.patch | 2 +- ...t-checksharedmods-if-cross-compiling.patch | 6 +- .../0021-Override-configure-LIBFFI.patch | 10 +- recipe/patches/0022-Unvendor-libmpdec.patch | 2 +- recipe/patches/0023-Brand-conda-forge.patch | 4 +- ...d_t-as-it-might-conflict-with-the-ac.patch | 14 +-- recipe/patches/0025-Unvendor-zstd.patch | 14 +-- ...IL_DISABLED-in-windows-to-match-unix.patch | 2 +- .../0027-More-unixy-layout-for-windows.patch | 12 +-- ...hen-conda-site.pth-has-non-existent-.patch | 4 +- 28 files changed, 130 insertions(+), 130 deletions(-) diff --git a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch index 882fdb80c..fd79d0426 100644 --- a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch +++ b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch @@ -9,7 +9,7 @@ https://github.com/ContinuumIO/anaconda-issues/issues/1241 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c -index b9fb7762e3d..e6102e8c589 100644 +index b9fb776..e6102e8 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -45,7 +45,7 @@ diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch index a687599c6..2d6e845c0 100644 --- a/recipe/patches/0002-Win32-Do-not-download-externals.patch +++ b/recipe/patches/0002-Win32-Do-not-download-externals.patch @@ -8,7 +8,7 @@ Subject: [PATCH 02/28] Win32: Do not download externals 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PCbuild/build.bat b/PCbuild/build.bat -index 9d2f032f5a9..faad274fc9d 100644 +index 4686c52..3ee574c 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -112,7 +112,7 @@ if "%~1"=="--no-ctypes" (set IncludeCTypes=false) & shift & goto CheckOpts diff --git a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch index 89e835e18..3b9b32efa 100644 --- a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch +++ b/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch @@ -10,7 +10,7 @@ Subject: [PATCH 03/28] Fix find_library so that it looks in sys.prefix/lib 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Lib/ctypes/macholib/dyld.py b/Lib/ctypes/macholib/dyld.py -index 583c47daff3..ab9b01c87e2 100644 +index 583c47d..ab9b01c 100644 --- a/Lib/ctypes/macholib/dyld.py +++ b/Lib/ctypes/macholib/dyld.py @@ -93,6 +93,10 @@ def dyld_executable_path_search(name, executable_path=None): @@ -25,10 +25,10 @@ index 583c47daff3..ab9b01c87e2 100644 yield os.path.join(executable_path, name[len('@executable_path/'):]) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 015c62b31a1..e08c9520576 100644 +index 015c62b..e08c952 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -136,7 +136,8 @@ def dllist(): +@@ -136,7 +136,8 @@ if os.name == "nt": elif os.name == "posix" and sys.platform in {"darwin", "ios", "tvos", "watchos"}: from ctypes.macholib.dyld import dyld_find as _dyld_find def find_library(name): @@ -38,7 +38,7 @@ index 015c62b31a1..e08c9520576 100644 '%s.dylib' % name, '%s.framework/%s' % (name, name)] for name in possible: -@@ -436,10 +437,30 @@ def _findLib_ld(name): +@@ -436,10 +437,30 @@ elif os.name == "posix": pass # result will be None return result diff --git a/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch b/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch index 8e1ef619e..85bbc295a 100644 --- a/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch +++ b/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch @@ -11,10 +11,10 @@ Co-authored-by: Isuru Fernando 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Modules/getpath.c b/Modules/getpath.c -index ada8a27be4c..88252adf91d 100644 +index 22fd425..ea08a53 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c -@@ -939,6 +939,7 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config) +@@ -943,6 +943,7 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config) !env_to_dict(dict, "ENV_PATH", 0) || !env_to_dict(dict, "ENV_PYTHONHOME", 0) || !env_to_dict(dict, "ENV_PYTHONEXECUTABLE", 0) || @@ -23,7 +23,7 @@ index ada8a27be4c..88252adf91d 100644 !progname_to_dict(dict, "real_executable") || !library_to_dict(dict, "library") || diff --git a/Modules/getpath.py b/Modules/getpath.py -index f5f928f1795..a809396a3a4 100644 +index 2ffb1d9..a043970 100644 --- a/Modules/getpath.py +++ b/Modules/getpath.py @@ -52,6 +52,7 @@ @@ -34,7 +34,7 @@ index f5f928f1795..a809396a3a4 100644 # ** Values calculated at runtime ** # config -- [in/out] dict of the PyConfig structure -@@ -703,7 +704,7 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -719,7 +720,7 @@ elif not pythonpath_was_set: stdlib_zip = joinpath(base_prefix, ZIP_LANDMARK) pythonpath.append(stdlib_zip) diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index 35e3c6c8f..4e325aec9 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -13,7 +13,7 @@ Co-authored-by: Isuru Fernando 5 files changed, 9 insertions(+), 56 deletions(-) diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props -index 5fd708b211e..044cefd95ea 100644 +index f071060..afb9a08 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -2,10 +2,10 @@ @@ -45,7 +45,7 @@ index 5fd708b211e..044cefd95ea 100644 - diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj -index 7ca750dda8f..17eee400ebb 100644 +index cf443ef..b7880fb 100644 --- a/PCbuild/openssl.vcxproj +++ b/PCbuild/openssl.vcxproj @@ -60,40 +60,8 @@ @@ -90,7 +90,7 @@ index 7ca750dda8f..17eee400ebb 100644 diff --git a/PCbuild/python.props b/PCbuild/python.props -index 4c49decd749..744ce0c540a 100644 +index 31e7095..027ae78 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -91,6 +91,7 @@ @@ -123,7 +123,7 @@ index 4c49decd749..744ce0c540a 100644 diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj -index 417ede34c54..75f2bd9984a 100644 +index d3dd432..bb2b617 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -110,6 +110,9 @@ @@ -137,7 +137,7 @@ index 417ede34c54..75f2bd9984a 100644 diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj -index 244cdf622ad..03ba2a20dd2 100644 +index b718756..668756a 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj @@ -105,6 +105,9 @@ diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index 1f333c786..d22fc1f42 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -10,7 +10,7 @@ Subject: [PATCH 06/28] Unvendor sqlite3 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj -index 9ae0a0fc3a0..9baaafed518 100644 +index 5a8a850..755a3b7 100644 --- a/PCbuild/_sqlite3.vcxproj +++ b/PCbuild/_sqlite3.vcxproj @@ -93,9 +93,12 @@ @@ -39,7 +39,7 @@ index 9ae0a0fc3a0..9baaafed518 100644 diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln -index 09a989d3864..74b961e877f 100644 +index 3a973ea..fd8f165 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -73,8 +73,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtre @@ -52,7 +52,7 @@ index 09a989d3864..74b961e877f 100644 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcxproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}" diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj -index 0673e03a59f..97a4c46dea1 100644 +index 257013c..a7ca8e0 100644 --- a/PCbuild/sqlite3.vcxproj +++ b/PCbuild/sqlite3.vcxproj @@ -88,12 +88,12 @@ diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index e0a47c99c..dd282536c 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -33,7 +33,7 @@ Co-authored-by: Isuru Fernando 1 file changed, 95 insertions(+) diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c -index 516d467141a..156524cc7ce 100644 +index 516d467..156524c 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -88,6 +88,10 @@ diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch index 5941109bb..2a3bb6359 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -57,7 +57,7 @@ Subject: [PATCH 08/28] Doing d1trimfile 50 files changed, 394 insertions(+), 12 deletions(-) diff --git a/PCbuild/_asyncio.vcxproj b/PCbuild/_asyncio.vcxproj -index 76b0ffd660d..1402860e19b 100644 +index 1df2583..bb39ae7 100644 --- a/PCbuild/_asyncio.vcxproj +++ b/PCbuild/_asyncio.vcxproj @@ -91,6 +91,26 @@ @@ -88,7 +88,7 @@ index 76b0ffd660d..1402860e19b 100644 diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj -index e0dc6ec187a..9e75e57cb6e 100644 +index 90db6a8..ca58506 100644 --- a/PCbuild/_bz2.vcxproj +++ b/PCbuild/_bz2.vcxproj @@ -97,6 +97,10 @@ @@ -103,7 +103,7 @@ index e0dc6ec187a..9e75e57cb6e 100644 diff --git a/PCbuild/_ctypes.vcxproj b/PCbuild/_ctypes.vcxproj -index 63d5fa49cd4..6329f3d960f 100644 +index 3162ce2..46a212e 100644 --- a/PCbuild/_ctypes.vcxproj +++ b/PCbuild/_ctypes.vcxproj @@ -95,6 +95,10 @@ @@ -118,7 +118,7 @@ index 63d5fa49cd4..6329f3d960f 100644 /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) diff --git a/PCbuild/_ctypes_test.vcxproj b/PCbuild/_ctypes_test.vcxproj -index f15b80852e3..e565441ca4c 100644 +index 6b20aba..45349b6 100644 --- a/PCbuild/_ctypes_test.vcxproj +++ b/PCbuild/_ctypes_test.vcxproj @@ -93,6 +93,26 @@ @@ -149,7 +149,7 @@ index f15b80852e3..e565441ca4c 100644 diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj -index 3ba49370d58..921d22e47b3 100644 +index 71916cf..44e1caf 100644 --- a/PCbuild/_decimal.vcxproj +++ b/PCbuild/_decimal.vcxproj @@ -99,6 +99,10 @@ @@ -164,7 +164,7 @@ index 3ba49370d58..921d22e47b3 100644 diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index cd8c1ff1731..c33e8e3c232 100644 +index 887c58b..a991b2a 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -94,7 +94,11 @@ @@ -181,7 +181,7 @@ index cd8c1ff1731..c33e8e3c232 100644 diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj -index 198563b4d8d..2f184fc8399 100644 +index fdc242b..040efb0 100644 --- a/PCbuild/_freeze_module.vcxproj +++ b/PCbuild/_freeze_module.vcxproj @@ -93,6 +93,10 @@ @@ -196,7 +196,7 @@ index 198563b4d8d..2f184fc8399 100644 Console diff --git a/PCbuild/_hashlib.vcxproj b/PCbuild/_hashlib.vcxproj -index 2cd205224bc..1ff3a9cdeca 100644 +index b43da66..ea0ed78 100644 --- a/PCbuild/_hashlib.vcxproj +++ b/PCbuild/_hashlib.vcxproj @@ -96,6 +96,18 @@ @@ -219,7 +219,7 @@ index 2cd205224bc..1ff3a9cdeca 100644 diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj -index 40107d4b76c..321f41d8d27 100644 +index 98e551e..8b8b148 100644 --- a/PCbuild/_lzma.vcxproj +++ b/PCbuild/_lzma.vcxproj @@ -95,6 +95,10 @@ @@ -234,7 +234,7 @@ index 40107d4b76c..321f41d8d27 100644 $(OutDir)liblzma$(PyDebugExt).lib;%(AdditionalDependencies) diff --git a/PCbuild/_multiprocessing.vcxproj b/PCbuild/_multiprocessing.vcxproj -index a65397f532a..58f1d506dc8 100644 +index 33c8537..ea468ac 100644 --- a/PCbuild/_multiprocessing.vcxproj +++ b/PCbuild/_multiprocessing.vcxproj @@ -95,6 +95,18 @@ @@ -257,7 +257,7 @@ index a65397f532a..58f1d506dc8 100644 diff --git a/PCbuild/_overlapped.vcxproj b/PCbuild/_overlapped.vcxproj -index 224bf05d530..d3221fcce32 100644 +index 1cb79b5..3ee7e08 100644 --- a/PCbuild/_overlapped.vcxproj +++ b/PCbuild/_overlapped.vcxproj @@ -95,6 +95,18 @@ @@ -280,7 +280,7 @@ index 224bf05d530..d3221fcce32 100644 diff --git a/PCbuild/_queue.vcxproj b/PCbuild/_queue.vcxproj -index 80a1c3c6a4a..8d4555299ae 100644 +index db6fbf3..5b4cc1e 100644 --- a/PCbuild/_queue.vcxproj +++ b/PCbuild/_queue.vcxproj @@ -91,6 +91,26 @@ @@ -311,7 +311,7 @@ index 80a1c3c6a4a..8d4555299ae 100644 diff --git a/PCbuild/_remote_debugging.vcxproj b/PCbuild/_remote_debugging.vcxproj -index 41aadbd13d0..7fbaafdbe64 100644 +index c476fdd..5c8ea91 100644 --- a/PCbuild/_remote_debugging.vcxproj +++ b/PCbuild/_remote_debugging.vcxproj @@ -93,6 +93,12 @@ @@ -328,7 +328,7 @@ index 41aadbd13d0..7fbaafdbe64 100644 ntdll.lib;%(AdditionalDependencies) diff --git a/PCbuild/_socket.vcxproj b/PCbuild/_socket.vcxproj -index 41af0895921..993426d4cf8 100644 +index 257e6df..5b11736 100644 --- a/PCbuild/_socket.vcxproj +++ b/PCbuild/_socket.vcxproj @@ -95,6 +95,18 @@ @@ -351,7 +351,7 @@ index 41af0895921..993426d4cf8 100644 diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj -index 9baaafed518..a850c5a8955 100644 +index 755a3b7..5f2e15a 100644 --- a/PCbuild/_sqlite3.vcxproj +++ b/PCbuild/_sqlite3.vcxproj @@ -95,6 +95,10 @@ @@ -366,7 +366,7 @@ index 9baaafed518..a850c5a8955 100644 $(condaDir)\lib\sqlite3.lib;%(AdditionalDependencies) diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj -index ce21f992ff8..34561515c12 100644 +index 9377a21..4e97a69 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj @@ -96,6 +96,18 @@ @@ -387,9 +387,9 @@ index ce21f992ff8..34561515c12 100644 + - + diff --git a/PCbuild/_testbuffer.vcxproj b/PCbuild/_testbuffer.vcxproj -index 4e721e8ce09..048adde0951 100644 +index 85da155..95cdd91 100644 --- a/PCbuild/_testbuffer.vcxproj +++ b/PCbuild/_testbuffer.vcxproj @@ -92,6 +92,26 @@ @@ -420,7 +420,7 @@ index 4e721e8ce09..048adde0951 100644 diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj -index 64e50b67be4..83233bfe869 100644 +index eaedf56..ebc4e61 100644 --- a/PCbuild/_testcapi.vcxproj +++ b/PCbuild/_testcapi.vcxproj @@ -92,6 +92,26 @@ @@ -451,7 +451,7 @@ index 64e50b67be4..83233bfe869 100644 diff --git a/PCbuild/_testconsole.vcxproj b/PCbuild/_testconsole.vcxproj -index 69d312b17a5..ea230fa8126 100644 +index 70ac452..af40511 100644 --- a/PCbuild/_testconsole.vcxproj +++ b/PCbuild/_testconsole.vcxproj @@ -92,6 +92,10 @@ @@ -466,7 +466,7 @@ index 69d312b17a5..ea230fa8126 100644 Console diff --git a/PCbuild/_testembed.vcxproj b/PCbuild/_testembed.vcxproj -index a7ea8787e0c..eab72171e3b 100644 +index ebed0cf..ec287fd 100644 --- a/PCbuild/_testembed.vcxproj +++ b/PCbuild/_testembed.vcxproj @@ -89,6 +89,10 @@ @@ -481,7 +481,7 @@ index a7ea8787e0c..eab72171e3b 100644 Console diff --git a/PCbuild/_testimportmultiple.vcxproj b/PCbuild/_testimportmultiple.vcxproj -index c35ac83c1c7..c9d7f5d22b7 100644 +index 2d705e4..c6f284c 100644 --- a/PCbuild/_testimportmultiple.vcxproj +++ b/PCbuild/_testimportmultiple.vcxproj @@ -92,6 +92,26 @@ @@ -512,7 +512,7 @@ index c35ac83c1c7..c9d7f5d22b7 100644 diff --git a/PCbuild/_testinternalcapi.vcxproj b/PCbuild/_testinternalcapi.vcxproj -index f3e423fa046..ac285717998 100644 +index 995fa70..e639f7d 100644 --- a/PCbuild/_testinternalcapi.vcxproj +++ b/PCbuild/_testinternalcapi.vcxproj @@ -92,6 +92,26 @@ @@ -543,7 +543,7 @@ index f3e423fa046..ac285717998 100644 diff --git a/PCbuild/_testmultiphase.vcxproj b/PCbuild/_testmultiphase.vcxproj -index e730fe308ab..625e50af7f6 100644 +index f42a0d9..9ca80c1 100644 --- a/PCbuild/_testmultiphase.vcxproj +++ b/PCbuild/_testmultiphase.vcxproj @@ -92,6 +92,10 @@ @@ -558,7 +558,7 @@ index e730fe308ab..625e50af7f6 100644 Console diff --git a/PCbuild/_testsinglephase.vcxproj b/PCbuild/_testsinglephase.vcxproj -index bf4dabf66c1..6068fb3c204 100644 +index 1843ab2..8a61303 100644 --- a/PCbuild/_testsinglephase.vcxproj +++ b/PCbuild/_testsinglephase.vcxproj @@ -92,6 +92,10 @@ @@ -573,7 +573,7 @@ index bf4dabf66c1..6068fb3c204 100644 Console diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj -index 87f6005fffc..de9358312ac 100644 +index 7eef787..a6695b7 100644 --- a/PCbuild/_tkinter.vcxproj +++ b/PCbuild/_tkinter.vcxproj @@ -97,6 +97,10 @@ @@ -588,7 +588,7 @@ index 87f6005fffc..de9358312ac 100644 $(tcltkLib);%(AdditionalDependencies) diff --git a/PCbuild/_uuid.vcxproj b/PCbuild/_uuid.vcxproj -index 50d81cc7916..64fcf61fa3a 100644 +index 8b18ca8..1a08cfd 100644 --- a/PCbuild/_uuid.vcxproj +++ b/PCbuild/_uuid.vcxproj @@ -93,6 +93,12 @@ @@ -605,7 +605,7 @@ index 50d81cc7916..64fcf61fa3a 100644 rpcrt4.lib;%(AdditionalDependencies) diff --git a/PCbuild/_wmi.vcxproj b/PCbuild/_wmi.vcxproj -index 22fa8960982..516db060fb3 100644 +index 2fb24b6..06db937 100644 --- a/PCbuild/_wmi.vcxproj +++ b/PCbuild/_wmi.vcxproj @@ -95,6 +95,10 @@ @@ -620,7 +620,7 @@ index 22fa8960982..516db060fb3 100644 wbemuuid.lib;propsys.lib;%(AdditionalDependencies) diff --git a/PCbuild/_zstd.vcxproj b/PCbuild/_zstd.vcxproj -index 6f91b8d05cc..683a44535ca 100644 +index 6b8c727..5f5122b 100644 --- a/PCbuild/_zstd.vcxproj +++ b/PCbuild/_zstd.vcxproj @@ -96,6 +96,10 @@ @@ -635,7 +635,7 @@ index 6f91b8d05cc..683a44535ca 100644 diff --git a/PCbuild/liblzma.vcxproj b/PCbuild/liblzma.vcxproj -index 75d4e162346..d50534affa1 100644 +index 0a1608b..23d4162 100644 --- a/PCbuild/liblzma.vcxproj +++ b/PCbuild/liblzma.vcxproj @@ -95,6 +95,10 @@ @@ -650,7 +650,7 @@ index 75d4e162346..d50534affa1 100644 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index ae9ad59197b..1858e9c60dd 100644 +index 0c8fb45..0fc97ec 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -92,6 +92,10 @@ @@ -665,7 +665,7 @@ index ae9ad59197b..1858e9c60dd 100644 diff --git a/PCbuild/pylauncher.vcxproj b/PCbuild/pylauncher.vcxproj -index ca422ef4d02..0c692649ed6 100644 +index 2d36e4a..8d5bbf2 100644 --- a/PCbuild/pylauncher.vcxproj +++ b/PCbuild/pylauncher.vcxproj @@ -93,6 +93,10 @@ @@ -680,7 +680,7 @@ index ca422ef4d02..0c692649ed6 100644 shell32.lib;pathcch.lib;%(AdditionalDependencies) diff --git a/PCbuild/pyshellext.vcxproj b/PCbuild/pyshellext.vcxproj -index ea432d6bc9a..13bc6921030 100644 +index 18ea911..1c41eef 100644 --- a/PCbuild/pyshellext.vcxproj +++ b/PCbuild/pyshellext.vcxproj @@ -92,6 +92,10 @@ @@ -695,7 +695,7 @@ index ea432d6bc9a..13bc6921030 100644 version.lib;shlwapi.lib;%(AdditionalDependencies) diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj -index 75f2bd9984a..27ca69880a9 100644 +index bb2b617..4af0f34 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -92,6 +92,10 @@ @@ -710,7 +710,7 @@ index 75f2bd9984a..27ca69880a9 100644 Console diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3dll.vcxproj -index 3d8ac1b2353..8f8da3d0bb0 100644 +index 4d02873..a6cd594 100644 --- a/PCbuild/python3dll.vcxproj +++ b/PCbuild/python3dll.vcxproj @@ -93,6 +93,10 @@ @@ -725,7 +725,7 @@ index 3d8ac1b2353..8f8da3d0bb0 100644 true diff --git a/PCbuild/python3tdll.vcxproj b/PCbuild/python3tdll.vcxproj -index 796712cca31..b2929246b44 100644 +index d7d77c7..70a5aa6 100644 --- a/PCbuild/python3tdll.vcxproj +++ b/PCbuild/python3tdll.vcxproj @@ -93,6 +93,10 @@ @@ -740,7 +740,7 @@ index 796712cca31..b2929246b44 100644 true diff --git a/PCbuild/python_uwp.vcxproj b/PCbuild/python_uwp.vcxproj -index 3f8772d30b4..d80968e351a 100644 +index 8fd056e..baad8b9 100644 --- a/PCbuild/python_uwp.vcxproj +++ b/PCbuild/python_uwp.vcxproj @@ -90,7 +90,7 @@ @@ -753,7 +753,7 @@ index 3f8772d30b4..d80968e351a 100644 windowsapp.lib;%(AdditionalDependencies) diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index d246c910b9c..9026236144d 100644 +index 0aba98a..ece6ab5 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -99,7 +99,7 @@ @@ -766,7 +766,7 @@ index d246c910b9c..9026236144d 100644 $(zlibNgDir);$(GeneratedZlibNgDir);%(AdditionalIncludeDirectories) $(GeneratedJitStencilsDir);%(AdditionalIncludeDirectories) diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj -index 03ba2a20dd2..193eb2ecb88 100644 +index 668756a..ae06796 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj @@ -96,6 +96,18 @@ @@ -803,7 +803,7 @@ index 03ba2a20dd2..193eb2ecb88 100644 \ No newline at end of file diff --git a/PCbuild/pythonw_uwp.vcxproj b/PCbuild/pythonw_uwp.vcxproj -index f548d022642..fa4e75f9712 100644 +index 3315606..f680e61 100644 --- a/PCbuild/pythonw_uwp.vcxproj +++ b/PCbuild/pythonw_uwp.vcxproj @@ -90,7 +90,7 @@ @@ -816,7 +816,7 @@ index f548d022642..fa4e75f9712 100644 windowsapp.lib;%(AdditionalDependencies) diff --git a/PCbuild/pywlauncher.vcxproj b/PCbuild/pywlauncher.vcxproj -index 1694548935a..551dbc21bb1 100644 +index 7cac1a9..7c1ef49 100644 --- a/PCbuild/pywlauncher.vcxproj +++ b/PCbuild/pywlauncher.vcxproj @@ -93,6 +93,10 @@ @@ -831,7 +831,7 @@ index 1694548935a..551dbc21bb1 100644 shell32.lib;pathcch.lib;%(AdditionalDependencies) diff --git a/PCbuild/select.vcxproj b/PCbuild/select.vcxproj -index d7448fd4d72..a51c71d2b72 100644 +index 696b3d6..72c4815 100644 --- a/PCbuild/select.vcxproj +++ b/PCbuild/select.vcxproj @@ -94,6 +94,18 @@ @@ -854,7 +854,7 @@ index d7448fd4d72..a51c71d2b72 100644 diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj -index 97a4c46dea1..7d270c3a712 100644 +index a7ca8e0..bd572cf 100644 --- a/PCbuild/sqlite3.vcxproj +++ b/PCbuild/sqlite3.vcxproj @@ -101,6 +101,10 @@ @@ -869,7 +869,7 @@ index 97a4c46dea1..7d270c3a712 100644 SQLITE_VERSION=$(SqliteVersion);SQLITE_MAJOR_VERSION=$(SqliteMajorVersion);SQLITE_MINOR_VERSION=$(SqliteMinorVersion);SQLITE_MICRO_VERSION=$(SqliteMicroVersion);SQLITE_PATCH_VERSION=$(SqlitePatchVersion);%(PreprocessorDefinitions) diff --git a/PCbuild/unicodedata.vcxproj b/PCbuild/unicodedata.vcxproj -index 781f938e2ab..714a2382c1e 100644 +index 906d16a..41f79b8 100644 --- a/PCbuild/unicodedata.vcxproj +++ b/PCbuild/unicodedata.vcxproj @@ -91,6 +91,26 @@ @@ -900,7 +900,7 @@ index 781f938e2ab..714a2382c1e 100644 diff --git a/PCbuild/venvlauncher.vcxproj b/PCbuild/venvlauncher.vcxproj -index a2e8ffa82b1..705e507050f 100644 +index e154ae0..53f3c16 100644 --- a/PCbuild/venvlauncher.vcxproj +++ b/PCbuild/venvlauncher.vcxproj @@ -97,6 +97,10 @@ @@ -915,7 +915,7 @@ index a2e8ffa82b1..705e507050f 100644 PY_ICON;%(PreprocessorDefinitions) diff --git a/PCbuild/venvwlauncher.vcxproj b/PCbuild/venvwlauncher.vcxproj -index f2aaf83fe2b..d9c47683f25 100644 +index a8f771e..71fe9c1 100644 --- a/PCbuild/venvwlauncher.vcxproj +++ b/PCbuild/venvwlauncher.vcxproj @@ -97,6 +97,10 @@ @@ -930,7 +930,7 @@ index f2aaf83fe2b..d9c47683f25 100644 PYW_ICON;%(PreprocessorDefinitions) diff --git a/PCbuild/winsound.vcxproj b/PCbuild/winsound.vcxproj -index c26029b15a3..d76a3fb8537 100644 +index 91b5bca..abd3026 100644 --- a/PCbuild/winsound.vcxproj +++ b/PCbuild/winsound.vcxproj @@ -96,6 +96,18 @@ @@ -953,7 +953,7 @@ index c26029b15a3..d76a3fb8537 100644 diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj -index f0c36166001..cc906a14cf4 100644 +index 543c4ce..6d51e94 100644 --- a/PCbuild/xxlimited.vcxproj +++ b/PCbuild/xxlimited.vcxproj @@ -93,6 +93,12 @@ @@ -970,7 +970,7 @@ index f0c36166001..cc906a14cf4 100644 wsock32.lib;%(AdditionalDependencies) diff --git a/PCbuild/xxlimited_35.vcxproj b/PCbuild/xxlimited_35.vcxproj -index bfaf4e25366..4f8a3b37e35 100644 +index 0a3a72c..1e90aa5 100644 --- a/PCbuild/xxlimited_35.vcxproj +++ b/PCbuild/xxlimited_35.vcxproj @@ -93,6 +93,12 @@ @@ -987,7 +987,7 @@ index bfaf4e25366..4f8a3b37e35 100644 wsock32.lib;%(AdditionalDependencies) diff --git a/PCbuild/xxlimited_3_13.vcxproj b/PCbuild/xxlimited_3_13.vcxproj -index 7a9760fd431..cff5e4b6850 100644 +index 7ff59f2..db3dfd8 100644 --- a/PCbuild/xxlimited_3_13.vcxproj +++ b/PCbuild/xxlimited_3_13.vcxproj @@ -93,6 +93,12 @@ @@ -1004,7 +1004,7 @@ index 7a9760fd431..cff5e4b6850 100644 wsock32.lib;%(AdditionalDependencies) diff --git a/PCbuild/zlib-ng.vcxproj b/PCbuild/zlib-ng.vcxproj -index ffe8e70f2db..e92cdbca987 100644 +index b546b6d..5695318 100644 --- a/PCbuild/zlib-ng.vcxproj +++ b/PCbuild/zlib-ng.vcxproj @@ -99,6 +99,10 @@ diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch index 3e6a20d38..9948d3b67 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -11,7 +11,7 @@ By Isuru Fernando. 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Lib/platform.py b/Lib/platform.py -index 36489d4fdd9..37278847c0a 100644 +index 36489d4..3727884 100644 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -474,7 +474,12 @@ def win32_ver(release='', version='', csd='', ptype=''): @@ -29,7 +29,7 @@ index 36489d4fdd9..37278847c0a 100644 try: import plistlib diff --git a/configure b/configure -index 5a728e8ba68..d03f7d1c341 100755 +index 6f7ff1b..1c7a694 100755 --- a/configure +++ b/configure @@ -4157,6 +4157,9 @@ then @@ -53,7 +53,7 @@ index 5a728e8ba68..d03f7d1c341 100755 ;; *-*-cygwin*) diff --git a/configure.ac b/configure.ac -index 08cfd620afb..f57e87983d2 100644 +index 9923805..022ff40 100644 --- a/configure.ac +++ b/configure.ac @@ -339,6 +339,9 @@ then diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch index 587f8899d..409ef9b37 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -8,10 +8,10 @@ Subject: [PATCH 10/28] Fix TZPATH on windows 1 file changed, 2 insertions(+) diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index b93155131c6..fc99cd14af2 100644 +index b931551..fc99cd1 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py -@@ -175,6 +175,7 @@ def joinuser(*args): +@@ -175,6 +175,7 @@ _SCHEME_KEYS = ('stdlib', 'platstdlib', 'purelib', 'platlib', 'include', _PY_VERSION = sys.version.split()[0] _PY_VERSION_SHORT = f'{sys.version_info[0]}.{sys.version_info[1]}' _PY_VERSION_SHORT_NO_DOT = f'{sys.version_info[0]}{sys.version_info[1]}' diff --git a/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch b/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch index 254442695..54542673b 100644 --- a/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch +++ b/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch @@ -18,10 +18,10 @@ and this code using 10.16 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c -index 746034c8004..d42585c08c5 100644 +index 380a8f9..4eaee29 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c -@@ -1503,7 +1503,7 @@ copy_com_pointer(PyObject *self, PyObject *args) +@@ -1508,7 +1508,7 @@ copy_com_pointer(PyObject *self, PyObject *args) #ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH # ifdef HAVE_BUILTIN_AVAILABLE # define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \ @@ -30,7 +30,7 @@ index 746034c8004..d42585c08c5 100644 # else # define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \ (_dyld_shared_cache_contains_path != NULL) -@@ -1546,8 +1546,10 @@ static PyObject *py_dyld_shared_cache_contains_path(PyObject *self, PyObject *ar +@@ -1551,8 +1551,10 @@ static PyObject *py_dyld_shared_cache_contains_path(PyObject *self, PyObject *ar if (PyUnicode_FSConverter(name, &name2) == 0) return NULL; name_str = PyBytes_AS_STRING(name2); diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch index 15d5db0c1..3d5ce0f01 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -9,7 +9,7 @@ Subject: [PATCH 12/28] Unvendor bzip2 2 files changed, 6 insertions(+), 35 deletions(-) diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj -index 9e75e57cb6e..01d637caa40 100644 +index ca58506..e442d00 100644 --- a/PCbuild/_bz2.vcxproj +++ b/PCbuild/_bz2.vcxproj @@ -94,7 +94,7 @@ @@ -47,7 +47,7 @@ index 9e75e57cb6e..01d637caa40 100644 diff --git a/PCbuild/_bz2.vcxproj.filters b/PCbuild/_bz2.vcxproj.filters -index 7c0b5162537..c1f960608c3 100644 +index ce2e24e..38cbce7 100644 --- a/PCbuild/_bz2.vcxproj.filters +++ b/PCbuild/_bz2.vcxproj.filters @@ -21,33 +21,9 @@ diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index 395fa9c77..e93e26001 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -8,7 +8,7 @@ Subject: [PATCH 13/28] Unvendor libffi 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/PCbuild/libffi.props b/PCbuild/libffi.props -index 22c9550e2c0..97fb5966bfb 100644 +index c14ff06..2c4082a 100644 --- a/PCbuild/libffi.props +++ b/PCbuild/libffi.props @@ -2,20 +2,11 @@ diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index 7b0b47384..48d4019b4 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -9,7 +9,7 @@ Subject: [PATCH 14/28] Unvendor tcltk 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj -index de9358312ac..3fe2c29c823 100644 +index a6695b7..84eb85e 100644 --- a/PCbuild/_tkinter.vcxproj +++ b/PCbuild/_tkinter.vcxproj @@ -128,12 +128,6 @@ @@ -26,7 +26,7 @@ index de9358312ac..3fe2c29c823 100644 diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props -index 1d6b4f57f09..22a3f0be581 100644 +index 91c11aa..e4445c1 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -12,15 +12,13 @@ diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index 0b66b785a..c26afdc72 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -8,7 +8,7 @@ Subject: [PATCH 15/28] unvendor xz 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj -index 321f41d8d27..6811fd1709e 100644 +index 8b8b148..7a98861 100644 --- a/PCbuild/_lzma.vcxproj +++ b/PCbuild/_lzma.vcxproj @@ -93,15 +93,15 @@ diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index 84c238111..412da1637 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -9,7 +9,7 @@ Subject: [PATCH 16/28] unvendor zlib 2 files changed, 4 insertions(+), 76 deletions(-) diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index 9026236144d..93a0e270a93 100644 +index ece6ab5..a50eaac 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -82,7 +82,7 @@ @@ -44,7 +44,7 @@ index 9026236144d..93a0e270a93 100644 -@@ -714,12 +714,6 @@ +@@ -715,12 +715,6 @@ @@ -58,10 +58,10 @@ index 9026236144d..93a0e270a93 100644 diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters -index 649ee1859ff..6fb1a6b5d0f 100644 +index cdbb257..0851c9a 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters -@@ -939,39 +939,6 @@ +@@ -942,39 +942,6 @@ Include\internal\mimalloc @@ -101,7 +101,7 @@ index 649ee1859ff..6fb1a6b5d0f 100644 Include\internal -@@ -1643,39 +1610,6 @@ +@@ -1646,39 +1613,6 @@ Objects diff --git a/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch b/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch index 59cdc5f35..efc46aa8c 100644 --- a/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch +++ b/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch @@ -10,7 +10,7 @@ This bloats our exe and our modules a lot. 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure -index d03f7d1c341..d6da4cf6632 100755 +index 1c7a694..ac58bc5 100755 --- a/configure +++ b/configure @@ -5852,9 +5852,9 @@ if test $ac_test_CFLAGS; then @@ -35,7 +35,7 @@ index d03f7d1c341..d6da4cf6632 100755 ;; *) diff --git a/configure.ac b/configure.ac -index f57e87983d2..7cbb5f3d524 100644 +index 022ff40..6a9f525 100644 --- a/configure.ac +++ b/configure.ac @@ -2390,7 +2390,7 @@ then diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch index 0984e39df..cc96e3c77 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -11,7 +11,7 @@ Subject: [PATCH 18/28] Unvendor expat 4 files changed, 8 insertions(+), 138 deletions(-) diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index c33e8e3c232..f47bcd8e4e6 100644 +index a991b2a..045b7c6 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -93,40 +93,19 @@ @@ -60,7 +60,7 @@ index c33e8e3c232..f47bcd8e4e6 100644 diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters -index 2ce694e1b53..88a13faa683 100644 +index 54ccfbf..391d266 100644 --- a/PCbuild/_elementtree.vcxproj.filters +++ b/PCbuild/_elementtree.vcxproj.filters @@ -17,78 +17,10 @@ @@ -143,7 +143,7 @@ index 2ce694e1b53..88a13faa683 100644 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index 1858e9c60dd..8bc1bcec7e8 100644 +index 0fc97ec..3361802 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -90,28 +90,19 @@ @@ -180,7 +180,7 @@ index 1858e9c60dd..8bc1bcec7e8 100644 diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters -index baa06e4491f..b8280b4049c 100644 +index 6685e91..c60ee93 100644 --- a/PCbuild/pyexpat.vcxproj.filters +++ b/PCbuild/pyexpat.vcxproj.filters @@ -11,42 +11,10 @@ diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index 9cc56f636..4f064bbe6 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -15,7 +15,7 @@ Drop unused build dependency on ``readelf``. 1 file changed, 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index f24b41db6f0..524f59dc81d 100644 +index 95fefcc..3709016 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -38,7 +38,6 @@ CC= @CC@ diff --git a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch index 64ae9281d..23b9fd687 100644 --- a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch +++ b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch @@ -10,10 +10,10 @@ Subject: [PATCH 20/28] Don't checksharedmods if cross-compiling create mode 100755 if_runnable.sh diff --git a/Makefile.pre.in b/Makefile.pre.in -index 524f59dc81d..ed3ad2f4f05 100644 +index 3709016..c0d77a5 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1638,7 +1638,7 @@ checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) +@@ -1639,7 +1639,7 @@ checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) else \ $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py --generate-missing-stdlib-info; \ fi @@ -24,7 +24,7 @@ index 524f59dc81d..ed3ad2f4f05 100644 rundsymutil: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) diff --git a/if_runnable.sh b/if_runnable.sh new file mode 100755 -index 00000000000..dcfde5b751e +index 0000000..dcfde5b --- /dev/null +++ b/if_runnable.sh @@ -0,0 +1,10 @@ diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch index 76ff98bbf..069f80d5f 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -8,15 +8,15 @@ Subject: [PATCH 21/28] Override configure LIBFFI 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index d6da4cf6632..6f4f996a0aa 100755 +index ac58bc5..a800960 100755 --- a/configure +++ b/configure -@@ -15937,7 +15937,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes +@@ -15959,7 +15959,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes then : have_libffi=yes -- LIBFFI_CFLAGS="-I${SDKROOT}/usr/include/ffi -DUSING_APPLE_OS_LIBFFI=1" -+ LIBFFI_CFLAGS="-I${PREFIX}/include -DUSING_APPLE_OS_LIBFFI=0" - LIBFFI_LIBS="-lffi" +- LIBFFI_CFLAGS=${LIBFFI_CFLAGS-"-I${SDKROOT}/usr/include/ffi -DUSING_APPLE_OS_LIBFFI=1"} ++ LIBFFI_CFLAGS=${LIBFFI_CFLAGS-"-I${PREFIX}/include -DUSING_APPLE_OS_LIBFFI=0"} + LIBFFI_LIBS=${LIBFFI_LIBS-"-lffi"} fi diff --git a/recipe/patches/0022-Unvendor-libmpdec.patch b/recipe/patches/0022-Unvendor-libmpdec.patch index ec481a373..898564337 100644 --- a/recipe/patches/0022-Unvendor-libmpdec.patch +++ b/recipe/patches/0022-Unvendor-libmpdec.patch @@ -8,7 +8,7 @@ Subject: [PATCH 22/28] Unvendor libmpdec 1 file changed, 7 insertions(+), 44 deletions(-) diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj -index 921d22e47b3..0f49d7923f5 100644 +index 44e1caf..bc4642b 100644 --- a/PCbuild/_decimal.vcxproj +++ b/PCbuild/_decimal.vcxproj @@ -93,64 +93,27 @@ diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch index f4ef28ca5..06cef4381 100644 --- a/recipe/patches/0023-Brand-conda-forge.patch +++ b/recipe/patches/0023-Brand-conda-forge.patch @@ -9,7 +9,7 @@ Subject: [PATCH 23/28] Brand conda-forge 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py -index 37278847c0a..d419716825b 100644 +index 3727884..d419716 100644 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -1146,6 +1146,7 @@ def _sys_version(sys_version=None): @@ -21,7 +21,7 @@ index 37278847c0a..d419716825b 100644 r'(?:,\s*([\w ]*)' # ", builddate" r'(?:,\s*([\w :]*))?)?\)\s*' # ", buildtime)" diff --git a/Python/getversion.c b/Python/getversion.c -index 8d8bc6ea700..2fc5c13dbfb 100644 +index 8d8bc6e..2fc5c13 100644 --- a/Python/getversion.c +++ b/Python/getversion.c @@ -15,9 +15,9 @@ void _Py_InitVersion(void) diff --git a/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch b/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch index 9672af3a5..44ae5508f 100644 --- a/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch +++ b/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch @@ -15,7 +15,7 @@ Subject: [PATCH 24/28] Do not define pid_t as it might conflict with the 7 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Modules/_testcapi/long.c b/Modules/_testcapi/long.c -index 008a7d37726..7829e9cc714 100644 +index 008a7d3..7829e9c 100644 --- a/Modules/_testcapi/long.c +++ b/Modules/_testcapi/long.c @@ -6,6 +6,10 @@ @@ -30,7 +30,7 @@ index 008a7d37726..7829e9cc714 100644 module _testcapi [clinic start generated code]*/ diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c -index f6009e7e73f..fd46b1ef170 100644 +index f6009e7..fd46b1e 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -15,6 +15,10 @@ @@ -45,7 +45,7 @@ index f6009e7e73f..fd46b1ef170 100644 # error "The public headers should not include , see gh-90904" #endif diff --git a/Modules/_testlimitedcapi/long.c b/Modules/_testlimitedcapi/long.c -index 1654f9210e1..0c456d91e92 100644 +index 1654f92..0c456d9 100644 --- a/Modules/_testlimitedcapi/long.c +++ b/Modules/_testlimitedcapi/long.c @@ -10,6 +10,10 @@ @@ -60,7 +60,7 @@ index 1654f9210e1..0c456d91e92 100644 module _testlimitedcapi [clinic start generated code]*/ diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h -index 242934b2175..49f5e469266 100644 +index 242934b..49f5e46 100644 --- a/Modules/clinic/posixmodule.c.h +++ b/Modules/clinic/posixmodule.c.h @@ -10,6 +10,10 @@ preserve @@ -75,7 +75,7 @@ index 242934b2175..49f5e469266 100644 "stat($module, /, path, *, dir_fd=None, follow_symlinks=True)\n" "--\n" diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 1a6d6982478..df090ddb98b 100644 +index 7cddbe7..be7cd9a 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -224,6 +224,7 @@ @@ -87,7 +87,7 @@ index 1a6d6982478..df090ddb98b 100644 diff --git a/PC/pyconfig.h b/PC/pyconfig.h -index b5069328796..fe213640fb1 100644 +index b506932..fe21364 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -252,8 +252,6 @@ typedef _W64 int Py_ssize_t; @@ -100,7 +100,7 @@ index b5069328796..fe213640fb1 100644 #if _MSC_VER >= 1200 /* This file only exists in VC 6.0 or higher */ diff --git a/Python/remote_debug.h b/Python/remote_debug.h -index ca6e9067622..a1eb4fb956b 100644 +index ca6e906..a1eb4fb 100644 --- a/Python/remote_debug.h +++ b/Python/remote_debug.h @@ -28,6 +28,9 @@ extern "C" { diff --git a/recipe/patches/0025-Unvendor-zstd.patch b/recipe/patches/0025-Unvendor-zstd.patch index 72b7d303a..8143e6ad7 100644 --- a/recipe/patches/0025-Unvendor-zstd.patch +++ b/recipe/patches/0025-Unvendor-zstd.patch @@ -9,7 +9,7 @@ Subject: [PATCH 25/28] Unvendor zstd 2 files changed, 6 insertions(+), 209 deletions(-) diff --git a/PCbuild/_zstd.vcxproj b/PCbuild/_zstd.vcxproj -index 683a44535ca..fa113b0cd87 100644 +index 5f5122b..f4ac5be 100644 --- a/PCbuild/_zstd.vcxproj +++ b/PCbuild/_zstd.vcxproj @@ -95,76 +95,26 @@ @@ -94,7 +94,7 @@ index 683a44535ca..fa113b0cd87 100644 diff --git a/PCbuild/_zstd.vcxproj.filters b/PCbuild/_zstd.vcxproj.filters -index eec666e5eaf..5028bb5592d 100644 +index 8d7bde3..8c4b868 100644 --- a/PCbuild/_zstd.vcxproj.filters +++ b/PCbuild/_zstd.vcxproj.filters @@ -30,96 +30,6 @@ @@ -199,9 +199,8 @@ index eec666e5eaf..5028bb5592d 100644 Header Files - -+ - Header Files\zstd - +- Header Files\zstd +- - - Header Files\zstd - @@ -263,8 +262,9 @@ index eec666e5eaf..5028bb5592d 100644 - Header Files\zstd - - -- Header Files\zstd -- ++ + Header Files\zstd + - + Header Files\zstd diff --git a/recipe/patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch b/recipe/patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch index 6ef99c31e..936904cb7 100644 --- a/recipe/patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch +++ b/recipe/patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch @@ -11,7 +11,7 @@ luxury of not having to do that. 1 file changed, 2 insertions(+) diff --git a/PC/pyconfig.h b/PC/pyconfig.h -index fe213640fb1..86bf84fa2d6 100644 +index fe21364..86bf84f 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -110,6 +110,8 @@ WIN32 is still required for the locale module. diff --git a/recipe/patches/0027-More-unixy-layout-for-windows.patch b/recipe/patches/0027-More-unixy-layout-for-windows.patch index b6fa1eabd..9312fd340 100644 --- a/recipe/patches/0027-More-unixy-layout-for-windows.patch +++ b/recipe/patches/0027-More-unixy-layout-for-windows.patch @@ -12,7 +12,7 @@ See https://github.com/conda-forge/cfep/pull/65 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Lib/site.py b/Lib/site.py -index 89e136d7b10..5bc762fdd03 100644 +index 89e136d..5bc762f 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -770,6 +770,7 @@ def getsitepackages(prefixes=None): @@ -24,10 +24,10 @@ index 89e136d7b10..5bc762fdd03 100644 sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) return sitepackages diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index fc99cd14af2..c26660f439a 100644 +index fc99cd1..c26660f 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py -@@ -58,6 +58,16 @@ +@@ -58,6 +58,16 @@ _INSTALL_SCHEMES = { 'scripts': '{base}/Scripts', 'data': '{base}', }, @@ -54,10 +54,10 @@ index fc99cd14af2..c26660f439a 100644 'user': 'nt_user', } diff --git a/Modules/getpath.py b/Modules/getpath.py -index a809396a3a4..1edd24009fc 100644 +index a043970..2d5b7a7 100644 --- a/Modules/getpath.py +++ b/Modules/getpath.py -@@ -190,9 +190,9 @@ +@@ -190,9 +190,9 @@ if os_name == 'posix' or os_name == 'darwin': elif os_name == 'nt': BUILDDIR_TXT = 'pybuilddir.txt' DEFAULT_PROGRAM_NAME = f'python' @@ -70,7 +70,7 @@ index a809396a3a4..1edd24009fc 100644 VENV_LANDMARK = 'pyvenv.cfg' ZIP_LANDMARK = f'python{VERSION_MAJOR}{VERSION_MINOR}{PYDEBUGEXT or ""}.zip' diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index 93a0e270a93..26e810c09a4 100644 +index a50eaac..437b2f2 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -129,7 +129,7 @@ diff --git a/recipe/patches/0028-Avoid-erroring-when-conda-site.pth-has-non-existent-.patch b/recipe/patches/0028-Avoid-erroring-when-conda-site.pth-has-non-existent-.patch index 60fde0a55..a065dab7e 100644 --- a/recipe/patches/0028-Avoid-erroring-when-conda-site.pth-has-non-existent-.patch +++ b/recipe/patches/0028-Avoid-erroring-when-conda-site.pth-has-non-existent-.patch @@ -12,10 +12,10 @@ directories in python conda package. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/site.py b/Lib/site.py -index 5bc762fdd03..737ab0165fe 100644 +index 5bc762f..737ab01 100644 --- a/Lib/site.py +++ b/Lib/site.py -@@ -489,7 +489,7 @@ def _extend_syspath(self): +@@ -489,7 +489,7 @@ class StartupState: # do a final anti-duplication check. if dir_ in sys.path: continue From fbd9c579da0872b2c34da5243cfa8f11b1414fe8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 26 Oct 2026 06:09:39 +0000 Subject: [PATCH 3/3] MNT: Re-rendered with conda-smithy 2026.10.24 and conda-forge-pinning 2026.10.25.07.44.23 Other tools: - conda-build 26.9.1 - rattler-build 0.77.0 - rattler-build-conda-compat 1.4.22 --- ...nda-forge_python_debugfreethreadingno.yaml | 2 ++ ...da-forge_python_debugfreethreadingyes.yaml | 2 ++ ...argetsconda-forge_mainfreethreadingno.yaml | 2 ++ ...rgetsconda-forge_mainfreethreadingyes.yaml | 2 ++ ...nda-forge_python_debugfreethreadingno.yaml | 2 ++ ...da-forge_python_debugfreethreadingyes.yaml | 2 ++ ...argetsconda-forge_mainfreethreadingno.yaml | 2 ++ ...rgetsconda-forge_mainfreethreadingyes.yaml | 2 ++ ...nda-forge_python_debugfreethreadingno.yaml | 2 ++ ...da-forge_python_debugfreethreadingyes.yaml | 2 ++ ...argetsconda-forge_mainfreethreadingno.yaml | 2 ++ ...rgetsconda-forge_mainfreethreadingyes.yaml | 2 ++ ...nda-forge_python_debugfreethreadingno.yaml | 2 ++ ...da-forge_python_debugfreethreadingyes.yaml | 2 ++ ...argetsconda-forge_mainfreethreadingno.yaml | 2 ++ ...rgetsconda-forge_mainfreethreadingyes.yaml | 2 ++ .circleci/config.yml | 25 ------------------- .scripts/run_docker_build.sh | 7 +++++- 18 files changed, 38 insertions(+), 26 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index fa0af3a4c..44d5d314a 100644 --- a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - debug bzip2: diff --git a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index 79d28f24f..d2e580dd8 100644 --- a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - debug bzip2: diff --git a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index 63585fb85..ea98a28d2 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - release bzip2: diff --git a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index 368edaf86..2f6040122 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - release bzip2: diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index e932fe9bc..cb6c116fe 100644 --- a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/aarch64 build_type: - debug bzip2: diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index 59fa4dfb0..11f760b9c 100644 --- a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/aarch64 build_type: - debug bzip2: diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index f929ba628..e74422039 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/aarch64 build_type: - release bzip2: diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index d2507b1a2..46fc2577e 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/aarch64 build_type: - release bzip2: diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index 65c1cd857..19455c6f7 100644 --- a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - debug bzip2: diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index 81dd895db..1844409a5 100644 --- a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - debug bzip2: diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index f7d2fe719..36cdbaac8 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - release bzip2: diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index a8618aa68..043e126b8 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - release bzip2: diff --git a/.ci_support/linux_riscv64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/linux_riscv64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index 5b727b3d3..8581314b9 100644 --- a/.ci_support/linux_riscv64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/linux_riscv64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - debug bzip2: diff --git a/.ci_support/linux_riscv64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/linux_riscv64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index 121c96d4c..6a9560c63 100644 --- a/.ci_support/linux_riscv64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/linux_riscv64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - debug bzip2: diff --git a/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index b34c09f86..6def524ee 100644 --- a/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - release bzip2: diff --git a/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index 740e5851c..7847ecba1 100644 --- a/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - release bzip2: diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 8b4ef2f99..000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,25 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: jinja-yaml -*- - -version: 2 - -jobs: - build: - working_directory: ~/test - machine: - image: ubuntu-2004:current - steps: - - run: - # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. - command: exit 0 - -workflows: - version: 2 - build_and_test: - jobs: - - build: - filters: - branches: - ignore: - - /.*/ diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 4715f5df4..67c42c717 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -69,6 +69,11 @@ if [ -z "${DOCKER_IMAGE}" ]; then fi fi +if [ -z "${DOCKER_PLATFORM}" ]; then + # this is set unconditionally in the variant configs -> no fallback + DOCKER_PLATFORM=$(cat .ci_support/${CONFIG}.yaml | grep '^DOCKER_PLATFORM:$' -A 1 | tail -n 1 | cut -b 3-) +fi + mkdir -p "$ARTIFACTS" DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" rm -f "$DONE_CANARY" @@ -110,7 +115,7 @@ fi export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" export IS_PR_BUILD="${IS_PR_BUILD:-False}" -${DOCKER_EXECUTABLE} pull "${DOCKER_IMAGE}" +${DOCKER_EXECUTABLE} pull --platform ${DOCKER_PLATFORM} "${DOCKER_IMAGE}" ${DOCKER_EXECUTABLE} run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw${VOLUME_SUFFIX},delegated \