diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8a0cff09..4604385f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -99,6 +99,7 @@ source: - patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch {% endif %} - patches/0027-More-unixy-layout-for-windows.patch + - patches/0028-Avoid-erroring-when-conda-site.pth-has-non-existent-.patch build: number: {{ build_number }} 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 9a58073e..f360128d 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,7 +1,7 @@ -From b51c74365f2f62c84d2f174c2d68e38ca4e16765 Mon Sep 17 00:00:00 2001 +From e95e0a73e03308457d942b25ac76b32b0b51ffd4 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 -Subject: [PATCH 01/27] Win32: Change FD_SETSIZE from 512 to 2048 +Subject: [PATCH 01/28] Win32: Change FD_SETSIZE from 512 to 2048 https://github.com/ContinuumIO/anaconda-issues/issues/1241 --- diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch index f1298ce1..5ee0343b 100644 --- a/recipe/patches/0002-Win32-Do-not-download-externals.patch +++ b/recipe/patches/0002-Win32-Do-not-download-externals.patch @@ -1,7 +1,7 @@ -From dbc1c91f800e11a162eb14c42c806564802ba167 Mon Sep 17 00:00:00 2001 +From ad969c54aedf9c19fbf569d02314384e7de13b8c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 -Subject: [PATCH 02/27] Win32: Do not download externals +Subject: [PATCH 02/28] Win32: Do not download externals --- PCbuild/build.bat | 2 +- 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 b2533caa..f8d4e665 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,7 +1,7 @@ -From 028de8f3d29a0aec65b80d36c00faf975268c9c0 Mon Sep 17 00:00:00 2001 +From 67873a5edb37fb95f73ab578833b2b48ef4f12bc Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 -Subject: [PATCH 03/27] Fix find_library so that it looks in sys.prefix/lib +Subject: [PATCH 03/28] Fix find_library so that it looks in sys.prefix/lib first --- 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 a70b23b3..82caa6c4 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,7 +1,7 @@ -From b57538bcca07d9195b7d47eb3536baa36fdc2908 Mon Sep 17 00:00:00 2001 +From f61c190e56bb0cb6afdbc42588bbaf1d71e78e55 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 -Subject: [PATCH 04/27] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS +Subject: [PATCH 04/28] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS is not 0 Co-authored-by: Isuru Fernando diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index 822ce4fe..c47959da 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,7 +1,7 @@ -From 8650098599959095301e15c2cecf74da06e709c3 Mon Sep 17 00:00:00 2001 +From 77ba27c403b83b8decb4b429acca2d7fe8c723bf Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 -Subject: [PATCH 05/27] Unvendor openssl +Subject: [PATCH 05/28] Unvendor openssl Co-authored-by: Isuru Fernando --- diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index 4d34774f..3a609d91 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,7 +1,7 @@ -From 75dc2785a2034779d3cc6853822356f447f00d84 Mon Sep 17 00:00:00 2001 +From 3bd33db3159bcb94e8ce9f7a48ac0df84556a926 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 5 Oct 2021 12:42:06 -0700 -Subject: [PATCH 06/27] Unvendor sqlite3 +Subject: [PATCH 06/28] Unvendor sqlite3 --- PCbuild/_sqlite3.vcxproj | 9 ++++----- diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index fd88fa19..8972bc27 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,7 +1,7 @@ -From 7a3599e45ce0e457d8c17ba47ac180d1388d4d03 Mon Sep 17 00:00:00 2001 +From 6e76f78cab111f236fe785853e258f512eb35f46 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 -Subject: [PATCH 07/27] Add CondaEcosystemModifyDllSearchPath() +Subject: [PATCH 07/28] Add CondaEcosystemModifyDllSearchPath() The python interpreter is modifed so that it works as if the python interpreter was called with the following conda directories. diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch index ab21da5b..2a6fae54 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,7 +1,7 @@ -From 691c214c845462b7a49266e568312946a80dcd67 Mon Sep 17 00:00:00 2001 +From c9dc7c03105009a19e1cb5ff2011c0a0a629df23 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 -Subject: [PATCH 08/27] Doing d1trimfile +Subject: [PATCH 08/28] Doing d1trimfile --- PCbuild/_asyncio.vcxproj | 20 ++++++++++++++++++++ diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch index 39f0e760..2a64d1e2 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -1,7 +1,7 @@ -From 3c3434e2e741c2c2bf1a9a4bab9d71dc6d1935c1 Mon Sep 17 00:00:00 2001 +From 9b841181c0a1b959571cf68d228f7c26f57aeb00 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 2 Oct 2020 00:03:12 +0200 -Subject: [PATCH 09/27] cross compile darwin +Subject: [PATCH 09/28] cross compile darwin By Isuru Fernando. --- diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch index e45be6e3..af9e84ca 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,7 +1,7 @@ -From aab9fadd4195b340be1eed7152f2de1242939a6e Mon Sep 17 00:00:00 2001 +From a9a2c4ac4a1d090474e3df7537898928c7841970 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 7 Oct 2020 10:08:30 -0500 -Subject: [PATCH 10/27] Fix TZPATH on windows +Subject: [PATCH 10/28] Fix TZPATH on windows --- Lib/sysconfig/__init__.py | 2 ++ 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 ed95965d..2f1d91b6 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,7 +1,7 @@ -From 724d20af3df5662b352ec3c18bc7b45db157cd6e Mon Sep 17 00:00:00 2001 +From c0bb28ea8003febd169d7297c315eb958925b3fb Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 -Subject: [PATCH 11/27] Make dyld search work with SYSTEM_VERSION_COMPAT=1 +Subject: [PATCH 11/28] Make dyld search work with SYSTEM_VERSION_COMPAT=1 In macOS Big Sur, if the executable was compiled with `MACOSX_DEPLOYMENT_TARGET=10.15` or below, then SYSTEM_VERSION_COMPAT=1 is the default which means that Big Sur diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch index 6a709fb7..a803cc69 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,7 +1,7 @@ -From 1ced7d55db59f46781fe0e12548a5adc464b7ba1 Mon Sep 17 00:00:00 2001 +From 2ec29cc1dc08eb9b66673791156f934ebbab850e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:56:27 -0700 -Subject: [PATCH 12/27] Unvendor bzip2 +Subject: [PATCH 12/28] Unvendor bzip2 --- PCbuild/_bz2.vcxproj | 15 +++++---------- diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index 5f8ba2d0..63ae8db7 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,7 +1,7 @@ -From edca283a374525e9b4faa0d9f8542ffa4affb5bd Mon Sep 17 00:00:00 2001 +From 83082ba2e827a70616d6ae004330b5971edac912 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 03:07:40 -0700 -Subject: [PATCH 13/27] Unvendor libffi +Subject: [PATCH 13/28] Unvendor libffi --- PCbuild/libffi.props | 15 +++------------ diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index ad4039e7..ba91f5e5 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,7 +1,7 @@ -From 889a90193669f738dca1a7b8e6be73eae5e32001 Mon Sep 17 00:00:00 2001 +From d993304749fe79be43f2b79779634d094b37adf6 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 -Subject: [PATCH 14/27] Unvendor tcltk +Subject: [PATCH 14/28] Unvendor tcltk --- PCbuild/_tkinter.vcxproj | 6 ------ diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index 35913267..23e19810 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,7 +1,7 @@ -From ffa2c3c2a6771f1a924bb67d55c7a2265d2bc16d Mon Sep 17 00:00:00 2001 +From 1e1c8f160f5fa727b41708c7e05f15bf0610acea Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 25 Sep 2021 10:07:05 -0700 -Subject: [PATCH 15/27] unvendor xz +Subject: [PATCH 15/28] unvendor xz --- PCbuild/_lzma.vcxproj | 10 +++------- diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index cfe65a60..e29bd789 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,7 +1,7 @@ -From cd2d9d38cfeed1e5a8dd7aa9a91358353f6a8025 Mon Sep 17 00:00:00 2001 +From 2ebbbf0c454c154c4b280f1435b522e758e00017 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Sep 2021 15:21:55 -0700 -Subject: [PATCH 16/27] unvendor zlib +Subject: [PATCH 16/28] unvendor zlib --- PCbuild/pythoncore.vcxproj | 14 ++----- 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 a7f464f7..b2dd1c0b 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,7 +1,7 @@ -From 65cafcd546fc3f9989bcced6cf3b258ef7504e6c Mon Sep 17 00:00:00 2001 +From d264355d5dc63ae4ed78c59ea6ed55b44136895d Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 -Subject: [PATCH 17/27] Do not pass -g to GCC when not Py_DEBUG +Subject: [PATCH 17/28] Do not pass -g to GCC when not Py_DEBUG This bloats our exe and our modules a lot. --- diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch index 154c5569..e0cbcf31 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,7 +1,7 @@ -From 54fc26859353a5361f603c88f704b17e5726b147 Mon Sep 17 00:00:00 2001 +From 582496505ba2472b09bf0ab16c84c335fb1d1299 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Mar 2023 23:07:10 -0500 -Subject: [PATCH 18/27] Unvendor expat +Subject: [PATCH 18/28] Unvendor expat --- PCbuild/_elementtree.vcxproj | 26 ++---------- diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index ff73be2d..266abc67 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,7 +1,7 @@ -From 0e65951e0e93ff7d6835f1b561ce37717b816a4f Mon Sep 17 00:00:00 2001 +From 3c035b8b04d7fa837a0912024e22149809f4c600 Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Thu, 25 May 2023 17:56:53 -0400 -Subject: [PATCH 19/27] Remove unused readelf +Subject: [PATCH 19/28] Remove unused readelf readelf has been dropped. .. date: 2022-11-02-10-56-40 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 42c31a9e..5fd0c569 100644 --- a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch +++ b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch @@ -1,7 +1,7 @@ -From dc47a794138f800714283dc19cbf896406afb7ca Mon Sep 17 00:00:00 2001 +From 008fdd3f752b3fe982568fb1cd64b5ff7e6cb247 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 1 Sep 2023 23:32:14 +0200 -Subject: [PATCH 20/27] Don't checksharedmods if cross-compiling +Subject: [PATCH 20/28] Don't checksharedmods if cross-compiling --- Makefile.pre.in | 2 +- diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch index cd461d6d..f202b06a 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,7 +1,7 @@ -From ef6353504192f7cdc868c49dec3bcf39200655a9 Mon Sep 17 00:00:00 2001 +From 81a665c32708446040a8e7027f5cd055d3a3b5f5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 5 Sep 2023 21:51:31 +0200 -Subject: [PATCH 21/27] Override configure LIBFFI +Subject: [PATCH 21/28] Override configure LIBFFI --- configure | 2 +- diff --git a/recipe/patches/0022-Unvendor-libmpdec.patch b/recipe/patches/0022-Unvendor-libmpdec.patch index ae319a9e..1799feb7 100644 --- a/recipe/patches/0022-Unvendor-libmpdec.patch +++ b/recipe/patches/0022-Unvendor-libmpdec.patch @@ -1,7 +1,7 @@ -From 0b8863c5e493e62060b90a6f7ee08d241f0872c2 Mon Sep 17 00:00:00 2001 +From 6029f9ecbe49223b420cf3ca11079f7f9e9b889f Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 16 Aug 2024 21:34:43 -0500 -Subject: [PATCH 22/27] Unvendor libmpdec +Subject: [PATCH 22/28] Unvendor libmpdec --- PCbuild/_decimal.vcxproj | 51 ++++++---------------------------------- diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch index 8e2b090c..6285d51b 100644 --- a/recipe/patches/0023-Brand-conda-forge.patch +++ b/recipe/patches/0023-Brand-conda-forge.patch @@ -1,7 +1,7 @@ -From 27bed0708db7fc097428e303aeb9e219c9111304 Mon Sep 17 00:00:00 2001 +From 672365583e924051e1d8c872c07e931874f53b89 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 28 Aug 2024 11:12:22 -0500 -Subject: [PATCH 23/27] Brand conda-forge +Subject: [PATCH 23/28] Brand conda-forge --- Lib/platform.py | 1 + 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 73f48300..b4d96fd4 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,7 +1,7 @@ -From e23a12e19347d11d8bb04e3a752b0d47b30bf79f Mon Sep 17 00:00:00 2001 +From 5e2c4d517b9d1e2fa44cd968a4431e76328cb678 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 12 Jan 2025 10:37:29 +0530 -Subject: [PATCH 24/27] Do not define pid_t as it might conflict with the +Subject: [PATCH 24/28] Do not define pid_t as it might conflict with the actual definition --- diff --git a/recipe/patches/0025-Unvendor-zstd.patch b/recipe/patches/0025-Unvendor-zstd.patch index 3a84b0fe..26c3ace8 100644 --- a/recipe/patches/0025-Unvendor-zstd.patch +++ b/recipe/patches/0025-Unvendor-zstd.patch @@ -1,7 +1,7 @@ -From ea36797c92b325459e176e6856a03b9ce1d2335c Mon Sep 17 00:00:00 2001 +From af283d80bfd8f4a436b5878b5799464decb191ea Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 22 Jul 2025 18:07:54 +0200 -Subject: [PATCH 25/27] Unvendor zstd +Subject: [PATCH 25/28] Unvendor zstd --- PCbuild/_zstd.vcxproj | 58 +------------ @@ -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 2ac6b7c1..628a8a3f 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,7 +1,7 @@ -From 22389266909ab9f32571100e4b7c338aba13561d Mon Sep 17 00:00:00 2001 +From 0791111ac5c17432198ec0559e7bf3c177035981 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 2 Dec 2025 09:46:56 -0800 -Subject: [PATCH 26/27] Set Py_GIL_DISABLED in windows to match unix +Subject: [PATCH 26/28] Set Py_GIL_DISABLED in windows to match unix This is not set upstream because the windows distribution supports free-threaded and default builds at the same time. We have the diff --git a/recipe/patches/0027-More-unixy-layout-for-windows.patch b/recipe/patches/0027-More-unixy-layout-for-windows.patch index 4fb9cc76..8844fa9d 100644 --- a/recipe/patches/0027-More-unixy-layout-for-windows.patch +++ b/recipe/patches/0027-More-unixy-layout-for-windows.patch @@ -1,7 +1,7 @@ -From a8d05c46483270c807cf22d5487f70b8997cbc31 Mon Sep 17 00:00:00 2001 +From 4afb736175deba9cf91b711b823012dcc8c945e7 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 22 May 2026 14:21:19 -0700 -Subject: [PATCH 27/27] More unixy layout for windows +Subject: [PATCH 27/28] More unixy layout for windows See https://github.com/conda-forge/cfep/pull/65 --- 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 new file mode 100644 index 00000000..37c30700 --- /dev/null +++ b/recipe/patches/0028-Avoid-erroring-when-conda-site.pth-has-non-existent-.patch @@ -0,0 +1,26 @@ +From 84630de65fe4921946048e098a610e75918f23d5 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 + directories + +We add lib/python3.14/site-packages for the freethreading builds +because of conda, mamba bugs and we don't want to create these +directories in python conda package. +--- + Lib/site.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Lib/site.py b/Lib/site.py +index 5bc762fdd03..e8a26868444 100644 +--- a/Lib/site.py ++++ b/Lib/site.py +@@ -489,7 +489,7 @@ def _extend_syspath(self): + # do a final anti-duplication check. + if dir_ in sys.path: + continue +- if filename is None or os.path.exists(dir_): ++ if filename is None or os.path.exists(dir_) or os.path.basename(filename) == "conda-site.pth": + if filename is not None: + _trace(f"Extending sys.path with {dir_} from {filename}") + sys.path.append(dir_)