2025-12-07 02:18:36 +00:00
41 changed files with 58 additions and 579 deletions
--- a/.github/workflows/macos_build.yml
+++ b/.github/workflows/macos_build.yml
@ -17,7 +17,7 @@ jobs:
          - "3.13"
    runs-on: macos-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
      # Normally, we would use the superbly maintained...
      # - uses: actions/setup-python@v2
      #   with:
--- a/.github/workflows/modified_scripts_build.yml
+++ b/.github/workflows/modified_scripts_build.yml
@ -7,7 +7,7 @@ jobs:
      versions: ${{steps.modified-versions.outputs.versions}}
      versions_cpython_only: ${{steps.modified-versions.outputs.versions_cpython_only}}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
      - run: git fetch origin "$GITHUB_BASE_REF"
      - shell: bash
        run: >
@ -37,10 +37,10 @@ jobs:
      fail-fast: false
      matrix:
        python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions)}}
-        os: ["macos-14", "macos-15", "macos-15-intel"]
+        os: ["macos-13", "macos-14", "macos-15"]
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
      - run: |
          #envvars
          export PYENV_ROOT="$GITHUB_WORKSPACE"
@ -98,10 +98,10 @@ jobs:
      fail-fast: false
      matrix:
        python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions_cpython_only)}}
-        os: ["macos-14", "macos-15", "macos-15-intel"]
+        os: ["macos-13", "macos-14", "macos-15"]
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
      - run: |
          #envvars
          export PYENV_ROOT="$GITHUB_WORKSPACE"
@ -163,7 +163,7 @@ jobs:
        os: ["ubuntu-22.04", "ubuntu-24.04"]
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
      - run: |
          #envvars
          export PYENV_ROOT="$GITHUB_WORKSPACE"
@ -222,7 +222,7 @@ jobs:
        os: ["ubuntu-latest"]
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
      - run: |
          #envvars
          export PYENV_ROOT="$GITHUB_WORKSPACE"
--- a/.github/workflows/pyenv_tests.yml
+++ b/.github/workflows/pyenv_tests.yml
@ -12,11 +12,11 @@ jobs:
        os:
          - ubuntu-24.04
          - ubuntu-22.04
-          - macos-15-intel
          - macos-14
+          - macos-13
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
      # Normally, we would use the superbly maintained...
      # - uses: actions/setup-python@v2
      #   with:
--- a/.github/workflows/ubuntu_build.yml
+++ b/.github/workflows/ubuntu_build.yml
@ -17,7 +17,7 @@ jobs:
          - "3.13"
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
      # Normally, we would use the superbly maintained...
      # - uses: actions/setup-python@v2
      #   with:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,33 +1,5 @@
 # Version History

-## Release v2.6.16
-* rehash: Fix hanging for 60 seconds when shims directory is not writable due to Linux Landlock by @native-api in https://github.com/pyenv/pyenv/pull/3367
-* Add Miniconda3-25.9.1-3 by @binbjz in https://github.com/pyenv/pyenv/pull/3368
-* sh-rehash: Fix erroneously executing rather than printing a command by @native-api in https://github.com/pyenv/pyenv/pull/3369
-* Add CPython 3.13.11, 3.14.2 by @cesarcoatl in https://github.com/pyenv/pyenv/pull/3370
-
-## Release v2.6.15
-* Add CPython 3.13.10 by @jsirois in https://github.com/pyenv/pyenv/pull/3364
-
-## Release v2.6.14
-* CI: Bump actions/checkout from 5 to 6 in the github-actions group by @dependabot[bot] in https://github.com/pyenv/pyenv/pull/3360
-* Fix "ld: symbol(s) not found" for C system calls in some MacOS versions if XCode is for a newer major MacOS version by @native-api in https://github.com/pyenv/pyenv/pull/3362
-* Add CPython 3.14.1 by @nedbat in https://github.com/pyenv/pyenv/pull/3363
-
-## Release v2.6.13
-* CI: Replace macos-13 with macos-15-intel by @edgarrmondragon in https://github.com/pyenv/pyenv/pull/3356
-* Add Miniconda3-25.9.1-1 by @binbjz in https://github.com/pyenv/pyenv/pull/3357
-* Add CPython 3.15.0a2 by @nedbat in https://github.com/pyenv/pyenv/pull/3359
-
-## Release v2.6.12
-* Add graalpy-25.0.1 by @msimacek in https://github.com/pyenv/pyenv/pull/3350
-* Add CPython 3.9.25 by @nedbat in https://github.com/pyenv/pyenv/pull/3355
-
-## Release v2.6.11
-* Support building against Homebrew Tcl/Tk 9 by @native-api in https://github.com/pyenv/pyenv/pull/3343
-* Add CPython 3.13.9 by @nedbat in https://github.com/pyenv/pyenv/pull/3346
-* Add CPython 3.15.0a1 by @edgarrmondragon in https://github.com/pyenv/pyenv/pull/3347
-
 ## Release v2.6.10
 * Add CPython 3.12.12, 3.11.14, 3.10.19, 3.9.24 by @nedbat in https://github.com/pyenv/pyenv/pull/3344

--- a/libexec/pyenv---version
+++ b/libexec/pyenv---version
@ -12,7 +12,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-version="2.6.16"
+version="2.6.10"
 git_revision=""

 if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then
--- a/libexec/pyenv-rehash
+++ b/libexec/pyenv-rehash
@ -35,7 +35,7 @@ release_lock() {
 }

 if [ ! -w "$SHIM_PATH" ]; then
-  echo "pyenv: cannot rehash: $SHIM_PATH isn't writable" >&2
+  echo "pyenv: cannot rehash: $SHIM_PATH isn't writable"
  exit 1
 fi

@ -46,27 +46,15 @@ while (( SECONDS <= start + ${PYENV_REHASH_TIMEOUT:-60} )); do
    acquired=1
    break
  else
-    #Landlock sandbox subsystem in the Linux kernel returns false information in access() as of 6.14.0,
-    # making -w "$SHIM_PATH" not catch the fact that the shims dir is not writable in this case.
-    #Bash doesn't provide access to errno to check for non-EEXIST error code in acquire_lock.
-    #So check for writablity by trying to write to a different file,
-    # in a way that taxes the usual use case as little as possible.
-    if [[ -z $tested_for_other_write_errors ]]; then
-      ( t="$(mktemp -p "$SHIM_PATH")" && rm "$t" ) && tested_for_other_write_errors=1 ||
-        { echo "pyenv: cannot rehash: $SHIM_PATH isnt writable" >&2; break; }
-    fi
    # POSIX sleep(1) doesn't provide subsecond precision, but many others do
    sleep 0.1 2>/dev/null || sleep 1
  fi
 done

 if [ -z "${acquired}" ]; then
-  if [[ -n $tested_for_other_write_errors ]]; then
-      echo "pyenv: cannot rehash: $PROTOTYPE_SHIM_PATH exists" >&2
-  fi
+  echo "pyenv: cannot rehash: $PROTOTYPE_SHIM_PATH exists"
  exit 1
 fi
-unset tested_for_other_write_errors

 # The prototype shim file is a script that re-execs itself, passing
 # its filename and any arguments to `pyenv exec`. This file is
