From 69f94887dab948888fa0365eeb98e7e706791db8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 5 Feb 2025 09:47:54 +1100 Subject: [PATCH 1/5] python v3.13.2 --- recipe/meta.yaml | 8 +++++--- ...-Win32-Change-FD_SETSIZE-from-512-to-2048.patch | 2 +- .../0002-Win32-Do-not-download-externals.patch | 2 +- ...brary-so-that-it-looks-in-sys.prefix-lib-.patch | 2 +- ...istry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch | 2 +- recipe/patches/0005-Unvendor-openssl.patch | 2 +- recipe/patches/0006-Unvendor-sqlite3.patch | 2 +- ...007-Add-CondaEcosystemModifyDllSearchPath.patch | 10 +++++----- recipe/patches/0008-Doing-d1trimfile.patch | 6 +++--- recipe/patches/0009-cross-compile-darwin.patch | 14 +++++++------- recipe/patches/0010-Fix-TZPATH-on-windows.patch | 6 +++--- ...-search-work-with-SYSTEM_VERSION_COMPAT-1.patch | 4 ++-- recipe/patches/0012-Unvendor-bzip2.patch | 2 +- 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 | 2 +- ...17-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch | 12 ++++++------ recipe/patches/0018-Unvendor-expat.patch | 2 +- recipe/patches/0019-Remove-unused-readelf.patch | 4 ++-- ...-Don-t-checksharedmods-if-cross-compiling.patch | 4 ++-- .../patches/0021-Override-configure-LIBFFI.patch | 6 +++--- recipe/patches/0022-Unvendor-libmpdec.patch | 2 +- recipe/patches/0023-Brand-conda-forge.patch | 6 +++--- ...ne-pid_t-as-it-might-conflict-with-the-ac.patch | 2 +- 25 files changed, 56 insertions(+), 54 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1638bec7d..7758a569c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,10 +1,10 @@ -{% set version = "3.13.1" %} +{% set version = "3.13.2" %} {% set dev = "" %} {% 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 = 5 %} +{% set build_number = 0 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} @@ -46,7 +46,7 @@ package: source: - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz # md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}{{ dev }}/ - md5: 80c16badb94ffe235280d4d9a099b8bc + md5: 4c2d9202ab4db02c9d0999b14655dfe5 patches: - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch - patches/0002-Win32-Do-not-download-externals.patch @@ -75,6 +75,8 @@ source: {% if 'conda-forge' in channel_targets %} - patches/0023-Brand-conda-forge.patch {% endif %} + # not ready yet, see #770 + # - patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.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 b1840d358..8f945f3f7 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 dac2f3b33cbb97245660be0269f2dd015b7b8d06 Mon Sep 17 00:00:00 2001 +From bd6a844b045e3da9fac3fdda6d262c44df935c93 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 Subject: [PATCH 01/24] 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 c2c19664f..7e807edcf 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 7158d078f72cd29ad01301f762c4b3aaaf3a2d51 Mon Sep 17 00:00:00 2001 +From b454c45bc3a10ee4dcacbcbaedac3d435571c75c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 Subject: [PATCH 02/24] 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 f4cc42d2a..596e56275 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 df36d349debe414f5b9d7d0ba937f5faff3ac486 Mon Sep 17 00:00:00 2001 +From 48a20f6fc2bafa3fef743b2d75d46ea29a6c76b9 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 Subject: [PATCH 03/24] 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 68d0272e3..e374943d6 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 6121895c5d1b342b37cc0873176d047347189cf7 Mon Sep 17 00:00:00 2001 +From d5ef808db5a8d89e36babc8bba27d9833f48879c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 Subject: [PATCH 04/24] 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 cb807043b..8055d4151 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,4 +1,4 @@ -From ab54f63b3341cfe20d64bb536c63e1fcf14e619b Mon Sep 17 00:00:00 2001 +From 6f69b0440cf3eccda2bed832bd985287248ff6b3 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 Subject: [PATCH 05/24] Unvendor openssl diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index c8217f562..bddecdd06 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,4 +1,4 @@ -From 57d675669a6ebb5fdc5d329332993b018f706108 Mon Sep 17 00:00:00 2001 +From e2e509bbbad24186a2810a64840fb31c4caafbff Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 5 Oct 2021 12:42:06 -0700 Subject: [PATCH 06/24] Unvendor sqlite3 diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index bacf4ab14..6c783b473 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,4 +1,4 @@ -From 655f497ed88c7bb9288bbaba0a6da899c1de8df6 Mon Sep 17 00:00:00 2001 +From 2d93b3366d9e42cd62b70cbfdf89e64a1ea4e65e Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 Subject: [PATCH 07/24] Add CondaEcosystemModifyDllSearchPath() @@ -33,10 +33,10 @@ Co-authored-by: Isuru Fernando 1 file changed, 96 insertions(+) diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c -index 1701a1cd217..e9dba44f800 100644 +index ba835ef4c84..9e35e0ff000 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c -@@ -60,6 +60,10 @@ +@@ -79,6 +79,10 @@ #ifdef MS_WINDOWS # undef BYTE @@ -47,7 +47,7 @@ index 1701a1cd217..e9dba44f800 100644 #endif #define PUTS(fd, str) (void)_Py_write_noraise(fd, str, (int)strlen(str)) -@@ -106,6 +110,94 @@ __attribute__ ((section (".PyRuntime"))) +@@ -128,6 +132,94 @@ __attribute__ ((section (".PyRuntime"))) = _PyRuntimeState_INIT(_PyRuntime, _Py_Debug_Cookie); _Py_COMP_DIAG_POP @@ -142,7 +142,7 @@ index 1701a1cd217..e9dba44f800 100644 static int runtime_initialized = 0; PyStatus -@@ -122,6 +214,10 @@ _PyRuntime_Initialize(void) +@@ -144,6 +236,10 @@ _PyRuntime_Initialize(void) } runtime_initialized = 1; diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch index 8729576b4..ff7868a4f 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,4 +1,4 @@ -From 69e659ffc9565bc3a81d01f66aa021fcfaa80e49 Mon Sep 17 00:00:00 2001 +From 01dd68be0e26dfbf1ec8532d94c97b6ca1b2c7f1 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 Subject: [PATCH 08/24] Doing d1trimfile @@ -888,12 +888,12 @@ index 1193e032245..6855845d131 100644 PY_ICON;%(PreprocessorDefinitions) diff --git a/PCbuild/venvwlauncher.vcxproj b/PCbuild/venvwlauncher.vcxproj -index 1b617182013..4eecc214aa5 100644 +index db7128272f0..b0f54192eae 100644 --- a/PCbuild/venvwlauncher.vcxproj +++ b/PCbuild/venvwlauncher.vcxproj @@ -94,6 +94,10 @@ - EXENAME=L"$(PyExeName)$(PyDebugExt).exe";_WINDOWS;%(PreprocessorDefinitions) + EXENAME=L"$(PyWExeName)$(PyDebugExt).exe";_WINDOWS;%(PreprocessorDefinitions) MultiThreaded + /d1trimfile:%SRC_DIR% + /d1trimfile:%SRC_DIR% diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch index 4223449bb..922b6d8ba 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -1,4 +1,4 @@ -From 12fa37b4a106af3e57d87f7cfda2e5cd1f41b502 Mon Sep 17 00:00:00 2001 +From 2efd1bb74bafb1d530913d6cc63d11ef48a38344 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 2 Oct 2020 00:03:12 +0200 Subject: [PATCH 09/24] cross compile darwin @@ -11,10 +11,10 @@ By Isuru Fernando. 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Lib/platform.py b/Lib/platform.py -index 5958382276e..44264f0c812 100755 +index 8895177e326..fd93841d034 100755 --- a/Lib/platform.py +++ b/Lib/platform.py -@@ -459,7 +459,12 @@ def win32_ver(release='', version='', csd='', ptype=''): +@@ -460,7 +460,12 @@ def win32_ver(release='', version='', csd='', ptype=''): def _mac_ver_xml(): fn = '/System/Library/CoreServices/SystemVersion.plist' if not os.path.exists(fn): @@ -29,10 +29,10 @@ index 5958382276e..44264f0c812 100755 try: import plistlib diff --git a/configure b/configure -index 7cdd386c387..a75a8f825fe 100755 +index 1cd1f690f7b..603108eb031 100755 --- a/configure +++ b/configure -@@ -4048,6 +4048,9 @@ then +@@ -4052,6 +4052,9 @@ then *-*-linux*) ac_sys_system=Linux ;; @@ -42,7 +42,7 @@ index 7cdd386c387..a75a8f825fe 100755 *-*-cygwin*) ac_sys_system=Cygwin ;; -@@ -4496,6 +4499,9 @@ if test "$cross_compiling" = yes; then +@@ -4500,6 +4503,9 @@ if test "$cross_compiling" = yes; then _host_ident=$host_cpu esac ;; @@ -53,7 +53,7 @@ index 7cdd386c387..a75a8f825fe 100755 _host_ident= ;; diff --git a/configure.ac b/configure.ac -index 24e28a1e2de..3772d105fb2 100644 +index 3fcb18922c5..fd3cba43283 100644 --- a/configure.ac +++ b/configure.ac @@ -324,6 +324,9 @@ then diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch index 18b7bfc0c..7232d41b9 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,4 +1,4 @@ -From 68f86b5cd9c77aaccdf285e4d820060c3bd5d0b3 Mon Sep 17 00:00:00 2001 +From 80fa2b3750ebe23002706dfb2c0364068536b2ca Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 7 Oct 2020 10:08:30 -0500 Subject: [PATCH 10/24] Fix TZPATH on windows @@ -8,10 +8,10 @@ Subject: [PATCH 10/24] Fix TZPATH on windows 1 file changed, 1 insertion(+) diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index 80aef344711..f31706d7a6b 100644 +index 7bcb737ff2c..09f3a18f751 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py -@@ -479,6 +479,7 @@ def _init_config_vars(): +@@ -492,6 +492,7 @@ def _init_config_vars(): if os.name == 'nt': _init_non_posix(_CONFIG_VARS) _CONFIG_VARS['VPATH'] = sys._vpath 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 55cac74a1..86bb06098 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 116ad2f8e5e26cd72d4d67652c1fe79b79b01092 Mon Sep 17 00:00:00 2001 +From 8402c3cdd855e9027bb0def5ffa790f34c6e0450 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 Subject: [PATCH 11/24] Make dyld search work with SYSTEM_VERSION_COMPAT=1 @@ -15,7 +15,7 @@ as that part is compiled with `MACOSX_DEPLOYMENT_TARGET=11.0`) 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c -index cbed2f32caa..f717b1f4d18 100644 +index f9864ebb735..c413621f01b 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -1489,7 +1489,7 @@ copy_com_pointer(PyObject *self, PyObject *args) diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch index 8a5bfaab7..d88b52e69 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,4 +1,4 @@ -From d8c238906a7544c841e3d422b44f1b3157d02e34 Mon Sep 17 00:00:00 2001 +From 244296bc52fb71cddf1a62c06edbfe9ed62091c2 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:56:27 -0700 Subject: [PATCH 12/24] Unvendor bzip2 diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index 4a8bc434a..d57d262ec 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,4 +1,4 @@ -From 1ae3603a02b8d478732915257a5827926e8a0974 Mon Sep 17 00:00:00 2001 +From ff31583a6d5ced9de722f7f598fb13396a882c95 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 03:07:40 -0700 Subject: [PATCH 13/24] Unvendor libffi diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index 9902f3dd7..7cad28665 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,4 +1,4 @@ -From c82917b47035e936b2b9ebf35fdc54593e78dbf3 Mon Sep 17 00:00:00 2001 +From edd613346e2c8588712b407108d72563894daa3a Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 Subject: [PATCH 14/24] Unvendor tcltk @@ -26,7 +26,7 @@ index 5ca877b5f2e..4ee4ff6d619 100644 diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props -index 95b699b4cac..7aa8ef582c7 100644 +index 2aa3b7a1e42..81299f3a7dc 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -12,12 +12,11 @@ diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index f817440f7..eb5a1c64c 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,4 +1,4 @@ -From 5fe6c7efee65427246e795ba2b936ea104365057 Mon Sep 17 00:00:00 2001 +From f0a784090e55dbad37fb5b7eee8dccf81b4a01b5 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 25 Sep 2021 10:07:05 -0700 Subject: [PATCH 15/24] unvendor xz diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index 76faaa8da..fcaa9aa9d 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,4 +1,4 @@ -From 177810b9912a9f10c2cb4c1682badd7ebdc15234 Mon Sep 17 00:00:00 2001 +From 3cc65f6deece46e63f166aef1b79cc2df4443b7a Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Sep 2021 15:21:55 -0700 Subject: [PATCH 16/24] unvendor zlib 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 3d6f37b73..429e81ca7 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 00400877a37f4f611379147bf1f01a500495f4e0 Mon Sep 17 00:00:00 2001 +From 62732a53f6b9d1de39e6d336d5b78a48cc2702ef Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 Subject: [PATCH 17/24] Do not pass -g to GCC when not Py_DEBUG @@ -10,10 +10,10 @@ This bloats our exe and our modules a lot. 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure -index a75a8f825fe..dbe946b1e8c 100755 +index 603108eb031..a4df798edca 100755 --- a/configure +++ b/configure -@@ -5667,9 +5667,9 @@ if test $ac_test_CFLAGS; then +@@ -5671,9 +5671,9 @@ if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -25,7 +25,7 @@ index a75a8f825fe..dbe946b1e8c 100755 fi else if test "$GCC" = yes; then -@@ -9505,7 +9505,7 @@ then +@@ -9522,7 +9522,7 @@ then if test "$Py_DEBUG" = 'true' ; then OPT="-g $PYDEBUG_CFLAGS -Wall" else @@ -35,10 +35,10 @@ index a75a8f825fe..dbe946b1e8c 100755 ;; *) diff --git a/configure.ac b/configure.ac -index 3772d105fb2..50188f25e59 100644 +index fd3cba43283..b747715f637 100644 --- a/configure.ac +++ b/configure.ac -@@ -2365,7 +2365,7 @@ then +@@ -2389,7 +2389,7 @@ then if test "$Py_DEBUG" = 'true' ; then OPT="-g $PYDEBUG_CFLAGS -Wall" else diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch index 1bb1aec21..89a31eb63 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,4 +1,4 @@ -From 6b6b59052caff823e0404b44cf3962467576bba3 Mon Sep 17 00:00:00 2001 +From 7d89c32f0fdf1816ae908e8a015145820ca4f3c8 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Mar 2023 23:07:10 -0500 Subject: [PATCH 18/24] Unvendor expat diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index 001970977..0d68f18c5 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,4 +1,4 @@ -From 97b20be9d1f08b21255f59e72eaceb2df7256d36 Mon Sep 17 00:00:00 2001 +From 1f085aef761818ef89f26d94bacdbbc5bde47e9e Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Thu, 25 May 2023 17:56:53 -0400 Subject: [PATCH 19/24] 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 538229220fd..a2c954d9609 100644 +index 46a37ded970..b17ed9d7bd7 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 833cf7ddf..4aaa3f87d 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 cbc6af129157df051115bf5d8f3097d0a01ef8d7 Mon Sep 17 00:00:00 2001 +From 8805a5c94bec40b704277043400c83f17ff55175 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 1 Sep 2023 23:32:14 +0200 Subject: [PATCH 20/24] Don't checksharedmods if cross-compiling @@ -10,7 +10,7 @@ Subject: [PATCH 20/24] Don't checksharedmods if cross-compiling create mode 100755 if_runnable.sh diff --git a/Makefile.pre.in b/Makefile.pre.in -index a2c954d9609..53e7a24127a 100644 +index b17ed9d7bd7..aa84c6aa392 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1367,7 +1367,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch index 798ac24f5..64f7d08bb 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,4 +1,4 @@ -From b6bb9f0ab8ce0938f64a50d9c402b30f2a464c8c Mon Sep 17 00:00:00 2001 +From 3ba51c9932fa5aa18984d470dceca02cff783546 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 5 Sep 2023 21:51:31 +0200 Subject: [PATCH 21/24] Override configure LIBFFI @@ -8,10 +8,10 @@ Subject: [PATCH 21/24] Override configure LIBFFI 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index dbe946b1e8c..514960f5672 100755 +index a4df798edca..cd326e504e7 100755 --- a/configure +++ b/configure -@@ -14273,7 +14273,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes +@@ -14296,7 +14296,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes then : have_libffi=yes diff --git a/recipe/patches/0022-Unvendor-libmpdec.patch b/recipe/patches/0022-Unvendor-libmpdec.patch index ea1e68a86..6ef88f8d6 100644 --- a/recipe/patches/0022-Unvendor-libmpdec.patch +++ b/recipe/patches/0022-Unvendor-libmpdec.patch @@ -1,4 +1,4 @@ -From 2fdc8320aa541722ab3902ec2d33e4eb31e97e91 Mon Sep 17 00:00:00 2001 +From db24db58540d836a8d808f4c3351c3105e95e205 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 16 Aug 2024 21:34:43 -0500 Subject: [PATCH 22/24] Unvendor libmpdec diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch index 2f97f80ee..11e330de2 100644 --- a/recipe/patches/0023-Brand-conda-forge.patch +++ b/recipe/patches/0023-Brand-conda-forge.patch @@ -1,4 +1,4 @@ -From 6007d7de00fab5c2c16e2fd5dfe4165f88c3c5fd Mon Sep 17 00:00:00 2001 +From 2fbec75732aa0189284f852dec837c1d45ee1a7b Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 28 Aug 2024 11:12:22 -0500 Subject: [PATCH 23/24] Brand conda-forge @@ -9,10 +9,10 @@ Subject: [PATCH 23/24] Brand conda-forge 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py -index 44264f0c812..d9e2eb7f1cc 100755 +index fd93841d034..17d59c77025 100755 --- a/Lib/platform.py +++ b/Lib/platform.py -@@ -1197,6 +1197,7 @@ def _sys_version(sys_version=None): +@@ -1198,6 +1198,7 @@ def _sys_version(sys_version=None): cpython_sys_version_parser = re.compile( r'([\w.+]+)\s*' # "version" r'(?:experimental free-threading build\s+)?' # "free-threading-build" 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 69417fe01..5f24edea6 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 4fb09595193ab713507e90ecda0d85e5378f9ca0 Mon Sep 17 00:00:00 2001 +From aec73a621751170cfeded380fb6bc71e31493441 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 12 Jan 2025 10:37:29 +0530 Subject: [PATCH 24/24] Do not define pid_t as it might conflict with the From 9f69660d49483918fa53d70cff746320ac552de9 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 5 Feb 2025 09:56:01 +1100 Subject: [PATCH 2/5] add missing key to match global pinning --- recipe/conda_build_config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 174cfb632..a75d6de35 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -14,6 +14,8 @@ channel_sources: channel_targets: - conda-forge main - conda-forge python_debug # [not win] +is_python_min: + - no freethreading: - yes - no From 37ffa1ad5b52acaf7cc2042e17641e5d421da514 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 5 Feb 2025 09:56:34 +1100 Subject: [PATCH 3/5] MNT: Re-rendered with conda-build 25.1.1, conda-smithy 3.45.4, and conda-forge-pinning 2025.02.04.19.34.29 --- ...sconda-forge_python_debugfreethreadingno.yaml | 2 ++ ...conda-forge_python_debugfreethreadingyes.yaml | 2 ++ ...l_targetsconda-forge_mainfreethreadingno.yaml | 2 ++ ..._targetsconda-forge_mainfreethreadingyes.yaml | 2 ++ ...sconda-forge_python_debugfreethreadingno.yaml | 2 ++ ...conda-forge_python_debugfreethreadingyes.yaml | 2 ++ ...l_targetsconda-forge_mainfreethreadingno.yaml | 2 ++ ..._targetsconda-forge_mainfreethreadingyes.yaml | 2 ++ ...sconda-forge_python_debugfreethreadingno.yaml | 2 ++ ...conda-forge_python_debugfreethreadingyes.yaml | 2 ++ ...l_targetsconda-forge_mainfreethreadingno.yaml | 2 ++ ..._targetsconda-forge_mainfreethreadingyes.yaml | 2 ++ ...sconda-forge_python_debugfreethreadingno.yaml | 2 ++ ...conda-forge_python_debugfreethreadingyes.yaml | 2 ++ ...l_targetsconda-forge_mainfreethreadingno.yaml | 2 ++ ..._targetsconda-forge_mainfreethreadingyes.yaml | 2 ++ ...sconda-forge_python_debugfreethreadingno.yaml | 2 ++ ...conda-forge_python_debugfreethreadingyes.yaml | 2 ++ ...l_targetsconda-forge_mainfreethreadingno.yaml | 2 ++ ..._targetsconda-forge_mainfreethreadingyes.yaml | 2 ++ .ci_support/win_64_freethreadingno.yaml | 2 ++ .ci_support/win_64_freethreadingyes.yaml | 2 ++ .gitignore | 3 +++ README.md | 16 ++++++++-------- 24 files changed, 55 insertions(+), 8 deletions(-) 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 162993526..b38434dc5 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 @@ -28,6 +28,8 @@ freethreading: - 'no' libffi: - '3.4' +liblzma_devel: +- '5' libuuid: - '2' ncurses: 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 753dc9e3a..cb255581d 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 @@ -28,6 +28,8 @@ freethreading: - 'yes' libffi: - '3.4' +liblzma_devel: +- '5' libuuid: - '2' ncurses: 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 8a1d8fba1..f35f88606 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -28,6 +28,8 @@ freethreading: - 'no' libffi: - '3.4' +liblzma_devel: +- '5' libuuid: - '2' ncurses: 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 4dece0f30..151a2924f 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -28,6 +28,8 @@ freethreading: - 'yes' libffi: - '3.4' +liblzma_devel: +- '5' libuuid: - '2' ncurses: 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 ed3105513..2754c8921 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 @@ -28,6 +28,8 @@ freethreading: - 'no' libffi: - '3.4' +liblzma_devel: +- '5' libuuid: - '2' ncurses: 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 0b8451817..871e48636 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 @@ -28,6 +28,8 @@ freethreading: - 'yes' libffi: - '3.4' +liblzma_devel: +- '5' libuuid: - '2' ncurses: 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 35710848b..1cecd3c00 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -28,6 +28,8 @@ freethreading: - 'no' libffi: - '3.4' +liblzma_devel: +- '5' libuuid: - '2' ncurses: 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 5ca583176..017faa51f 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -28,6 +28,8 @@ freethreading: - 'yes' libffi: - '3.4' +liblzma_devel: +- '5' libuuid: - '2' ncurses: 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 f2bb216c8..529d57f70 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 @@ -28,6 +28,8 @@ freethreading: - 'no' libffi: - '3.4' +liblzma_devel: +- '5' libuuid: - '2' ncurses: 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 5f68761fd..6a74b2a20 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 @@ -28,6 +28,8 @@ freethreading: - 'yes' libffi: - '3.4' +liblzma_devel: +- '5' libuuid: - '2' ncurses: 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 e427a9043..af0ace4f2 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -28,6 +28,8 @@ freethreading: - 'no' libffi: - '3.4' +liblzma_devel: +- '5' libuuid: - '2' ncurses: 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 67e960171..ba82b05c0 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -28,6 +28,8 @@ freethreading: - 'yes' libffi: - '3.4' +liblzma_devel: +- '5' libuuid: - '2' ncurses: diff --git a/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index 9f1a40666..307ed5068 100644 --- a/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -28,6 +28,8 @@ freethreading: - 'no' libffi: - '3.4' +liblzma_devel: +- '5' macos_machine: - x86_64-apple-darwin13.4.0 ncurses: diff --git a/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index 41112e788..9a3636cbe 100644 --- a/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -28,6 +28,8 @@ freethreading: - 'yes' libffi: - '3.4' +liblzma_devel: +- '5' macos_machine: - x86_64-apple-darwin13.4.0 ncurses: diff --git a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index 42e26eb3e..9450acee4 100644 --- a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -28,6 +28,8 @@ freethreading: - 'no' libffi: - '3.4' +liblzma_devel: +- '5' macos_machine: - x86_64-apple-darwin13.4.0 ncurses: diff --git a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index e67db238a..6b9ca5f67 100644 --- a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -28,6 +28,8 @@ freethreading: - 'yes' libffi: - '3.4' +liblzma_devel: +- '5' macos_machine: - x86_64-apple-darwin13.4.0 ncurses: diff --git a/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index 15795fcb9..e9b6d9346 100644 --- a/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -28,6 +28,8 @@ freethreading: - 'no' libffi: - '3.4' +liblzma_devel: +- '5' macos_machine: - arm64-apple-darwin20.0.0 ncurses: diff --git a/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index 599c97fbc..5b81ee22c 100644 --- a/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -28,6 +28,8 @@ freethreading: - 'yes' libffi: - '3.4' +liblzma_devel: +- '5' macos_machine: - arm64-apple-darwin20.0.0 ncurses: diff --git a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index 181ce421b..9dceb3282 100644 --- a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -28,6 +28,8 @@ freethreading: - 'no' libffi: - '3.4' +liblzma_devel: +- '5' macos_machine: - arm64-apple-darwin20.0.0 ncurses: diff --git a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index dd594339d..75d62e050 100644 --- a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -28,6 +28,8 @@ freethreading: - 'yes' libffi: - '3.4' +liblzma_devel: +- '5' macos_machine: - arm64-apple-darwin20.0.0 ncurses: diff --git a/.ci_support/win_64_freethreadingno.yaml b/.ci_support/win_64_freethreadingno.yaml index 6f13023d9..e64410b93 100644 --- a/.ci_support/win_64_freethreadingno.yaml +++ b/.ci_support/win_64_freethreadingno.yaml @@ -18,6 +18,8 @@ freethreading: - 'no' libffi: - '3.4' +liblzma_devel: +- '5' openssl: - '3' pin_run_as_build: diff --git a/.ci_support/win_64_freethreadingyes.yaml b/.ci_support/win_64_freethreadingyes.yaml index 84ac75f71..074668793 100644 --- a/.ci_support/win_64_freethreadingyes.yaml +++ b/.ci_support/win_64_freethreadingyes.yaml @@ -18,6 +18,8 @@ freethreading: - 'yes' libffi: - '3.4' +liblzma_devel: +- '5' openssl: - '3' pin_run_as_build: diff --git a/.gitignore b/.gitignore index 179afe55e..bb3853666 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ /build_artifacts *.pyc + +# Rattler-build's artifacts are in `output` when not specifying anything. +/output diff --git a/README.md b/README.md index 7ac556954..85b4bd925 100644 --- a/README.md +++ b/README.md @@ -235,14 +235,14 @@ Current release info Installing python ================= -Installing `python` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `python` from the `conda-forge/label/python_debug` channel can be achieved by adding `conda-forge/label/python_debug` to your channels with: ``` -conda config --add channels conda-forge +conda config --add channels conda-forge/label/python_debug conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `cpython, libpython-static, python, python-freethreading, python-gil, python-jit` can be installed with `conda`: +Once the `conda-forge/label/python_debug` channel has been enabled, `cpython, libpython-static, python, python-freethreading, python-gil, python-jit` can be installed with `conda`: ``` conda install cpython libpython-static python python-freethreading python-gil python-jit @@ -257,26 +257,26 @@ mamba install cpython libpython-static python python-freethreading python-gil py It is possible to list all of the versions of `cpython` available on your platform with `conda`: ``` -conda search cpython --channel conda-forge +conda search cpython --channel conda-forge/label/python_debug ``` or with `mamba`: ``` -mamba search cpython --channel conda-forge +mamba search cpython --channel conda-forge/label/python_debug ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search cpython --channel conda-forge +mamba repoquery search cpython --channel conda-forge/label/python_debug # List packages depending on `cpython`: -mamba repoquery whoneeds cpython --channel conda-forge +mamba repoquery whoneeds cpython --channel conda-forge/label/python_debug # List dependencies of `cpython`: -mamba repoquery depends cpython --channel conda-forge +mamba repoquery depends cpython --channel conda-forge/label/python_debug ``` From 475f0251f7ac09c44c0a87bc031962b110fefb45 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 13 Feb 2025 22:36:12 -0800 Subject: [PATCH 4/5] Organize keys in `conda_build_config.yaml` --- recipe/conda_build_config.yaml | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index a75d6de35..b598257ea 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,24 +1,32 @@ +MACOSX_SDK_VERSION: # [osx and x86_64] + - 11.0 # [osx and x86_64] + +# Override Python `zip_keys` python: - 3.13 -python_impl: - - cpython numpy: - 1.16 -MACOSX_SDK_VERSION: # [osx and x86_64] - - 11.0 # [osx and x86_64] +python_impl: + - cpython +is_python_min: + - no + +# Whether to build free-threaded Python (3.13+) +freethreading: + - yes + - no + +# Use Python RC components in build +channel_sources: + - conda-forge/label/python_rc,conda-forge + +# Configuration for debug and release builds build_type: - release - debug # [not win] -channel_sources: - - conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main - conda-forge python_debug # [not win] -is_python_min: - - no -freethreading: - - yes - - no zip_keys: - build_type - channel_targets From 42b25f8ef2c8e3ad560b3708a7223edab0fc90c0 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2025 06:40:07 +0000 Subject: [PATCH 5/5] MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.45.4, and conda-forge-pinning 2025.02.14.05.02.50 --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 85b4bd925..7ac556954 100644 --- a/README.md +++ b/README.md @@ -235,14 +235,14 @@ Current release info Installing python ================= -Installing `python` from the `conda-forge/label/python_debug` channel can be achieved by adding `conda-forge/label/python_debug` to your channels with: +Installing `python` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: ``` -conda config --add channels conda-forge/label/python_debug +conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge/label/python_debug` channel has been enabled, `cpython, libpython-static, python, python-freethreading, python-gil, python-jit` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `cpython, libpython-static, python, python-freethreading, python-gil, python-jit` can be installed with `conda`: ``` conda install cpython libpython-static python python-freethreading python-gil python-jit @@ -257,26 +257,26 @@ mamba install cpython libpython-static python python-freethreading python-gil py It is possible to list all of the versions of `cpython` available on your platform with `conda`: ``` -conda search cpython --channel conda-forge/label/python_debug +conda search cpython --channel conda-forge ``` or with `mamba`: ``` -mamba search cpython --channel conda-forge/label/python_debug +mamba search cpython --channel conda-forge ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search cpython --channel conda-forge/label/python_debug +mamba repoquery search cpython --channel conda-forge # List packages depending on `cpython`: -mamba repoquery whoneeds cpython --channel conda-forge/label/python_debug +mamba repoquery whoneeds cpython --channel conda-forge # List dependencies of `cpython`: -mamba repoquery depends cpython --channel conda-forge/label/python_debug +mamba repoquery depends cpython --channel conda-forge ```