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 4c95beccf..fa0af3a4c 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 @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '2.17' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge python_debug cxx_compiler: @@ -24,6 +24,8 @@ expat: - '2' freethreading: - 'no' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -42,8 +44,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - linux-64 tk: 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 47bd71b1f..79d28f24f 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 @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '2.17' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge python_debug cxx_compiler: @@ -24,6 +24,8 @@ expat: - '2' freethreading: - 'yes' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -42,8 +44,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - linux-64 tk: 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 e2e3035b5..63585fb85 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '2.17' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -24,6 +24,8 @@ expat: - '2' freethreading: - 'no' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -42,8 +44,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - linux-64 tk: 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 ea597a1b9..368edaf86 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '2.17' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -24,6 +24,8 @@ expat: - '2' freethreading: - 'yes' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -42,8 +44,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - linux-64 tk: 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 870b06779..e932fe9bc 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 @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '2.17' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge python_debug cxx_compiler: @@ -24,6 +24,8 @@ expat: - '2' freethreading: - 'no' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -42,8 +44,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - linux-aarch64 tk: 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 217c1ea52..59fa4dfb0 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 @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '2.17' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge python_debug cxx_compiler: @@ -24,6 +24,8 @@ expat: - '2' freethreading: - 'yes' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -42,8 +44,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - linux-aarch64 tk: 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 a6ea06bf6..f929ba628 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '2.17' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -24,6 +24,8 @@ expat: - '2' freethreading: - 'no' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -42,8 +44,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - linux-aarch64 tk: 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 78641511d..d2507b1a2 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '2.17' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -24,6 +24,8 @@ expat: - '2' freethreading: - 'yes' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -42,8 +44,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - linux-aarch64 tk: 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 576869d72..65c1cd857 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 @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '2.17' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge python_debug cxx_compiler: @@ -24,6 +24,8 @@ expat: - '2' freethreading: - 'no' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -42,8 +44,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - linux-ppc64le zip_keys: 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 350ea0ed1..81dd895db 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 @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '2.17' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge python_debug cxx_compiler: @@ -24,6 +24,8 @@ expat: - '2' freethreading: - 'yes' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -42,8 +44,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - linux-ppc64le zip_keys: 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 10d8f2270..f7d2fe719 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '2.17' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -24,6 +24,8 @@ expat: - '2' freethreading: - 'no' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -42,8 +44,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - linux-ppc64le zip_keys: 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 f9f14e421..a8618aa68 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '2.17' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -24,6 +24,8 @@ expat: - '2' freethreading: - 'yes' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -42,8 +44,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - linux-ppc64le zip_keys: 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 3305c30e1..5b727b3d3 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 @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '2.39' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge python_debug cxx_compiler: @@ -24,6 +24,8 @@ expat: - '2' freethreading: - 'no' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -42,8 +44,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - linux-riscv64 tk: 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 a7b63dec9..121c96d4c 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 @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '2.39' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge python_debug cxx_compiler: @@ -24,6 +24,8 @@ expat: - '2' freethreading: - 'yes' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -42,8 +44,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - linux-riscv64 tk: 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 9e00069a7..b34c09f86 100644 --- a/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '2.39' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -24,6 +24,8 @@ expat: - '2' freethreading: - 'no' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -42,8 +44,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - linux-riscv64 tk: 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 fb143530f..740e5851c 100644 --- a/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '2.39' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -24,6 +24,8 @@ expat: - '2' freethreading: - 'yes' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -42,8 +44,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - linux-riscv64 tk: 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 b22c8ce8f..53c8548d6 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 @@ -15,7 +15,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge python_debug cxx_compiler: @@ -26,6 +26,8 @@ expat: - '2' freethreading: - 'no' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -44,8 +46,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - osx-64 tk: 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 8081bb371..90e346d70 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 @@ -15,7 +15,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge python_debug cxx_compiler: @@ -26,6 +26,8 @@ expat: - '2' freethreading: - 'yes' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -44,8 +46,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - osx-64 tk: 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 faf5424fc..eafd3c5c2 100644 --- a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -15,7 +15,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -26,6 +26,8 @@ expat: - '2' freethreading: - 'no' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -44,8 +46,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - osx-64 tk: 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 3c1ea6b56..375254106 100644 --- a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -15,7 +15,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -26,6 +26,8 @@ expat: - '2' freethreading: - 'yes' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -44,8 +46,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - osx-64 tk: 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 324bdc788..d478a9687 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 @@ -15,7 +15,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge python_debug cxx_compiler: @@ -26,6 +26,8 @@ expat: - '2' freethreading: - 'no' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -44,8 +46,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - osx-arm64 tk: 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 1a8f3fcca..4de2bb1b6 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 @@ -15,7 +15,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge python_debug cxx_compiler: @@ -26,6 +26,8 @@ expat: - '2' freethreading: - 'yes' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -44,8 +46,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - osx-arm64 tk: 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 55fa2bbfe..6a27cf528 100644 --- a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -15,7 +15,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -26,6 +26,8 @@ expat: - '2' freethreading: - 'no' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -44,8 +46,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - osx-arm64 tk: 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 ba3872ab0..40032eca1 100644 --- a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -15,7 +15,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -26,6 +26,8 @@ expat: - '2' freethreading: - 'yes' +libedit: +- '3.1' libffi: - '3.7' liblzma_devel: @@ -44,8 +46,6 @@ pin_run_as_build: max_pin: x.x python: - '3.15' -readline: -- '8' target_platform: - osx-arm64 tk: diff --git a/.ci_support/win_64_freethreadingno.yaml b/.ci_support/win_64_freethreadingno.yaml index 14fb12a87..0cf8be0a2 100644 --- a/.ci_support/win_64_freethreadingno.yaml +++ b/.ci_support/win_64_freethreadingno.yaml @@ -7,7 +7,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_freethreadingyes.yaml b/.ci_support/win_64_freethreadingyes.yaml index 396bcedfd..7913ed9f5 100644 --- a/.ci_support/win_64_freethreadingyes.yaml +++ b/.ci_support/win_64_freethreadingyes.yaml @@ -7,7 +7,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_arm64_freethreadingno.yaml b/.ci_support/win_arm64_freethreadingno.yaml index 40c05d70d..c407f9a8c 100644 --- a/.ci_support/win_arm64_freethreadingno.yaml +++ b/.ci_support/win_arm64_freethreadingno.yaml @@ -7,7 +7,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_arm64_freethreadingyes.yaml b/.ci_support/win_arm64_freethreadingyes.yaml index ee8cd99a2..aee7a0015 100644 --- a/.ci_support/win_arm64_freethreadingyes.yaml +++ b/.ci_support/win_arm64_freethreadingyes.yaml @@ -7,7 +7,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/recipe/build_base.sh b/recipe/build_base.sh index d4bb1c5fe..9a28cacf7 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -259,6 +259,7 @@ _common_configure_args+=(--with-tcltk-includes="-I${PREFIX}/include") _common_configure_args+=("--with-tcltk-libs=-L${PREFIX}/lib -ltcl${TCLTK_VER} -ltk${TCLTK_VER}") _common_configure_args+=(--with-platlibdir=lib) _common_configure_args+=(--with-system-libmpdec=yes) +_common_configure_args+=(--with-readline=editline) if [[ "${PY_INTERP_DEBUG}" == "yes" || "${target_platform}" != *"-64" || ${PY_FREETHREADING} == yes ]]; then _common_configure_args+=(--enable-experimental-jit=no) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 68ae9dd67..d939909b5 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -19,9 +19,8 @@ freethreading: - yes - no -# Use Python RC components in build channel_sources: - - conda-forge/label/python_rc,conda-forge + - conda-forge # Configuration for debug and release builds build_type: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 320bb7dd1..11189aa16 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "3.15.0" %} -{% set dev = "rc3" %} +{% set dev = "" %} {% set dev_ = "" %} {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.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: 506630aa66d5441188f34df22c0760bfe87fc92212630493ebc9ff3b3a7a1d49 + sha256: ba4bed1ba346b916890b76d9e320451420aa69f6408997d33c66482eeae3d575 patches: - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch - patches/0002-Win32-Do-not-download-externals.patch @@ -185,6 +185,7 @@ outputs: - llvm-tools 21.* # [win] - bzip2 # [build_platform != target_platform] - expat # [build_platform != target_platform] + - libedit # [build_platform != target_platform and unix] - libffi # [build_platform != target_platform] - liblzma-devel # [build_platform != target_platform] - libmpdec-devel # [build_platform != target_platform] @@ -193,7 +194,6 @@ outputs: - libxcrypt # [build_platform != target_platform and linux] - ncurses # [build_platform != target_platform and unix] - openssl # [build_platform != target_platform] - - readline # [build_platform != target_platform and unix] - tk # [build_platform != target_platform] - zlib # [build_platform != target_platform] - zstd # [build_platform != target_platform] @@ -204,11 +204,11 @@ outputs: - libffi - liblzma-devel - libmpdec-devel + - libedit # [unix] - libuuid # [linux] - libsqlite - ncurses # [unix] - openssl - - readline # [unix] - tk # These two are just to get the headers needed for tk.h, but is unused - xorg-libx11 # [unix] 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 14a4d8a59..99df4898b 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 f036da29fb98192e03f2ba45f3ee933dedb3d5e1 Mon Sep 17 00:00:00 2001 +From e80a91ba5dfc80520d7611b65f84bbc21463ade2 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 e2ee4d02c..d444ebef3 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 c3814cb69a533516ace23cd5645cc21b55dfb3ef Mon Sep 17 00:00:00 2001 +From 4e10f8e9863f366e317fb8417d1c9cb9d06a95fa 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 7b955c2aa..5b944270b 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 a043e5d152f9110fab42a6d24d5d1a8ede2cb055 Mon Sep 17 00:00:00 2001 +From a9d4d43a85328a9d27bf6b7e330efb4fcdf6a3ab 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 398edb73c..64d827d59 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 8d5123e3e8e0b938278e17661a93881948f3a58e Mon Sep 17 00:00:00 2001 +From b8dbc160c4b4c40ee230d67cbde1cdaa18deef92 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 8d17b3477..649c56ca7 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,4 +1,4 @@ -From c6e469fbdfc12ded2f67d804763239ac83d24a93 Mon Sep 17 00:00:00 2001 +From 983fa397e88ff375dc0ab65a4e1fabd2bbec1e85 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 diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index 7a0706fe9..3d3031a0f 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,4 +1,4 @@ -From 60582444706c3594dced8ffa4c995b1c026f0feb Mon Sep 17 00:00:00 2001 +From bb643b537c9d024a1a7b92c8ed9d9293742f937e 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 diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index f861ac0fe..e5e24257b 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,4 +1,4 @@ -From 0ecdd0d7cccafe5bbd4cd1b739e12d9fc682bf8e Mon Sep 17 00:00:00 2001 +From 36aeede5f2c50132eb76dfc8a522946ee1f7b4a2 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 3d6fed7b9..f822e83f4 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,4 +1,4 @@ -From 034737d36e140ecde4957b323b00355bac2ac2af Mon Sep 17 00:00:00 2001 +From 2f50cf21e33e951def4036664198f82d2dad1945 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 diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch index e6533e692..d836fdeba 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -1,4 +1,4 @@ -From e522947fd26f992e906ce80067b509cb07e14681 Mon Sep 17 00:00:00 2001 +From 28a708a72e0842f8449a88d54e469120dc1e3bdd 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 d28011560..ed06c88bb 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,4 +1,4 @@ -From 16b2404d97e0a2a5a09d9d7943b6aef5e6f2e29b Mon Sep 17 00:00:00 2001 +From 74dff303650dc5b1dd5b4574236ce85bc23d79d1 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 aafec93ab..ab3614531 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 58bee50e598d18abc841d74102b052dee06084b2 Mon Sep 17 00:00:00 2001 +From c0565bb53db8ca36d1b1d4b7115b7e29761244f9 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 f0341a46c..b41e2f1ba 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,4 +1,4 @@ -From ebb7c4084ca6bc89e512d96d2d057444305da55c Mon Sep 17 00:00:00 2001 +From 6a371e64f05b7d00b7c5d9b69474dd540f409f49 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 24871485b..86a8c0735 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,4 +1,4 @@ -From 411909b55113d3b07f50c2d927cd7b247f3506fb Mon Sep 17 00:00:00 2001 +From 07e0db7f9b9e69930032f2959e3fdb2cb7d2fc71 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 8f89c7f54..c2152191c 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,4 +1,4 @@ -From 66e5f45333fe6effba089bd6e55cdd4b683a9aac Mon Sep 17 00:00:00 2001 +From 1076e2ba8bf7bb97eaed1a7e17a32ca2042fc541 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 af39d985c..a47c06579 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,4 +1,4 @@ -From 54e3897771052b39045328958207c38e1c9c4d4b Mon Sep 17 00:00:00 2001 +From 3933e591a90f7535f6e8563537910865b83c9a0a 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 1993cd8e4..34561d331 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,4 +1,4 @@ -From 98b031c2700f7059d1a92f3e0cf84683d01b7b33 Mon Sep 17 00:00:00 2001 +From 4ebb401825f40ab1c5e629c031f9ffa0a1b20f25 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 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 5b78cb918..2dd1027b1 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 fe4a58ba38770c91be8059a36c029bb795bc4547 Mon Sep 17 00:00:00 2001 +From f3caef43467711c00b6e03d574f52841946399a8 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 5eef37d25..871dfd3e1 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,4 +1,4 @@ -From 6d757c6ead828ac2f9d6318de6995c00fa2fb1b8 Mon Sep 17 00:00:00 2001 +From 142e405db68dfe97487161e84a3fc987a64c8d94 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 diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index b993fb383..8d8375bfd 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,4 +1,4 @@ -From 5d0b85ab49e3cfce165ac59d5b283d51f8e26194 Mon Sep 17 00:00:00 2001 +From 31fb51fce82a41045088413235048934aa1ab097 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 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 ce1ad81b7..d6b41eb4c 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 d4d7227aec72cf2aecd80a483e4fe2d6db1ce147 Mon Sep 17 00:00:00 2001 +From 9ecec5ae34fd97920b9fcc5bf37f5a1a7c66d2a1 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 diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch index 8245f19a3..790365347 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,4 +1,4 @@ -From 483e5af6aecebeaa323605583f71f81f611123b8 Mon Sep 17 00:00:00 2001 +From bf44251585023e9c0ede75d899c87e4484cd3d15 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 969f0c883..dc85955db 100644 --- a/recipe/patches/0022-Unvendor-libmpdec.patch +++ b/recipe/patches/0022-Unvendor-libmpdec.patch @@ -1,4 +1,4 @@ -From 85be2e40204e9a2909a277053d162491af6a5081 Mon Sep 17 00:00:00 2001 +From e0fc76d4cd6c7158bf869a943f53c88e0de2bbdd 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 dd179a72e..599214dd4 100644 --- a/recipe/patches/0023-Brand-conda-forge.patch +++ b/recipe/patches/0023-Brand-conda-forge.patch @@ -1,4 +1,4 @@ -From 425e320c7ae7d14d202a14265d5424ed4409e111 Mon Sep 17 00:00:00 2001 +From a378760f21c7400d73c7b43d0f14aea624ea6980 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 6c65e9a76..d45e3b0c9 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 af8523b5164ba313ec188ea4221a534098da3ed9 Mon Sep 17 00:00:00 2001 +From 710a192817712f745c87b1444e6ebeeb5428569e 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 diff --git a/recipe/patches/0025-Unvendor-zstd.patch b/recipe/patches/0025-Unvendor-zstd.patch index 0febbe202..f6d4209d1 100644 --- a/recipe/patches/0025-Unvendor-zstd.patch +++ b/recipe/patches/0025-Unvendor-zstd.patch @@ -1,4 +1,4 @@ -From 598bd6641e4a50d986bb2912e209e47bf9bb8ab2 Mon Sep 17 00:00:00 2001 +From adaae58397e45088378a1c91bae5a63aea7de23e 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,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 734b8eb3f..c08e1adea 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 751bf20a02e156f540b80cb0271dba6085cf855e Mon Sep 17 00:00:00 2001 +From 6da8de34750aea6e10c7741d9382e80a9c1ec130 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 diff --git a/recipe/patches/0027-More-unixy-layout-for-windows.patch b/recipe/patches/0027-More-unixy-layout-for-windows.patch index c9d3b5719..076429286 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 c51382c26fffcc9d5dc2d7815c045f86c1d26a41 Mon Sep 17 00:00:00 2001 +From 05dea992ecbfb2532fb969ea0af817954f2b69ff 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 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 2aec69c46..99c5902d3 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 7dfb525de572ea1f5aeb329c9226efa921855131 Mon Sep 17 00:00:00 2001 +From 818a13d465af31871a1f1db4cba754ec6878d73d 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 diff --git a/recipe/run_test.py b/recipe/run_test.py index 79a5df6a6..3948367d8 100644 --- a/recipe/run_test.py +++ b/recipe/run_test.py @@ -85,6 +85,7 @@ import fcntl import grp import readline + assert readline.backend == "editline", readline.backend import resource import syslog import termios