--- a/libexec/pyenv-sh-rehash
+++ b/libexec/pyenv-sh-rehash
@ -11,7 +11,7 @@ shell="$(basename "${PYENV_SHELL:-$SHELL}")"

 # When pyenv shell integration is enabled, delegate to pyenv-rehash,
 # then tell the shell to empty its command lookup cache.
-echo "command pyenv rehash"
+pyenv-rehash

 case "$shell" in
 fish )
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@ -14,7 +14,7 @@
 #   -g/--debug       Build a debug version
 #

-PYTHON_BUILD_VERSION="2.6.16"
+PYTHON_BUILD_VERSION="2.6.10"

 OLDIFS="$IFS"

@ -1861,9 +1861,6 @@ use_xcode_sdk_zlib() {
  
  #distutils.unixcompiler and setup.py specifically search CFLAGS for "-isysroot"
  export CFLAGS="${CFLAGS:+$CFLAGS }-isysroot ${sdkroot}"
-  #while one can get away with adding it just to CFLAGS, this may cause linker failures
-  #if XCode is for a different major MacOS version (e.g. reported for XCode 12.4 on MacOS 10.15)
-  export LDFLAGS="${LDFLAGS:+$LDFLAGS }-isysroot ${sdkroot}"
  return 0
 }

@ -1883,24 +1880,26 @@ use_macports_zlib() {

 use_homebrew_tcltk() {
  can_use_homebrew || return 1
-  local tcltk_formula
  # Since https://github.com/Homebrew/homebrew-core/commit/f10e88617b41555193c22fdcba6109fe82155ee2 (10.11.2024),
-  # tcl-tk is 9.0. It's supported in CPython since 3.14.0a1 (gh-124111) but is not officially supported as of 3.14.0
-  # so we prefer 8
-  for tcltk_formula in ${PYTHON_BUILD_TCLTK_FORMULA:-tcl-tk@8 tcl-tk}; do
-    local tcltk_prefix="$(brew --prefix "${tcltk_formula}" 2>/dev/null || true)"
-    if [ -d "$tcltk_prefix" ]; then
-      echo "python-build: use ${tcltk_formula} from homebrew"
+  # tcl-tk is 9.0 which is not compatible with CPython as of this writing
+  # but we'll keep it as backup for cases like non-updated Homebrew
+  local tcltk
+  for tcltk in ${PYTHON_BUILD_TCLTK_FORMULA:-tcl-tk@8 tcl-tk}; do
+    local tcltk_libdir="$(brew --prefix "${tcltk}" 2>/dev/null || true)"
+    if [ -d "$tcltk_libdir" ]; then
+      echo "python-build: use tcl-tk from homebrew"
+      local tcltk_version="$(sh -c '. '"$tcltk_libdir"'/lib/tclConfig.sh; echo $TCL_VERSION')"
+      local tcltk_includes tcltk_libs
      # In Homebrew Tcl/Tk 8.6.13, headers have been moved to the 'tcl-tk' subdir.
-      local tcltk_includes="$(sh -c 'cd '"$tcltk_prefix"'/lib; . ./tclConfig.sh; . ./tkConfig.sh; echo "$TCL_INCLUDE_SPEC $TK_INCLUDE_SPEC"')"
-      # Homebrew Tcl/Tk 9 is built with external libtommath. CPython's build as of 3.14.0 does not detect that and fails to link to tommath symbols
-      local tcltk_cflags
-      if sh -c '. '"$tcltk_prefix"'/lib/tclConfig.sh; echo "$TCL_DEFS"' | grep -qwFe '-DTCL_WITH_EXTERNAL_TOMMATH=1'; then
-        tcltk_cflags="-DTCL_WITH_EXTERNAL_TOMMATH=1"
+      # We're not using tclConfig.sh here 'cuz it produces the version-specific path to <brew prefix>/Cellar
+      # and we'd rather have rpath set to <brew prefix>/opt/<...> to allow micro release upgrades without rebuilding
+      # XXX: do use tclConfig.sh and translate the paths if more shenanigans appear in later releases
+      if [ -d "$tcltk_libdir/include/tcl-tk" ]; then
+        tcltk_includes="-I$tcltk_libdir/include/tcl-tk"
+      else
+        tcltk_includes="-I$tcltk_libdir/include"
      fi
-      # For some reason, keg-only tcl-tk@8 successfully links with Tkinter without specifying rpath, with `/opt' rpath
-      # so no need to translate /Cellar path to /opt path
-      local tcltk_libs="$(sh -c 'cd '"$tcltk_prefix"'/lib; . ./tclConfig.sh; . ./tkConfig.sh; echo "$TCL_LIB_SPEC $TK_LIB_SPEC"')"
+      tcltk_libs="-L$tcltk_libdir/lib -ltcl$tcltk_version -ltk$tcltk_version"
      # Since 2.7.6, 3.3.3, 3.4.0 (Issue #1584): --with-tcltk-includes + --with-tcltk-libs Configure options
      # Since 3.11.0 (bpo-45847): `pkg-config` call, TCLTK_CFLAGS + TCLTK_LIBS override
      if [[ -n "$PYTHON_BUILD_TCLTK_USE_PKGCONFIG" ]]; then
@ -1908,15 +1907,14 @@ use_homebrew_tcltk() {
        # There's no way to provide a fallback only if it's is not present
        # and Configure's logic of detecting if it's present is complicated.
        # So we just override it always
-        export TCLTK_CFLAGS="$tcltk_includes${tcltk_cflags:+ $tcltk_cflags}"
+        export TCLTK_CFLAGS="$tcltk_includes"
        export TCLTK_LIBS="$tcltk_libs"
      else
        package_option python configure --with-tcltk-includes="$tcltk_includes"
        package_option python configure --with-tcltk-libs="$tcltk_libs"
-        [[ -n $tcltk_cflags ]] && export CFLAGS="${tcltk_cflags}${CFLAGS:+ $CFLAGS}"
      fi
      #set in either case as a failsafe
-      export PKG_CONFIG_PATH="${tcltk_prefix}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
+      export PKG_CONFIG_PATH="${tcltk_libdir}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"

      lock_in homebrew
      return 0
--- a/plugins/python-build/share/python-build/3.13.10
+++ b/plugins/python-build/share/python-build/3.13.10
@ -1,10 +0,0 @@
-prefer_openssl3
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
-install_package "openssl-3.6.0" "https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz#b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.3" "http://ftpmirror.gnu.org/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-    install_package "Python-3.13.10" "https://www.python.org/ftp/python/3.13.10/Python-3.13.10.tar.xz#bc673c04375a1a3f0808c27ba8f0411ab811ad390a8740318ccb9c60fad8fd77" standard verify_py313 copy_python_gdb ensurepip
-else
-    install_package "Python-3.13.10" "https://www.python.org/ftp/python/3.13.10/Python-3.13.10.tgz#de5930852e95ba8c17b56548e04648470356ac47f7506014664f8f510d7bd61b" standard verify_py313 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/3.13.10t
+++ b/plugins/python-build/share/python-build/3.13.10t
@ -1,2 +0,0 @@
-export PYTHON_BUILD_FREE_THREADING=1
-source "${BASH_SOURCE[0]%t}"
--- a/plugins/python-build/share/python-build/3.13.11
+++ b/plugins/python-build/share/python-build/3.13.11
@ -1,10 +0,0 @@
-prefer_openssl3
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
-install_package "openssl-3.6.0" "https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz#b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.3" "http://ftpmirror.gnu.org/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-    install_package "Python-3.13.11" "https://www.python.org/ftp/python/3.13.11/Python-3.13.11.tar.xz#16ede7bb7cdbfa895d11b0642fa0e523f291e6487194d53cf6d3b338c3a17ea2" standard verify_py313 copy_python_gdb ensurepip
-else
-    install_package "Python-3.13.11" "https://www.python.org/ftp/python/3.13.11/Python-3.13.11.tgz#03cfedbe06ce21bc44ce09245e091a77f2fee9ec9be5c52069048a181300b202" standard verify_py313 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/3.13.11t
+++ b/plugins/python-build/share/python-build/3.13.11t
@ -1,2 +0,0 @@
-export PYTHON_BUILD_FREE_THREADING=1
-source "${BASH_SOURCE[0]%t}"
--- a/plugins/python-build/share/python-build/3.13.6
+++ b/plugins/python-build/share/python-build/3.13.6
@ -2,7 +2,7 @@ prefer_openssl3
 export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
 export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
 install_package "openssl-3.5.2" "https://github.com/openssl/openssl/releases/download/openssl-3.5.2/openssl-3.5.2.tar.gz#c53a47e5e441c930c3928cf7bf6fb00e5d129b630e0aa873b08258656e7345ec" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.3" "http://ftpmirror.gnu.org/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
+install_package "readline-8.3" "https://mirror.cs.odu.edu/gnu/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
    install_package "Python-3.13.6" "https://www.python.org/ftp/python/3.13.6/Python-3.13.6.tar.xz#17ba5508819d8736a14fbfc47d36e184946a877851b2e9c4b6c43acb44a3b104" standard verify_py313 copy_python_gdb ensurepip
 else
--- a/plugins/python-build/share/python-build/3.13.7
+++ b/plugins/python-build/share/python-build/3.13.7
@ -2,7 +2,7 @@ prefer_openssl3
 export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
 export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
 install_package "openssl-3.5.2" "https://github.com/openssl/openssl/releases/download/openssl-3.5.2/openssl-3.5.2.tar.gz#c53a47e5e441c930c3928cf7bf6fb00e5d129b630e0aa873b08258656e7345ec" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.3" "http://ftpmirror.gnu.org/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
+install_package "readline-8.3" "https://mirror.cs.odu.edu/gnu/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
    install_package "Python-3.13.7" "https://www.python.org/ftp/python/3.13.7/Python-3.13.7.tar.xz#5462f9099dfd30e238def83c71d91897d8caa5ff6ebc7a50f14d4802cdaaa79a" standard verify_py313 copy_python_gdb ensurepip
 else
--- a/plugins/python-build/share/python-build/3.13.8
+++ b/plugins/python-build/share/python-build/3.13.8
@ -2,7 +2,7 @@ prefer_openssl3
 export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
 export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
 install_package "openssl-3.6.0" "https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz#b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.3" "http://ftpmirror.gnu.org/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
+install_package "readline-8.3" "https://mirror.cs.odu.edu/gnu/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
    install_package "Python-3.13.8" "https://www.python.org/ftp/python/3.13.8/Python-3.13.8.tar.xz#b9910730526b298299b46b35595ced9055722df60c06ad6301f6a4e2c728a252" standard verify_py313 copy_python_gdb ensurepip
 else
--- a/plugins/python-build/share/python-build/3.13.9
+++ b/plugins/python-build/share/python-build/3.13.9
@ -1,10 +0,0 @@
-prefer_openssl3
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
-install_package "openssl-3.6.0" "https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz#b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.3" "http://ftpmirror.gnu.org/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-    install_package "Python-3.13.9" "https://www.python.org/ftp/python/3.13.9/Python-3.13.9.tar.xz#ed5ef34cda36cfa2f3a340f07cac7e7814f91c7f3c411f6d3562323a866c5c66" standard verify_py313 copy_python_gdb ensurepip
-else
-    install_package "Python-3.13.9" "https://www.python.org/ftp/python/3.13.9/Python-3.13.9.tgz#c4c066af19c98fb7835d473bebd7e23be84f6e9874d47db9e39a68ee5d0ce35c" standard verify_py313 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/3.13.9t
+++ b/plugins/python-build/share/python-build/3.13.9t
@ -1,2 +0,0 @@
-export PYTHON_BUILD_FREE_THREADING=1
-source "${BASH_SOURCE[0]%t}"
--- a/plugins/python-build/share/python-build/3.14.0
+++ b/plugins/python-build/share/python-build/3.14.0
@ -2,7 +2,7 @@ prefer_openssl3
 export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
 export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
 install_package "openssl-3.6.0" "https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz#b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.3" "http://ftpmirror.gnu.org/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
+install_package "readline-8.3" "https://mirror.cs.odu.edu/gnu/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
    install_package "Python-3.14.0" "https://www.python.org/ftp/python/3.14.0/Python-3.14.0.tar.xz#2299dae542d395ce3883aca00d3c910307cd68e0b2f7336098c8e7b7eee9f3e9" standard verify_py314 copy_python_gdb ensurepip
 else
--- a/plugins/python-build/share/python-build/3.14.1
+++ b/plugins/python-build/share/python-build/3.14.1
@ -1,10 +0,0 @@
-prefer_openssl3
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
-install_package "openssl-3.6.0" "https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz#b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.3" "http://ftpmirror.gnu.org/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-    install_package "Python-3.14.1" "https://www.python.org/ftp/python/3.14.1/Python-3.14.1.tar.xz#8dfa08b1959d9d15838a1c2dab77dc8d8ff4a553a1ed046dfacbc8095c6d42fc" standard verify_py314 copy_python_gdb ensurepip
-else
-    install_package "Python-3.14.1" "https://www.python.org/ftp/python/3.14.1/Python-3.14.1.tgz#8343f001dede23812c7e9c6064f776bade2ef5813f46f0ae4b5a4c10c9069e9a" standard verify_py314 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/3.14.1t
+++ b/plugins/python-build/share/python-build/3.14.1t
@ -1,2 +0,0 @@
-export PYTHON_BUILD_FREE_THREADING=1
-source "${BASH_SOURCE[0]%t}"
--- a/plugins/python-build/share/python-build/3.14.2
+++ b/plugins/python-build/share/python-build/3.14.2
@ -1,10 +0,0 @@
-prefer_openssl3
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
-install_package "openssl-3.6.0" "https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz#b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.3" "http://ftpmirror.gnu.org/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-    install_package "Python-3.14.2" "https://www.python.org/ftp/python/3.14.2/Python-3.14.2.tar.xz#ce543ab854bc256b61b71e9b27f831ffd1bfd60a479d639f8be7f9757cf573e9" standard verify_py314 copy_python_gdb ensurepip
-else
-    install_package "Python-3.14.2" "https://www.python.org/ftp/python/3.14.2/Python-3.14.2.tgz#c609e078adab90e2c6bacb6afafacd5eaf60cd94cf670f1e159565725fcd448d" standard verify_py314 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/3.14.2t
+++ b/plugins/python-build/share/python-build/3.14.2t
@ -1,2 +0,0 @@
-export PYTHON_BUILD_FREE_THREADING=1
-source "${BASH_SOURCE[0]%t}"
--- a/plugins/python-build/share/python-build/3.15-dev
+++ b/plugins/python-build/share/python-build/3.15-dev
@ -3,6 +3,6 @@ export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
 export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
 export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
 export PYTHON_BUILD_CONFIGURE_WITH_DSYMUTIL=1
-install_package "openssl-3.6.0" "https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz#b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.3" "https://ftpmirror.gnu.org/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
+install_package "openssl-3.5.1" "https://github.com/openssl/openssl/releases/download/openssl-3.5.1/openssl-3.5.1.tar.gz#529043b15cffa5f36077a4d0af83f3de399807181d607441d734196d889b641f" mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
 install_git "Python-3.15-dev" "https://github.com/python/cpython" main standard verify_py315 copy_python_gdb ensurepip
--- a/plugins/python-build/share/python-build/3.15.0a2
+++ b/plugins/python-build/share/python-build/3.15.0a2
@ -1,10 +0,0 @@
-prefer_openssl3
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
-install_package "openssl-3.6.0" "https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz#b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.3" "https://ftpmirror.gnu.org/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-    install_package "Python-3.15.0a2" "https://www.python.org/ftp/python/3.15.0/Python-3.15.0a2.tar.xz#d8a0a2f4a7f3d7090cf195e81814efe95f70554955557f40e149d8694a662751" standard verify_py315 copy_python_gdb ensurepip
-else
-    install_package "Python-3.15.0a2" "https://www.python.org/ftp/python/3.15.0/Python-3.15.0a2.tgz#484924d5f963f3d4215ca50c13634b6a7067e9f273893145a6209fe7c93b78ff" standard verify_py315 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/3.15.0a2t
+++ b/plugins/python-build/share/python-build/3.15.0a2t
@ -1,2 +0,0 @@
-export PYTHON_BUILD_FREE_THREADING=1
-source "${BASH_SOURCE[0]%t}"
--- a/plugins/python-build/share/python-build/3.9.25
+++ b/plugins/python-build/share/python-build/3.9.25
@ -1,12 +0,0 @@
-prefer_openssl3
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-# Avoid a compilation error when linking against OpenSSL built with SSLv3 support (fixed in 3.10.0) (#2181)
-export PYTHON_CFLAGS="-DOPENSSL_NO_SSL3${PYTHON_CFLAGS:+ $PYTHON_CFLAGS}"
-
-install_package "openssl-3.0.16" "https://github.com/openssl/openssl/releases/download/openssl-3.0.16/openssl-3.0.16.tar.gz#57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.1" "https://ftpmirror.gnu.org/readline/readline-8.1.tar.gz#f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-3.9.25" "https://www.python.org/ftp/python/3.9.25/Python-3.9.25.tar.xz#00e07d7c0f2f0cc002432d1ee84d2a40dae404a99303e3f97701c10966c91834" standard verify_py39 copy_python_gdb ensurepip
-else
-  install_package "Python-3.9.25" "https://www.python.org/ftp/python/3.9.25/Python-3.9.25.tgz#a7438eabd3a48139f42d4e058096af8d880b0bb6e8fb8c78838892e4ce5583f2" standard verify_py39 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/graalpy-25.0.1
+++ b/plugins/python-build/share/python-build/graalpy-25.0.1
@ -1,64 +0,0 @@
-# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-# of the Software, and to permit persons to whom the Software is furnished to do
-# so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-VERSION='25.0.1'
-BUILD=''
-
-colorize 1 "GraalPy 23.1 and later installed by python-build use the faster Oracle GraalVM distribution" && echo
-colorize 1 "Oracle GraalVM uses the GFTC license, which is free for development and production use, see https://medium.com/graalvm/161527df3d76" && echo
-colorize 1 "The GraalVM Community Edition variant of GraalPy is also available, under the name graalpy-community-${VERSION}" && echo
-
-
-graalpy_arch="$(graalpy_architecture 2>/dev/null || true)"
-
-case "$graalpy_arch" in
-"linux-amd64" )
-  checksum="b5baff786753ebb774300fcf68a9bca4d14cbb8099f055637bee11786abb2d57"
-  ;;
-"linux-aarch64" )
-  checksum="f3315d1a3f13e7fcd785d0ca9b954d251da5f5d0dedae094c28a0566a239e4fd"
-  ;;
-"macos-amd64" )
-  checksum="10b0721d52397f0cc85f038900318da2203711cbcfae7899e3faed49d3dc6221"
-  ;;
-"macos-aarch64" )
-  checksum="389e0732f4d79e30335b70d41b6e8a2d769b435512fcb41675eb3dce4fc4d014"
-  ;;
-* )
-  { echo
-    colorize 1 "ERROR"
-    echo ": No binary distribution of GraalPy is available for $(uname -sm)."
-    echo
-  } >&2
-  exit 1
-  ;;
-esac
-
-if [ -n "${BUILD}" ]; then
-  { echo
-    colorize 1 "ERROR"
-    echo "Oracle GraalPy currently doesn't provide snapshot builds. Use graalpy-community if you need snapshots."
-    echo
-  } >&2
-  exit 1
-fi
-
-url="https://github.com/oracle/graalpython/releases/download/graal-${VERSION}/graalpy-${VERSION}-${graalpy_arch}.tar.gz#${checksum}"
-
-install_package "graalpy-${VERSION}" "${url}" "copy" ensurepip
--- a/plugins/python-build/share/python-build/graalpy-community-25.0.1
+++ b/plugins/python-build/share/python-build/graalpy-community-25.0.1
@ -1,54 +0,0 @@
-# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-# of the Software, and to permit persons to whom the Software is furnished to do
-# so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-VERSION='25.0.1'
-BUILD=''
-
-graalpy_arch="$(graalpy_architecture 2>/dev/null || true)"
-
-case "$graalpy_arch" in
-"linux-amd64" )
-  checksum="5ac049e3e13a9b04eead81851e59dfc794278ffec1933ff429378c1a70c88d32"
-  ;;
-"linux-aarch64" )
-  checksum="2ea15f932e6e25b21edd0a2713b294ce91c1dca571414fcdff297028f1313de5"
-  ;;
-"macos-amd64" )
-  checksum="f7834df0a7c5087de746ae0b0143eda8cfc456c34ddccdc64817491a10e5294b"
-  ;;
-"macos-aarch64" )
-  checksum="f89b15b75f456240089dd50e06128aa7357371ee85098a04dc4a4cd34a65f0c9"
-  ;;
-* )
-  { echo
-    colorize 1 "ERROR"
-    echo ": No binary distribution of GraalPy is available for $(uname -sm)."
-    echo
-  } >&2
-  exit 1
-  ;;
-esac
-
-if [ -n "${BUILD}" ]; then
-  url="https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/${VERSION}-dev-${BUILD}/graalpy-community-dev-${graalpy_arch}.tar.gz"
-else
-  url="https://github.com/oracle/graalpython/releases/download/graal-${VERSION}/graalpy-community-${VERSION}-${graalpy_arch}.tar.gz#${checksum}"
-fi
-
-install_package "graalpy-community-${VERSION}${BUILD}" "${url}" "copy" ensurepip
--- a/plugins/python-build/share/python-build/miniconda3-3.10-25.9.1-1
+++ b/plugins/python-build/share/python-build/miniconda3-3.10-25.9.1-1
@ -1,19 +0,0 @@
-case "$(anaconda_architecture 2>/dev/null || true)" in
-"Linux-aarch64" )
-  install_script "Miniconda3-py310_25.9.1-1-Linux-aarch64" "https://repo.anaconda.com/miniconda/Miniconda3-py310_25.9.1-1-Linux-aarch64.sh#28fc3db9c7ee63cedab38b0e6006409f1f448be7ffc57b270623efd4422b0608" "miniconda" verify_py310
-  ;;
-"Linux-x86_64" )
-  install_script "Miniconda3-py310_25.9.1-1-Linux-x86_64" "https://repo.anaconda.com/miniconda/Miniconda3-py310_25.9.1-1-Linux-x86_64.sh#04a8b03d8b0ec062d923e592201a6fd88b7247c309ef8848afb25c424c40ac39" "miniconda" verify_py310
-  ;;
-"MacOSX-arm64" )
-  install_script "Miniconda3-py310_25.9.1-1-MacOSX-arm64" "https://repo.anaconda.com/miniconda/Miniconda3-py310_25.9.1-1-MacOSX-arm64.sh#fb3fbef60259b36b0248c73fecdd974f8554d5fccfe0a7b8a45eb06dedbe8a85" "miniconda" verify_py310
-  ;;
-* )
-  { echo
-    colorize 1 "ERROR"
-    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
-    echo
-  } >&2
-  exit 1
-  ;;
-esac
--- a/plugins/python-build/share/python-build/miniconda3-3.10-25.9.1-3
+++ b/plugins/python-build/share/python-build/miniconda3-3.10-25.9.1-3
@ -1,19 +0,0 @@
-case "$(anaconda_architecture 2>/dev/null || true)" in
-"Linux-aarch64" )
-  install_script "Miniconda3-py310_25.9.1-3-Linux-aarch64" "https://repo.anaconda.com/miniconda/Miniconda3-py310_25.9.1-3-Linux-aarch64.sh#bc58460f17ec60d6c920d4352dd4d5e465aa22b56580bd4cd57c9693859761ec" "miniconda" verify_py310
-  ;;
-"Linux-x86_64" )
-  install_script "Miniconda3-py310_25.9.1-3-Linux-x86_64" "https://repo.anaconda.com/miniconda/Miniconda3-py310_25.9.1-3-Linux-x86_64.sh#e4dea08f67e7093433c34d02b8947b093a902f1120b283758d5200bd92db594c" "miniconda" verify_py310
-  ;;
-"MacOSX-arm64" )
-  install_script "Miniconda3-py310_25.9.1-3-MacOSX-arm64" "https://repo.anaconda.com/miniconda/Miniconda3-py310_25.9.1-3-MacOSX-arm64.sh#3b54f297df4c9f3e45ce692a87984e79d13761a45469d37e852a8b216215ccf0" "miniconda" verify_py310
-  ;;
-* )
-  { echo
-    colorize 1 "ERROR"
-    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
-    echo
-  } >&2
-  exit 1
-  ;;
-esac
--- a/plugins/python-build/share/python-build/miniconda3-3.11-25.9.1-1
+++ b/plugins/python-build/share/python-build/miniconda3-3.11-25.9.1-1
@ -1,19 +0,0 @@
-case "$(anaconda_architecture 2>/dev/null || true)" in
-"Linux-aarch64" )
-  install_script "Miniconda3-py311_25.9.1-1-Linux-aarch64" "https://repo.anaconda.com/miniconda/Miniconda3-py311_25.9.1-1-Linux-aarch64.sh#4e0723b9d76aa491cf22511dac36f4fdec373e41d2a243ff875e19b8df39bf94" "miniconda" verify_py311
-  ;;
-"Linux-x86_64" )
-  install_script "Miniconda3-py311_25.9.1-1-Linux-x86_64" "https://repo.anaconda.com/miniconda/Miniconda3-py311_25.9.1-1-Linux-x86_64.sh#238abad23f8d4d8ba89dd05df0b0079e278909a36e06955f12bbef4aa94e6131" "miniconda" verify_py311
-  ;;
-"MacOSX-arm64" )
-  install_script "Miniconda3-py311_25.9.1-1-MacOSX-arm64" "https://repo.anaconda.com/miniconda/Miniconda3-py311_25.9.1-1-MacOSX-arm64.sh#5d5f58477f40d23e491394a7114a318724f1f9161e2b8bd08c5845c47b036b72" "miniconda" verify_py311
-  ;;
-* )
-  { echo
-    colorize 1 "ERROR"
-    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
-    echo
-  } >&2
-  exit 1
-  ;;
-esac
--- a/plugins/python-build/share/python-build/miniconda3-3.11-25.9.1-3
+++ b/plugins/python-build/share/python-build/miniconda3-3.11-25.9.1-3
@ -1,19 +0,0 @@
-case "$(anaconda_architecture 2>/dev/null || true)" in
-"Linux-aarch64" )
-  install_script "Miniconda3-py311_25.9.1-3-Linux-aarch64" "https://repo.anaconda.com/miniconda/Miniconda3-py311_25.9.1-3-Linux-aarch64.sh#92a4df72178d87626072b39aca8fa4721f29d192ed0d70e268586f63b41f7657" "miniconda" verify_py311
-  ;;
-"Linux-x86_64" )
-  install_script "Miniconda3-py311_25.9.1-3-Linux-x86_64" "https://repo.anaconda.com/miniconda/Miniconda3-py311_25.9.1-3-Linux-x86_64.sh#e331037f492848e68764b0c430912b2417b977d654706009ac8eb475e03ae0a2" "miniconda" verify_py311
-  ;;
-"MacOSX-arm64" )
-  install_script "Miniconda3-py311_25.9.1-3-MacOSX-arm64" "https://repo.anaconda.com/miniconda/Miniconda3-py311_25.9.1-3-MacOSX-arm64.sh#6d92abcee72a7aa4de3694f718fbb523f261efdb5027c7448907b9cfd6507e89" "miniconda" verify_py311
-  ;;
-* )
-  { echo
-    colorize 1 "ERROR"
-    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
-    echo
-  } >&2
-  exit 1
-  ;;
-esac
--- a/plugins/python-build/share/python-build/miniconda3-3.12-25.9.1-1
+++ b/plugins/python-build/share/python-build/miniconda3-3.12-25.9.1-1
@ -1,19 +0,0 @@
-case "$(anaconda_architecture 2>/dev/null || true)" in
-"Linux-aarch64" )
-  install_script "Miniconda3-py312_25.9.1-1-Linux-aarch64" "https://repo.anaconda.com/miniconda/Miniconda3-py312_25.9.1-1-Linux-aarch64.sh#11ab86931679e6d9b15112f2e866dad1fcbd89a039a6442c0bce7b86fd282f0a" "miniconda" verify_py312
-  ;;
-"Linux-x86_64" )
-  install_script "Miniconda3-py312_25.9.1-1-Linux-x86_64" "https://repo.anaconda.com/miniconda/Miniconda3-py312_25.9.1-1-Linux-x86_64.sh#a0def9c732d94b156529ef7db8edd6e1862cee784a27a4961870dca86e89fba4" "miniconda" verify_py312
-  ;;
-"MacOSX-arm64" )
-  install_script "Miniconda3-py312_25.9.1-1-MacOSX-arm64" "https://repo.anaconda.com/miniconda/Miniconda3-py312_25.9.1-1-MacOSX-arm64.sh#6bf3d8cac26587f6e53f05cd781f9201d2918c37dc3ef20677b383e250568100" "miniconda" verify_py312
-  ;;
-* )
-  { echo
-    colorize 1 "ERROR"
-    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
-    echo
-  } >&2
-  exit 1
-  ;;
-esac
--- a/plugins/python-build/share/python-build/miniconda3-3.12-25.9.1-3
+++ b/plugins/python-build/share/python-build/miniconda3-3.12-25.9.1-3
@ -1,19 +0,0 @@
-case "$(anaconda_architecture 2>/dev/null || true)" in
-"Linux-aarch64" )
-  install_script "Miniconda3-py312_25.9.1-3-Linux-aarch64" "https://repo.anaconda.com/miniconda/Miniconda3-py312_25.9.1-3-Linux-aarch64.sh#8c5c1d38011fed8053d7bdaaf7fab372c3f71dbb77791e07692fb8059b7828bd" "miniconda" verify_py312
-  ;;
-"Linux-x86_64" )
-  install_script "Miniconda3-py312_25.9.1-3-Linux-x86_64" "https://repo.anaconda.com/miniconda/Miniconda3-py312_25.9.1-3-Linux-x86_64.sh#07fc00c146a481f7ae2657a31eb7ec0d5d77a107b981d58ab5d7cd8bc99be778" "miniconda" verify_py312
-  ;;
-"MacOSX-arm64" )
-  install_script "Miniconda3-py312_25.9.1-3-MacOSX-arm64" "https://repo.anaconda.com/miniconda/Miniconda3-py312_25.9.1-3-MacOSX-arm64.sh#67108a40cca0ae1a59b74672341d94ed6641430e10371616426c31c2014e19b9" "miniconda" verify_py312
-  ;;
-* )
-  { echo
-    colorize 1 "ERROR"
-    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
-    echo
-  } >&2
-  exit 1
-  ;;
-esac
--- a/plugins/python-build/share/python-build/miniconda3-3.13-25.9.1-1
+++ b/plugins/python-build/share/python-build/miniconda3-3.13-25.9.1-1
@ -1,19 +0,0 @@
-case "$(anaconda_architecture 2>/dev/null || true)" in
-"Linux-aarch64" )
-  install_script "Miniconda3-py313_25.9.1-1-Linux-aarch64" "https://repo.anaconda.com/miniconda/Miniconda3-py313_25.9.1-1-Linux-aarch64.sh#a0de4562c368a8b5ca4385843f405684c79bea7aa3b75d7513ff99c0c6435d51" "miniconda" verify_py313
-  ;;
-"Linux-x86_64" )
-  install_script "Miniconda3-py313_25.9.1-1-Linux-x86_64" "https://repo.anaconda.com/miniconda/Miniconda3-py313_25.9.1-1-Linux-x86_64.sh#6022714da22986097bbefa13dab3d957257fef04e1c37d1ebd3645b5b99bc9d4" "miniconda" verify_py313
-  ;;
-"MacOSX-arm64" )
-  install_script "Miniconda3-py313_25.9.1-1-MacOSX-arm64" "https://repo.anaconda.com/miniconda/Miniconda3-py313_25.9.1-1-MacOSX-arm64.sh#491f35ab841c99225e5680209d5455a2f5278551378781c0dfeaf2586d7ae3df" "miniconda" verify_py313
-  ;;
-* )
-  { echo
-    colorize 1 "ERROR"
-    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
-    echo
-  } >&2
-  exit 1
-  ;;
-esac
--- a/plugins/python-build/share/python-build/miniconda3-3.13-25.9.1-3
+++ b/plugins/python-build/share/python-build/miniconda3-3.13-25.9.1-3
@ -1,19 +0,0 @@
-case "$(anaconda_architecture 2>/dev/null || true)" in
-"Linux-aarch64" )
-  install_script "Miniconda3-py313_25.9.1-3-Linux-aarch64" "https://repo.anaconda.com/miniconda/Miniconda3-py313_25.9.1-3-Linux-aarch64.sh#036053e7e6e5866435bc1a11711b41293e5bf0776bb4aa9a7ea46d01f30eda31" "miniconda" verify_py313
-  ;;
-"Linux-x86_64" )
-  install_script "Miniconda3-py313_25.9.1-3-Linux-x86_64" "https://repo.anaconda.com/miniconda/Miniconda3-py313_25.9.1-3-Linux-x86_64.sh#6bec65fcb0c66596a5058c6767d25d89a537eb83ee84684ec0fa5a4fbfb32647" "miniconda" verify_py313
-  ;;
-"MacOSX-arm64" )
-  install_script "Miniconda3-py313_25.9.1-3-MacOSX-arm64" "https://repo.anaconda.com/miniconda/Miniconda3-py313_25.9.1-3-MacOSX-arm64.sh#751b360885e8de7a350e3484542ccbfe7ff3d55cce794255167991dfa7ed79e1" "miniconda" verify_py313
-  ;;
-* )
-  { echo
-    colorize 1 "ERROR"
-    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
-    echo
-  } >&2
-  exit 1
-  ;;
-esac
--- a/plugins/python-build/share/python-build/miniconda3-3.9-25.9.1-1
+++ b/plugins/python-build/share/python-build/miniconda3-3.9-25.9.1-1
@ -1,19 +0,0 @@
-case "$(anaconda_architecture 2>/dev/null || true)" in
-"Linux-aarch64" )
-  install_script "Miniconda3-py39_25.9.1-1-Linux-aarch64" "https://repo.anaconda.com/miniconda/Miniconda3-py39_25.9.1-1-Linux-aarch64.sh#983ef280dec1d0f965b6b6133c585ce902e07136105d4977aa5de3aa027cfa55" "miniconda" verify_py39
-  ;;
-"Linux-x86_64" )
-  install_script "Miniconda3-py39_25.9.1-1-Linux-x86_64" "https://repo.anaconda.com/miniconda/Miniconda3-py39_25.9.1-1-Linux-x86_64.sh#d8d13344b46a057659397b9ca1a948d184bf59f04efa8864df8c01f7557e2baa" "miniconda" verify_py39
-  ;;
-"MacOSX-arm64" )
-  install_script "Miniconda3-py39_25.9.1-1-MacOSX-arm64" "https://repo.anaconda.com/miniconda/Miniconda3-py39_25.9.1-1-MacOSX-arm64.sh#857f09c2be8feaf3664064a2e324e96656104a9a45ab0a657a49c03754855b77" "miniconda" verify_py39
-  ;;
-* )
-  { echo
-    colorize 1 "ERROR"
-    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
-    echo
-  } >&2
-  exit 1
-  ;;
-esac
--- a/plugins/python-build/share/python-build/miniconda3-3.9-25.9.1-3
+++ b/plugins/python-build/share/python-build/miniconda3-3.9-25.9.1-3
@ -1,19 +0,0 @@
-case "$(anaconda_architecture 2>/dev/null || true)" in
-"Linux-aarch64" )
-  install_script "Miniconda3-py39_25.9.1-3-Linux-aarch64" "https://repo.anaconda.com/miniconda/Miniconda3-py39_25.9.1-3-Linux-aarch64.sh#2cf395401906b6968cfd2bc5b522ad4dca40374987e790c4daa83f049d132841" "miniconda" verify_py39
-  ;;
-"Linux-x86_64" )
-  install_script "Miniconda3-py39_25.9.1-3-Linux-x86_64" "https://repo.anaconda.com/miniconda/Miniconda3-py39_25.9.1-3-Linux-x86_64.sh#0ac18f10d17ca918247b4606df82be38eba6e23380a7eddb25b47ef6ccdb920e" "miniconda" verify_py39
-  ;;
-"MacOSX-arm64" )
-  install_script "Miniconda3-py39_25.9.1-3-MacOSX-arm64" "https://repo.anaconda.com/miniconda/Miniconda3-py39_25.9.1-3-MacOSX-arm64.sh#f05dcd060e3915a0a3a9dece324d2eb88268fa251fff2fb63d48e232c5fab510" "miniconda" verify_py39
-  ;;
-* )
-  { echo
-    colorize 1 "ERROR"
-    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
-    echo
-  } >&2
-  exit 1
-  ;;
-esac
--- a/plugins/python-build/test/build.bats
+++ b/plugins/python-build/test/build.bats
@ -68,20 +68,6 @@ assert_build_log() {
  assert_output
 }

