From 2e7e5852c12668520a06fd78964d2ec469ef62c9 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 4 Oct 2026 21:58:24 +1100 Subject: [PATCH 1/3] python v3.15.0rc3 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e9ce845e4..320bb7dd1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,10 +1,10 @@ {% set version = "3.15.0" %} -{% set dev = "rc2" %} +{% set dev = "rc3" %} {% set dev_ = "" %} {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.join(version.split('.')[0:2]) %} {% set ver3nd = ''.join(version.split('.')[0:3]) %} -{% set build_number = 3 %} +{% set build_number = 0 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} @@ -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: 8d93af5eaaaea5adfd41bd786a7ba3f03f2ad1ab57c6a65e0b963deab91d5ad7 + sha256: 506630aa66d5441188f34df22c0760bfe87fc92212630493ebc9ff3b3a7a1d49 patches: - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch - patches/0002-Win32-Do-not-download-externals.patch From 338325a3ebfda67515478a7415c2a9424f5a675b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 4 Oct 2026 22:03:14 +1100 Subject: [PATCH 2/3] MNT: Re-rendered with conda-smithy 2026.9.23 and conda-forge-pinning 2026.10.03.16.10.39 Other tools: - conda-build 26.7.1 - rattler-build 0.76.1 - rattler-build-conda-compat 1.4.19 --- .scripts/build_steps.sh | 2 +- .scripts/run_osx_build.sh | 2 +- .scripts/run_win_build.bat | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 484acddad..28dfd13df 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -36,7 +36,7 @@ mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d- echo > /opt/conda/conda-meta/history micromamba install --root-prefix ~/.conda --prefix /opt/conda \ --yes --override-channels --channel conda-forge --strict-channel-priority \ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=26.3" + pip python=3.14 conda-build conda-forge-ci-setup=4 "conda-build>=26.3" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 # set up the condarc diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9d7c39125..aff5569d0 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,7 +26,7 @@ chmod +x "${micromamba_exe}" echo "Creating environment" "${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ --channel conda-forge \ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=26.3" + pip python=3.14 conda-build conda-forge-ci-setup=4 "conda-build>=26.3" echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" echo "Cleaning up micromamba" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 06f61b83b..e11c3ecf8 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -31,7 +31,7 @@ if !errorlevel! neq 0 exit /b !errorlevel! echo Creating environment call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefix "%MINIFORGE_HOME%" ^ --channel conda-forge ^ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=26.3" + pip python=3.14 conda-build conda-forge-ci-setup=4 "conda-build>=26.3" if !errorlevel! neq 0 exit /b !errorlevel! echo Removing %MAMBA_ROOT_PREFIX% del /S /Q "%MAMBA_ROOT_PREFIX%" >nul @@ -42,7 +42,8 @@ call :start_group "Configuring conda" :: Activate the base conda environment echo Activating environment -call "%MINIFORGE_HOME%\Scripts\activate.bat" +set "CONDA_EXE=%MINIFORGE_HOME%\Scripts\conda.exe" +call "%MINIFORGE_HOME%\condabin\conda.bat" activate "%MINIFORGE_HOME%" :: Configure the solver set "CONDA_SOLVER=libmamba" if !errorlevel! neq 0 exit /b !errorlevel! From aad14b2c00e83265f7b0cf1ff838d26a6e4b5534 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 4 Oct 2026 22:06:42 +1100 Subject: [PATCH 3/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 | 2 +- ...-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch | 2 +- recipe/patches/0005-Unvendor-openssl.patch | 10 +++--- recipe/patches/0006-Unvendor-sqlite3.patch | 4 +-- ...dd-CondaEcosystemModifyDllSearchPath.patch | 2 +- recipe/patches/0008-Doing-d1trimfile.patch | 12 +++---- .../patches/0009-cross-compile-darwin.patch | 2 +- .../patches/0010-Fix-TZPATH-on-windows.patch | 2 +- ...ch-work-with-SYSTEM_VERSION_COMPAT-1.patch | 2 +- recipe/patches/0012-Unvendor-bzip2.patch | 2 +- recipe/patches/0013-Unvendor-libffi.patch | 2 +- recipe/patches/0014-Unvendor-tcltk.patch | 2 +- recipe/patches/0015-unvendor-xz.patch | 2 +- recipe/patches/0016-unvendor-zlib.patch | 6 ++-- ...-not-pass-g-to-GCC-when-not-Py_DEBUG.patch | 2 +- recipe/patches/0018-Unvendor-expat.patch | 36 +++++++++++-------- .../patches/0019-Remove-unused-readelf.patch | 4 +-- ...t-checksharedmods-if-cross-compiling.patch | 6 ++-- .../0021-Override-configure-LIBFFI.patch | 2 +- recipe/patches/0022-Unvendor-libmpdec.patch | 2 +- recipe/patches/0023-Brand-conda-forge.patch | 2 +- ...d_t-as-it-might-conflict-with-the-ac.patch | 8 ++--- recipe/patches/0025-Unvendor-zstd.patch | 12 +++---- ...IL_DISABLED-in-windows-to-match-unix.patch | 4 +-- .../0027-More-unixy-layout-for-windows.patch | 4 +-- ...hen-conda-site.pth-has-non-existent-.patch | 4 +-- 28 files changed, 75 insertions(+), 67 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 f360128d6..14a4d8a59 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 @@ -1,4 +1,4 @@ -From e95e0a73e03308457d942b25ac76b32b0b51ffd4 Mon Sep 17 00:00:00 2001 +From f036da29fb98192e03f2ba45f3ee933dedb3d5e1 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 Subject: [PATCH 01/28] Win32: Change FD_SETSIZE from 512 to 2048 diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch index 5ee0343b4..e2ee4d02c 100644 --- a/recipe/patches/0002-Win32-Do-not-download-externals.patch +++ b/recipe/patches/0002-Win32-Do-not-download-externals.patch @@ -1,4 +1,4 @@ -From ad969c54aedf9c19fbf569d02314384e7de13b8c Mon Sep 17 00:00:00 2001 +From c3814cb69a533516ace23cd5645cc21b55dfb3ef Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 Subject: [PATCH 02/28] Win32: Do not download externals 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 f8d4e6656..7b955c2aa 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 @@ -1,4 +1,4 @@ -From 67873a5edb37fb95f73ab578833b2b48ef4f12bc Mon Sep 17 00:00:00 2001 +From a043e5d152f9110fab42a6d24d5d1a8ede2cb055 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 Subject: [PATCH 03/28] Fix find_library so that it looks in sys.prefix/lib 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 82caa6c40..398edb73c 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 @@ -1,4 +1,4 @@ -From f61c190e56bb0cb6afdbc42588bbaf1d71e78e55 Mon Sep 17 00:00:00 2001 +From 8d5123e3e8e0b938278e17661a93881948f3a58e Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 Subject: [PATCH 04/28] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index c47959da5..8d17b3477 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,4 +1,4 @@ -From 77ba27c403b83b8decb4b429acca2d7fe8c723bf Mon Sep 17 00:00:00 2001 +From c6e469fbdfc12ded2f67d804763239ac83d24a93 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 Subject: [PATCH 05/28] Unvendor openssl @@ -90,7 +90,7 @@ index 7ca750dda8f..17eee400ebb 100644 diff --git a/PCbuild/python.props b/PCbuild/python.props -index 79f705a1ed3..744ce0c540a 100644 +index 4c49decd749..744ce0c540a 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -91,6 +91,7 @@ @@ -105,15 +105,15 @@ index 79f705a1ed3..744ce0c540a 100644 -- $(ExternalsDir)sqlite-3.53.2.0\ +- $(ExternalsDir)sqlite-3.53.4.0\ - $(ExternalsDir)bzip2-1.0.8\ - $(ExternalsDir)xz-5.8.1.1\ - $(ExternalsDir)libffi-3.4.4\ - $(libffiDir)$(ArchName)\ - $(libffiOutDir)include $(ExternalsDir)\mpdecimal-4.0.0\ -- $(ExternalsDir)openssl-3.5.8\ -- $(ExternalsDir)openssl-bin-3.5.8\$(ArchName)\ +- $(ExternalsDir)openssl-3.5.9\ +- $(ExternalsDir)openssl-bin-3.5.9\$(ArchName)\ - $(opensslOutDir)include $(ExternalsDir)\nasm-2.11.06\ - $(ExternalsDir)\zlib-1.3.1\ diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index 3a609d919..7a0706fe9 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,4 +1,4 @@ -From 3bd33db3159bcb94e8ce9f7a48ac0df84556a926 Mon Sep 17 00:00:00 2001 +From 60582444706c3594dced8ffa4c995b1c026f0feb Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 5 Oct 2021 12:42:06 -0700 Subject: [PATCH 06/28] Unvendor sqlite3 @@ -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 f12ec348b37..f9e5e449a49 100644 +index 0673e03a59f..97a4c46dea1 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 8972bc279..f861ac0fe 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,4 +1,4 @@ -From 6e76f78cab111f236fe785853e258f512eb35f46 Mon Sep 17 00:00:00 2001 +From 0ecdd0d7cccafe5bbd4cd1b739e12d9fc682bf8e Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 Subject: [PATCH 07/28] Add CondaEcosystemModifyDllSearchPath() diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch index 2a6fae549..3d6fed7b9 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,4 +1,4 @@ -From c9dc7c03105009a19e1cb5ff2011c0a0a629df23 Mon Sep 17 00:00:00 2001 +From 034737d36e140ecde4957b323b00355bac2ac2af Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 Subject: [PATCH 08/28] Doing d1trimfile @@ -164,7 +164,7 @@ index 3ba49370d58..921d22e47b3 100644 diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index 46e34a5ea82..fb1589557da 100644 +index c102da85e9c..8d5117e804c 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -94,7 +94,11 @@ @@ -650,7 +650,7 @@ index 75d4e162346..d50534affa1 100644 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index 8a60ee15eb4..6518e0e1b1c 100644 +index cf60976266e..91aa7e7bcc3 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -92,6 +92,10 @@ @@ -753,7 +753,7 @@ index 3f8772d30b4..d80968e351a 100644 windowsapp.lib;%(AdditionalDependencies) diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index e255ed5af19..e2f8f42449a 100644 +index d246c910b9c..9026236144d 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -99,7 +99,7 @@ @@ -854,11 +854,11 @@ index d7448fd4d72..a51c71d2b72 100644 diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj -index f9e5e449a49..16ed999655a 100644 +index 97a4c46dea1..7d270c3a712 100644 --- a/PCbuild/sqlite3.vcxproj +++ b/PCbuild/sqlite3.vcxproj @@ -101,6 +101,10 @@ - SQLITE_ENABLE_MATH_FUNCTIONS;SQLITE_ENABLE_FTS4;SQLITE_ENABLE_FTS5;SQLITE_ENABLE_RTREE;SQLITE_OMIT_AUTOINIT;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) + SQLITE_ENABLE_MATH_FUNCTIONS;SQLITE_ENABLE_FTS4;SQLITE_ENABLE_FTS5;SQLITE_ENABLE_PERCENTILE;SQLITE_ENABLE_RTREE;SQLITE_OMIT_AUTOINIT;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) Level1 %(AdditionalOptions) -Wno-unused + /d1trimfile:%SRC_DIR% diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch index 2a64d1e26..e6533e692 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -1,4 +1,4 @@ -From 9b841181c0a1b959571cf68d228f7c26f57aeb00 Mon Sep 17 00:00:00 2001 +From e522947fd26f992e906ce80067b509cb07e14681 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 2 Oct 2020 00:03:12 +0200 Subject: [PATCH 09/28] cross compile darwin diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch index af9e84ca3..d28011560 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,4 +1,4 @@ -From a9a2c4ac4a1d090474e3df7537898928c7841970 Mon Sep 17 00:00:00 2001 +From 16b2404d97e0a2a5a09d9d7943b6aef5e6f2e29b Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 7 Oct 2020 10:08:30 -0500 Subject: [PATCH 10/28] Fix TZPATH on windows 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 2f1d91b6a..aafec93ab 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 @@ -1,4 +1,4 @@ -From c0bb28ea8003febd169d7297c315eb958925b3fb Mon Sep 17 00:00:00 2001 +From 58bee50e598d18abc841d74102b052dee06084b2 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 Subject: [PATCH 11/28] Make dyld search work with SYSTEM_VERSION_COMPAT=1 diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch index a803cc69c..f0341a46c 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,4 +1,4 @@ -From 2ec29cc1dc08eb9b66673791156f934ebbab850e Mon Sep 17 00:00:00 2001 +From ebb7c4084ca6bc89e512d96d2d057444305da55c Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:56:27 -0700 Subject: [PATCH 12/28] Unvendor bzip2 diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index 63ae8db79..24871485b 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,4 +1,4 @@ -From 83082ba2e827a70616d6ae004330b5971edac912 Mon Sep 17 00:00:00 2001 +From 411909b55113d3b07f50c2d927cd7b247f3506fb Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 03:07:40 -0700 Subject: [PATCH 13/28] Unvendor libffi diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index ba91f5e5b..8f89c7f54 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,4 +1,4 @@ -From d993304749fe79be43f2b79779634d094b37adf6 Mon Sep 17 00:00:00 2001 +From 66e5f45333fe6effba089bd6e55cdd4b683a9aac Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 Subject: [PATCH 14/28] Unvendor tcltk diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index 23e19810f..af39d985c 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,4 +1,4 @@ -From 1e1c8f160f5fa727b41708c7e05f15bf0610acea Mon Sep 17 00:00:00 2001 +From 54e3897771052b39045328958207c38e1c9c4d4b Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 25 Sep 2021 10:07:05 -0700 Subject: [PATCH 15/28] unvendor xz diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index e29bd789a..1993cd8e4 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,4 +1,4 @@ -From 2ebbbf0c454c154c4b280f1435b522e758e00017 Mon Sep 17 00:00:00 2001 +From 98b031c2700f7059d1a92f3e0cf84683d01b7b33 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Sep 2021 15:21:55 -0700 Subject: [PATCH 16/28] unvendor zlib @@ -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 e2f8f42449a..7d5432d5428 100644 +index 9026236144d..93a0e270a93 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -82,7 +82,7 @@ @@ -44,7 +44,7 @@ index e2f8f42449a..7d5432d5428 100644 -@@ -711,12 +711,6 @@ +@@ -714,12 +714,6 @@ 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 b2dd1c0bf..5b78cb918 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 @@ -1,4 +1,4 @@ -From d264355d5dc63ae4ed78c59ea6ed55b44136895d Mon Sep 17 00:00:00 2001 +From fe4a58ba38770c91be8059a36c029bb795bc4547 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 Subject: [PATCH 17/28] Do not pass -g to GCC when not Py_DEBUG diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch index e0cbcf318..5eef37d25 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,20 +1,20 @@ -From 582496505ba2472b09bf0ab16c84c335fb1d1299 Mon Sep 17 00:00:00 2001 +From 6d757c6ead828ac2f9d6318de6995c00fa2fb1b8 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Mar 2023 23:07:10 -0500 Subject: [PATCH 18/28] Unvendor expat --- - PCbuild/_elementtree.vcxproj | 26 ++---------- - PCbuild/_elementtree.vcxproj.filters | 59 ---------------------------- - PCbuild/pyexpat.vcxproj | 14 ++----- - PCbuild/pyexpat.vcxproj.filters | 23 ----------- - 4 files changed, 8 insertions(+), 114 deletions(-) + PCbuild/_elementtree.vcxproj | 27 ++---------- + PCbuild/_elementtree.vcxproj.filters | 62 ---------------------------- + PCbuild/pyexpat.vcxproj | 15 ++----- + PCbuild/pyexpat.vcxproj.filters | 26 ------------ + 4 files changed, 8 insertions(+), 122 deletions(-) diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index fb1589557da..f47bcd8e4e6 100644 +index 8d5117e804c..f47bcd8e4e6 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj -@@ -93,37 +93,19 @@ +@@ -93,38 +93,19 @@ @@ -37,6 +37,7 @@ index fb1589557da..f47bcd8e4e6 100644 - - - +- - - - @@ -57,10 +58,10 @@ index fb1589557da..f47bcd8e4e6 100644 diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters -index f6b55d8ff82..88a13faa683 100644 +index 9e2e062af3f..88a13faa683 100644 --- a/PCbuild/_elementtree.vcxproj.filters +++ b/PCbuild/_elementtree.vcxproj.filters -@@ -17,69 +17,10 @@ +@@ -17,72 +17,10 @@ {f99990ba-cd06-40cc-8f28-d2d424ec13be} @@ -83,6 +84,9 @@ index f6b55d8ff82..88a13faa683 100644 - - Header Files\expat - +- +- Header Files\expat +- - - Header Files\expat - @@ -131,10 +135,10 @@ index f6b55d8ff82..88a13faa683 100644 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index 6518e0e1b1c..8bc1bcec7e8 100644 +index 91aa7e7bcc3..8bc1bcec7e8 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj -@@ -90,25 +90,19 @@ +@@ -90,26 +90,19 @@ @@ -152,6 +156,7 @@ index 6518e0e1b1c..8bc1bcec7e8 100644 - - +- - - - @@ -165,10 +170,10 @@ index 6518e0e1b1c..8bc1bcec7e8 100644 diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters -index 230531033fc..b8280b4049c 100644 +index e63cb9c6306..b8280b4049c 100644 --- a/PCbuild/pyexpat.vcxproj.filters +++ b/PCbuild/pyexpat.vcxproj.filters -@@ -11,33 +11,10 @@ +@@ -11,36 +11,10 @@ {f1dbbdb5-41e5-4a88-bf8e-13da010c0ce4} @@ -176,6 +181,9 @@ index 230531033fc..b8280b4049c 100644 - - Header Files - +- +- Header Files +- - - Header Files - diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index 266abc67e..b993fb383 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,4 +1,4 @@ -From 3c035b8b04d7fa837a0912024e22149809f4c600 Mon Sep 17 00:00:00 2001 +From 5d0b85ab49e3cfce165ac59d5b283d51f8e26194 Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Thu, 25 May 2023 17:56:53 -0400 Subject: [PATCH 19/28] Remove unused readelf @@ -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 8008a96c1c8..5174b36bc53 100644 +index 965244d8d2d..f46a928c041 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 5fd0c5698..ce1ad81b7 100644 --- a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch +++ b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch @@ -1,4 +1,4 @@ -From 008fdd3f752b3fe982568fb1cd64b5ff7e6cb247 Mon Sep 17 00:00:00 2001 +From d4d7227aec72cf2aecd80a483e4fe2d6db1ce147 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 1 Sep 2023 23:32:14 +0200 Subject: [PATCH 20/28] Don't checksharedmods if cross-compiling @@ -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 5174b36bc53..374c3e7a70d 100644 +index f46a928c041..959a60a2545 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1633,7 +1633,7 @@ checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) +@@ -1634,7 +1634,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 diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch index f202b06af..8245f19a3 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,4 +1,4 @@ -From 81a665c32708446040a8e7027f5cd055d3a3b5f5 Mon Sep 17 00:00:00 2001 +From 483e5af6aecebeaa323605583f71f81f611123b8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 5 Sep 2023 21:51:31 +0200 Subject: [PATCH 21/28] Override configure LIBFFI diff --git a/recipe/patches/0022-Unvendor-libmpdec.patch b/recipe/patches/0022-Unvendor-libmpdec.patch index 1799feb73..969f0c883 100644 --- a/recipe/patches/0022-Unvendor-libmpdec.patch +++ b/recipe/patches/0022-Unvendor-libmpdec.patch @@ -1,4 +1,4 @@ -From 6029f9ecbe49223b420cf3ca11079f7f9e9b889f Mon Sep 17 00:00:00 2001 +From 85be2e40204e9a2909a277053d162491af6a5081 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 16 Aug 2024 21:34:43 -0500 Subject: [PATCH 22/28] Unvendor libmpdec diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch index 6285d51b2..dd179a72e 100644 --- a/recipe/patches/0023-Brand-conda-forge.patch +++ b/recipe/patches/0023-Brand-conda-forge.patch @@ -1,4 +1,4 @@ -From 672365583e924051e1d8c872c07e931874f53b89 Mon Sep 17 00:00:00 2001 +From 425e320c7ae7d14d202a14265d5424ed4409e111 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 28 Aug 2024 11:12:22 -0500 Subject: [PATCH 23/28] Brand conda-forge 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 b4d96fd41..6c65e9a76 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 @@ -1,4 +1,4 @@ -From 5e2c4d517b9d1e2fa44cd968a4431e76328cb678 Mon Sep 17 00:00:00 2001 +From af8523b5164ba313ec188ea4221a534098da3ed9 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 12 Jan 2025 10:37:29 +0530 Subject: [PATCH 24/28] Do not define pid_t as it might conflict with the @@ -87,10 +87,10 @@ index 0b42b059541..a8aff655bd1 100644 diff --git a/PC/pyconfig.h b/PC/pyconfig.h -index 72a475777b7..5149fbcf301 100644 +index b5069328796..fe213640fb1 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h -@@ -240,8 +240,6 @@ typedef _W64 int Py_ssize_t; +@@ -252,8 +252,6 @@ typedef _W64 int Py_ssize_t; #endif #endif /* MS_WIN32 && !MS_WIN64 */ @@ -100,7 +100,7 @@ index 72a475777b7..5149fbcf301 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 7b7380d25bf..0d89e46d054 100644 +index 16229df936f..adb2d7cd993 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 26c3ace82..0febbe202 100644 --- a/recipe/patches/0025-Unvendor-zstd.patch +++ b/recipe/patches/0025-Unvendor-zstd.patch @@ -1,4 +1,4 @@ -From af283d80bfd8f4a436b5878b5799464decb191ea Mon Sep 17 00:00:00 2001 +From 598bd6641e4a50d986bb2912e209e47bf9bb8ab2 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 22 Jul 2025 18:07:54 +0200 Subject: [PATCH 25/28] Unvendor zstd @@ -199,8 +199,9 @@ index eec666e5eaf..5028bb5592d 100644 Header Files - -- Header Files\zstd -- ++ + Header Files\zstd + - - Header Files\zstd - @@ -262,9 +263,8 @@ 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 628a8a3f8..734b8eb3f 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 @@ -1,4 +1,4 @@ -From 0791111ac5c17432198ec0559e7bf3c177035981 Mon Sep 17 00:00:00 2001 +From 751bf20a02e156f540b80cb0271dba6085cf855e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 2 Dec 2025 09:46:56 -0800 Subject: [PATCH 26/28] Set Py_GIL_DISABLED in windows to match unix @@ -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 5149fbcf301..52892d685cc 100644 +index fe213640fb1..86bf84fa2d6 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 8844fa9d2..c9d3b5719 100644 --- a/recipe/patches/0027-More-unixy-layout-for-windows.patch +++ b/recipe/patches/0027-More-unixy-layout-for-windows.patch @@ -1,4 +1,4 @@ -From 4afb736175deba9cf91b711b823012dcc8c945e7 Mon Sep 17 00:00:00 2001 +From c51382c26fffcc9d5dc2d7815c045f86c1d26a41 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 22 May 2026 14:21:19 -0700 Subject: [PATCH 27/28] More unixy layout for windows @@ -70,7 +70,7 @@ index e237c58d6bc..4ccd9179e84 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 7d5432d5428..aaf80b13a89 100644 +index 93a0e270a93..26e810c09a4 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 37c307001..2aec69c46 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 @@ -1,4 +1,4 @@ -From 84630de65fe4921946048e098a610e75918f23d5 Mon Sep 17 00:00:00 2001 +From 7dfb525de572ea1f5aeb329c9226efa921855131 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 1 Sep 2026 17:23:36 -0700 Subject: [PATCH 28/28] Avoid erroring when conda-site.pth has non-existent @@ -12,7 +12,7 @@ directories in python conda package. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/site.py b/Lib/site.py -index 5bc762fdd03..e8a26868444 100644 +index 5bc762fdd03..737ab0165fe 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -489,7 +489,7 @@ def _extend_syspath(self):