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..e39a14458 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 @@ -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..c3ac00eff 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 @@ -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..ee3bf314e 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -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..e8111b77f 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -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..30ce7bc1b 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 @@ -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..d05a05b11 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 @@ -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..58d35ffe6 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -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..28e74271e 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -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..9a4502dc4 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 @@ -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..ccdf13d4c 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 @@ -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..3befe570f 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -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..b7438947d 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -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..d1a2ff421 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 @@ -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..acb4f2627 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 @@ -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..b00937efb 100644 --- a/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -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..c6bb6cad1 100644 --- a/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -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..dff02b259 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 @@ -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..e96badf07 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 @@ -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..50fb7dd76 100644 --- a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -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..480f0488e 100644 --- a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -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..731014e0c 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 @@ -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..570106532 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 @@ -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..aa9640dcd 100644 --- a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -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..89f901aca 100644 --- a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -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/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/meta.yaml b/recipe/meta.yaml index 320bb7dd1..ae3ef3664 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -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/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