-stub_tcltk() {
-  local tcltk_prefix="${1:?}"
-  mkdir -p "$tcltk_prefix/lib"
-  cat >"$tcltk_prefix/lib/tclConfig.sh" <<!
-TCL_INCLUDE_SPEC='-I${tcltk_prefix}/include'
-TCL_LIB_SPEC='-L${tcltk_prefix}/lib -ltclX.Y'
-!
-  cat >"$tcltk_prefix/lib/tkConfig.sh" <<!
-TK_INCLUDE_SPEC='-I${tcltk_prefix}/include'
-TK_LIB_SPEC='-L${tcltk_prefix}/lib -ltkX.Y'
-!
-
-}
-
@test "yaml is installed for python" {
  cached_tarball "yaml-0.1.6"
  cached_tarball "Python-3.6.2"
@ -777,7 +763,10 @@ OUT

@test "tcl-tk is linked from Homebrew via --with-tcl-*" {
  cached_tarball "Python-3.6.2"
-  stub_tcltk "${tcl_tk_libdir:=$BATS_TEST_TMPDIR/homebrew-tcl-tk}"
+  tcl_tk_version=8.6
+  tcl_tk_libdir="$BATS_TEST_TMPDIR/homebrew-tcl-tk"
+  mkdir -p "$tcl_tk_libdir/lib"
+  echo "TCL_VERSION='$tcl_tk_version'" >>"$tcl_tk_libdir/lib/tclConfig.sh"

  stub uname '-s : echo Darwin'
  stub sw_vers '-productVersion : echo 1010'
@ -799,40 +788,7 @@ DEF

  assert_build_log <<OUT
 Python-3.6.2: CFLAGS="" CPPFLAGS="-I${BATS_TEST_TMPDIR}/install/include" LDFLAGS="-L${BATS_TEST_TMPDIR}/install/lib -Wl,-rpath,${BATS_TEST_TMPDIR}/install/lib" PKG_CONFIG_PATH="${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib/pkgconfig"
-Python-3.6.2: --prefix=${BATS_TEST_TMPDIR}/install --enable-shared --libdir=${BATS_TEST_TMPDIR}/install/lib --with-tcltk-includes=-I${BATS_TEST_TMPDIR}/homebrew-tcl-tk/include -I${BATS_TEST_TMPDIR}/homebrew-tcl-tk/include --with-tcltk-libs=-L${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib -ltclX.Y -L${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib -ltkX.Y
-make -j 2
-make install
-OUT
-}
-
-@test "tcl-tk with external libtommath is linked from Homebrew via --with-tcl-*" {
-  cached_tarball "Python-3.6.2"
-  stub_tcltk "${tcl_tk_libdir:=$BATS_TEST_TMPDIR/homebrew-tcl-tk}"
-  cat >>"$tcl_tk_libdir/lib/tclConfig.sh" <<!
-TCL_DEFS='-DSMTH -DTCL_WITH_EXTERNAL_TOMMATH=1 -DSMTH_ELSE'
-!
-
-  stub uname '-s : echo Darwin'
-  stub sw_vers '-productVersion : echo 1010'
-
-  stub brew "--prefix tcl-tk@8 : echo '$tcl_tk_libdir'"
-  for i in {1..4}; do stub brew false; done
-
-  stub_make_install
-
-  run_inline_definition <<DEF
-install_package "Python-3.6.2" "http://python.org/ftp/python/3.6.2/Python-3.6.2.tar.gz"
-DEF
-  assert_success
-
-  unstub uname
-  unstub sw_vers
-  unstub brew
-  unstub make
-
-  assert_build_log <<OUT
-Python-3.6.2: CFLAGS="-DTCL_WITH_EXTERNAL_TOMMATH=1" CPPFLAGS="-I${BATS_TEST_TMPDIR}/install/include" LDFLAGS="-L${BATS_TEST_TMPDIR}/install/lib -Wl,-rpath,${BATS_TEST_TMPDIR}/install/lib" PKG_CONFIG_PATH="${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib/pkgconfig"
-Python-3.6.2: --prefix=${BATS_TEST_TMPDIR}/install --enable-shared --libdir=${BATS_TEST_TMPDIR}/install/lib --with-tcltk-includes=-I${BATS_TEST_TMPDIR}/homebrew-tcl-tk/include -I${BATS_TEST_TMPDIR}/homebrew-tcl-tk/include --with-tcltk-libs=-L${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib -ltclX.Y -L${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib -ltkX.Y
+Python-3.6.2: --prefix=${BATS_TEST_TMPDIR}/install --enable-shared --libdir=${BATS_TEST_TMPDIR}/install/lib --with-tcltk-includes=-I${BATS_TEST_TMPDIR}/homebrew-tcl-tk/include --with-tcltk-libs=-L${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib -ltcl$tcl_tk_version -ltk$tcl_tk_version
 make -j 2
 make install
 OUT
@ -840,7 +796,10 @@ OUT

@test "tcl-tk is linked from Homebrew with PYTHON_BUILD_TCLTK_FORMULA" {
  cached_tarball "Python-3.6.2"
-  stub_tcltk "${tcl_tk_libdir:=$BATS_TEST_TMPDIR/homebrew-tcl-tk}"
+  tcl_tk_version=8.6
+  tcl_tk_libdir="$BATS_TEST_TMPDIR/homebrew-tcl-tk"
+  mkdir -p "$tcl_tk_libdir/lib"
+  echo "TCL_VERSION='$tcl_tk_version'" >>"$tcl_tk_libdir/lib/tclConfig.sh"

  stub uname '-s : echo Darwin'
  stub sw_vers '-productVersion : echo 1010'
@ -863,7 +822,7 @@ DEF

  assert_build_log <<OUT
 Python-3.6.2: CFLAGS="" CPPFLAGS="-I${BATS_TEST_TMPDIR}/install/include" LDFLAGS="-L${BATS_TEST_TMPDIR}/install/lib -Wl,-rpath,${BATS_TEST_TMPDIR}/install/lib" PKG_CONFIG_PATH="${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib/pkgconfig"
-Python-3.6.2: --prefix=${BATS_TEST_TMPDIR}/install --enable-shared --libdir=${BATS_TEST_TMPDIR}/install/lib --with-tcltk-includes=-I${BATS_TEST_TMPDIR}/homebrew-tcl-tk/include -I${BATS_TEST_TMPDIR}/homebrew-tcl-tk/include --with-tcltk-libs=-L${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib -ltclX.Y -L${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib -ltkX.Y
+Python-3.6.2: --prefix=${BATS_TEST_TMPDIR}/install --enable-shared --libdir=${BATS_TEST_TMPDIR}/install/lib --with-tcltk-includes=-I${BATS_TEST_TMPDIR}/homebrew-tcl-tk/include --with-tcltk-libs=-L${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib -ltcl$tcl_tk_version -ltk$tcl_tk_version
 make -j 2
 make install
 OUT
@ -871,7 +830,10 @@ OUT

@test "tcl-tk is linked from Homebrew via pkg-config and override vars" {
  cached_tarball "Python-3.6.2" - TCLTK_CFLAGS TCLTK_LIBS
-  stub_tcltk "${tcl_tk_libdir:=$BATS_TEST_TMPDIR/homebrew-tcl-tk}"
+  tcl_tk_version=8.6
+  tcl_tk_libdir="$BATS_TEST_TMPDIR/homebrew-tcl-tk"
+  mkdir -p "$tcl_tk_libdir/lib"
+  echo "TCL_VERSION='$tcl_tk_version'" >>"$tcl_tk_libdir/lib/tclConfig.sh"

  stub uname '-s : echo Darwin'
  stub sw_vers '-productVersion : echo 1010'
@ -895,42 +857,7 @@ DEF
  assert_build_log <<OUT
 Python-3.6.2: CFLAGS="" CPPFLAGS="-I${BATS_TEST_TMPDIR}/install/include" LDFLAGS="-L${BATS_TEST_TMPDIR}/install/lib -Wl,-rpath,${BATS_TEST_TMPDIR}/install/lib" PKG_CONFIG_PATH="${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib/pkgconfig"
 Python-3.6.2: --prefix=${BATS_TEST_TMPDIR}/install --enable-shared --libdir=${BATS_TEST_TMPDIR}/install/lib
-Python-3.6.2: TCLTK_CFLAGS=-I${BATS_TEST_TMPDIR}/homebrew-tcl-tk/include -I${BATS_TEST_TMPDIR}/homebrew-tcl-tk/include TCLTK_LIBS=-L${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib -ltclX.Y -L${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib -ltkX.Y
-make -j 2
-make install
-OUT
-}
-
-@test "tcl-tk with external libtommath is linked from Homebrew via pkg-config and override vars" {
-  cached_tarball "Python-3.6.2" - TCLTK_CFLAGS TCLTK_LIBS
-  stub_tcltk "${tcl_tk_libdir:=$BATS_TEST_TMPDIR/homebrew-tcl-tk}"
-  cat >>"$tcl_tk_libdir/lib/tclConfig.sh" <<!
-TCL_DEFS='-DSMTH -DTCL_WITH_EXTERNAL_TOMMATH=1 -DSMTH_ELSE'
-!
-
-  stub uname '-s : echo Darwin'
-  stub sw_vers '-productVersion : echo 1010'
-
-  stub brew "--prefix tcl-tk@8 : echo '$tcl_tk_libdir'"
-  for i in {1..4}; do stub brew false; done
-
-  stub_make_install
-
-  run_inline_definition <<DEF
-PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
-install_package "Python-3.6.2" "http://python.org/ftp/python/3.6.2/Python-3.6.2.tar.gz"
-DEF
-  assert_success
-
-  unstub uname
-  unstub sw_vers
-  unstub brew
-  unstub make
-
-  assert_build_log <<OUT
-Python-3.6.2: CFLAGS="" CPPFLAGS="-I${BATS_TEST_TMPDIR}/install/include" LDFLAGS="-L${BATS_TEST_TMPDIR}/install/lib -Wl,-rpath,${BATS_TEST_TMPDIR}/install/lib" PKG_CONFIG_PATH="${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib/pkgconfig"
-Python-3.6.2: --prefix=${BATS_TEST_TMPDIR}/install --enable-shared --libdir=${BATS_TEST_TMPDIR}/install/lib
-Python-3.6.2: TCLTK_CFLAGS=-I${BATS_TEST_TMPDIR}/homebrew-tcl-tk/include -I${BATS_TEST_TMPDIR}/homebrew-tcl-tk/include -DTCL_WITH_EXTERNAL_TOMMATH=1 TCLTK_LIBS=-L${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib -ltclX.Y -L${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib -ltkX.Y
+Python-3.6.2: TCLTK_CFLAGS=-I${BATS_TEST_TMPDIR}/homebrew-tcl-tk/include TCLTK_LIBS=-L${BATS_TEST_TMPDIR}/homebrew-tcl-tk/lib -ltcl$tcl_tk_version -ltk$tcl_tk_version
 make -j 2
 make install
 OUT
--- a/test/rehash.bats
+++ b/test/rehash.bats
@ -110,27 +110,13 @@ SH
@test "sh-rehash in bash" {
  create_executable "3.4" "python"
  PYENV_SHELL=bash run pyenv-sh-rehash
-  assert_success "command pyenv rehash
-hash -r 2>/dev/null || true"
-}
-
-@test "sh-rehash in bash (integration)" {
-  create_executable "3.4" "python"
-  run eval "$(pyenv-sh-rehash)"
-  assert_success
+  assert_success "hash -r 2>/dev/null || true"
  assert [ -x "${PYENV_ROOT}/shims/python" ]
 }

@test "sh-rehash in fish" {
  create_executable "3.4" "python"
  PYENV_SHELL=fish run pyenv-sh-rehash
-  assert_success "command pyenv rehash"
-}
-
-@test "sh-rehash in fish (integration)" {
-  command -v fish >/dev/null || skip "-- fish not installed" 
-  create_executable "3.4" "python"
-  run fish -Nc "eval (pyenv-sh-rehash)"
-  assert_success
+  assert_success ""
  assert [ -x "${PYENV_ROOT}/shims/python" ]
 }