2.4.9

pyenv-latest: replace -q with -b and -f, document as internal

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Version History
 
+## Release v2.4.9
+* Add miniforge3-24.3.0-0 by @goerz in https://github.com/pyenv/pyenv/pull/3028
+* Add CPython 3.13.0rc1 by @edgarrmondragon in https://github.com/pyenv/pyenv/pull/3029
+
+## Release v2.4.8
+* Fix pyenv-uninstall not having the debug tracing invocation by @native-api in https://github.com/pyenv/pyenv/pull/3020
+* Add CPython 3.13.0b4 and 3.13.0b4t by @edgarrmondragon in https://github.com/pyenv/pyenv/pull/3019
+* README: Remove reference to Fig by @ThomasHaz in https://github.com/pyenv/pyenv/pull/3018
+* Fix tests failing if plugins are installed by @native-api in https://github.com/pyenv/pyenv/pull/3022
+* pyenv-latest: replace -q with -b and -f, document as internal by @native-api in https://github.com/pyenv/pyenv/pull/3021
+
 ## Release v2.4.7
 * Add support for anaconda3-2024.06-1 by @binbjz in https://github.com/pyenv/pyenv/pull/3009
 * Fix debug build for X.Yt-dev by @native-api in https://github.com/pyenv/pyenv/pull/

README.md

@@ -367,12 +367,6 @@ See [Advanced configuration](#advanced-configuration) for details and more confi
 
    **Proxy note**: If you use a proxy, export `http_proxy` and `https_proxy`, too.
 
-   In MacOS, you might also want to install [Fig](https://fig.io/) which
-provides alternative shell completions for many command line tools with an
-IDE-like popup interface in the terminal window.
-(Note that their completions are independent from Pyenv's codebase
-so they might be slightly out of sync for bleeding-edge interface changes.)
-
 ### Restart your shell
 
   for the `PATH` changes to take effect.

libexec/pyenv---version

@@ -12,7 +12,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-version="2.4.7"
+version="2.4.9"
 git_revision=""
 
 if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then

libexec/pyenv-latest

@@ -1,9 +1,11 @@
 #!/usr/bin/env bash
 # Summary: Print the latest installed or known version with the given prefix
-# Usage: pyenv latest [-k|--known] [-q|--quiet] <prefix>
+# Usage: pyenv latest [-k|--known] <prefix>
 #
 #   -k/--known      Select from all known versions instead of installed
-#   -q/--quiet      Do not print an error message on resolution failure
+#   -b/--bypass     (internal) On a resolution failure, do not print an error message
+#                   but rather print the argument unchanged
+#   -f/--force      (internal) Same as -b but also do not return a failure exit code
 
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -15,8 +17,13 @@ do
             FROM_KNOWN=1
             shift
             ;;
-        -q|--quiet)
-            QUIET=1
+        -b|--bypass)
+            BYPASS=1
+            shift
+            ;;
+        -f|--force)
+            FORCE=1
+            BYPASS=1
             shift
             ;;
         *)
@@ -71,10 +78,14 @@ IFS=$'\n'
     if [[ -n "$DEFINITION" ]]; then
         echo "$DEFINITION"
     else
-        if [[ -z $QUIET ]]; then
+        if [[ -z $BYPASS ]]; then
             echo "pyenv: no $([[ -z $FROM_KNOWN ]] && echo installed || echo known) versions match the prefix \`$prefix'" >&2
+        else
+            echo "$prefix"
+        fi
+        if [[ -z $FORCE ]]; then
+            exitcode=1
         fi
-        exitcode=1
     fi
 
 exit $exitcode

libexec/pyenv-prefix

@@ -42,7 +42,7 @@ OLDIFS="$IFS"
         exit 1
       fi
     else
-      version="$(pyenv-latest -q "$version" || echo "$version")"
+      version="$(pyenv-latest -f "$version")"
       PYENV_PREFIX_PATH="${PYENV_ROOT}/versions/${version}"
     fi
     if [ -d "$PYENV_PREFIX_PATH" ]; then

libexec/pyenv-version-name

@@ -34,7 +34,7 @@ OLDIFS="$IFS"
       versions=("${versions[@]}" "${version}")
     elif version_exists "${version#python-}"; then
       versions=("${versions[@]}" "${version#python-}")
-    elif resolved_version="$(pyenv-latest -q "$version")"; then
+    elif resolved_version="$(pyenv-latest -b "$version")"; then
       versions=("${versions[@]}" "${resolved_version}")
     else
       echo "pyenv: version \`$version' is not installed (set by $(pyenv-version-origin))" >&2

plugins/python-build/bin/pyenv-install

@@ -158,7 +158,7 @@ for DEFINITION in "${DEFINITIONS[@]}"; do
   # Try to resolve a prefix if user indeed gave a prefix.
   # We install the version under the resolved name
   # and hooks also see the resolved name
-  DEFINITION="$(pyenv-latest -q -k "$DEFINITION" || echo "$DEFINITION")"
+  DEFINITION="$(pyenv-latest -f -k "$DEFINITION")"
 
   # Set VERSION_NAME from $DEFINITION. Then compute the installation prefix.
   VERSION_NAME="${DEFINITION##*/}"

plugins/python-build/bin/pyenv-uninstall

@@ -11,6 +11,7 @@
 # See `pyenv versions` for a complete list of installed versions.
 #
 set -e
+[ -n "$PYENV_DEBUG" ] && set -x
 
 # Provide pyenv completions
 if [ "$1" = "--complete" ]; then

plugins/python-build/share/python-build/3.13.0b3t

@@ -1,2 +0,0 @@
-export PYTHON_BUILD_FREE_THREADING=1
-source "$(dirname "${BASH_SOURCE[0]}")"/3.13.0b3

plugins/python-build/share/python-build/3.13.0rc1

@@ -3,7 +3,7 @@ export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
 install_package "openssl-3.3.1" "https://www.openssl.org/source/openssl-3.3.1.tar.gz#777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e" 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
 if has_tar_xz_support; then
-    install_package "Python-3.13.0b3" "https://www.python.org/ftp/python/3.13.0/Python-3.13.0b3.tar.xz#3be094ad08b11dc2a065463524239c78dc9f2b342b01dcd4e1e606dbbc5c78a5" standard verify_py313 copy_python_gdb ensurepip
+    install_package "Python-3.13.0rc1" "https://www.python.org/ftp/python/3.13.0/Python-3.13.0rc1.tar.xz#678b884775eec0224d5159fa900879020baca2a36ce942fd95febfa1adb4a6bd" standard verify_py313 copy_python_gdb ensurepip
 else
-    install_package "Python-3.13.0b3" "https://www.python.org/ftp/python/3.13.0/Python-3.13.0b3.tgz#5e9c01cdb3e2fb1f5732a55e9522cb6a011693e795ec347b3f69ff5e217175e4" standard verify_py313 copy_python_gdb ensurepip
+    install_package "Python-3.13.0rc1" "https://www.python.org/ftp/python/3.13.0/Python-3.13.0rc1.tgz#53f1ed4920b82fa65cd32a56fa80fd18b475bf1b757597a5a104d2a4dfa5ffff" standard verify_py313 copy_python_gdb ensurepip
 fi

plugins/python-build/share/python-build/3.13.0rc1t

@@ -0,0 +1,2 @@
+export PYTHON_BUILD_FREE_THREADING=1
+source "$(dirname "${BASH_SOURCE[0]}")"/3.13.0rc1

plugins/python-build/share/python-build/miniforge3-24.3.0-0

@@ -0,0 +1,25 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-aarch64" )
+  install_script "Miniforge3-24.3.0-0-Linux-aarch64.sh" "https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge3-24.3.0-0-Linux-aarch64.sh#6c879fe354d3e26b8d960cff6b1f3cb9d2e58c79c5c07f23fff62469dc5c1480" "miniconda" verify_py310
+  ;;
+"Linux-ppc64le" )
+  install_script "Miniforge3-24.3.0-0-Linux-ppc64le.sh" "https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge3-24.3.0-0-Linux-ppc64le.sh#b7710f5dbab9a49995e027cc72cc729ad54506fbba7b936b56737d1437aa6504" "miniconda" verify_py310
+  ;;
+"Linux-x86_64" )
+  install_script "Miniforge3-24.3.0-0-Linux-x86_64.sh" "https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge3-24.3.0-0-Linux-x86_64.sh#23367676b610de826f50f7ddc91139a816d4b59bd4c69cc9b6082d9b2e7fe8a3" "miniconda" verify_py310
+  ;;
+"MacOSX-arm64" )
+  install_script "Miniforge3-24.3.0-0-MacOSX-arm64.sh" "https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge3-24.3.0-0-MacOSX-arm64.sh#9b3c3d9fa30437592e680390f2b27d45c5d5cfcbfad9a1af233f70a6d8be71a1" "miniconda" verify_py310
+  ;;
+"MacOSX-x86_64" )
+  install_script "Miniforge3-24.3.0-0-MacOSX-x86_64.sh" "https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge3-24.3.0-0-MacOSX-x86_64.sh#26a80621b146d60e5ae0d896b83ec138416653b951286361b1f93a804cb6a8d9" "miniconda" verify_py310
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of Miniforge is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

plugins/python-build/test/build.bats

@@ -888,54 +888,6 @@ OUT
   assert_success "hello world"
 }
 
-@test "mruby strategy overwrites non-writable files" {
-  # nop
-}
-
-@test "mruby strategy fetches rake if missing" {
-  # nop
-}
-
-@test "rbx uses bundle then rake" {
-  # nop
-}
-
-@test "fixes rbx binstubs" {
-  # nop
-}
-
-@test "JRuby build" {
-  # nop
-}
-
-@test "JRuby+Graal does not install launchers" {
-  # nop
-}
-
-@test "JRuby Java 7 missing" {
-  # nop
-}
-
-@test "JRuby Java is outdated" {
-  # nop
-}
-
-@test "JRuby Java 7 up-to-date" {
-  # nop
-}
-
-@test "Java version string not on first line" {
-  # nop
-}
-
-@test "Java version string on OpenJDK" {
-  # nop
-}
-
-@test "JRuby Java 9 version string" {
-  # nop
-}
-
 @test "non-writable TMPDIR aborts build" {
   export TMPDIR="${TMP}/build"
   mkdir -p "$TMPDIR"

plugins/python-build/test/hooks.bats

@@ -15,9 +15,10 @@ after_install 'echo after: \$STATUS'
 OUT
   stub pyenv-hooks "install : echo '$HOOK_PATH'/install.bash"
   stub pyenv-rehash "echo rehashed"
-  stub pyenv-latest false
 
   definition="${TMP}/3.6.2"
+  stub pyenv-latest "echo $definition"
+
   cat > "$definition" <<<"echo python-build"
   run pyenv-install "$definition"
 

plugins/python-build/test/pyenv.bats

@@ -18,7 +18,7 @@ stub_python_build_no_latest() {
   
 stub_python_build() {
   stub_python_build_no_latest "$@"
-  stub pyenv-latest false
+  stub pyenv-latest '-f -k * : shift 2; echo "$@"'
 }
 
 @test "install a single version" {
@@ -65,9 +65,9 @@ OUT
   stub_python_build_lib
   for i in {1..3}; do stub_python_build_no_latest; done
   stub pyenv-latest \
-      '-q -k 3.4 : echo 3.4.2' \
-      '-q -k 3.5.1 : false' \
-      '-q -k 3.5 : echo 3.5.2'
+      '-r -k 3.4 : echo 3.4.2' \
+      '-r -k 3.5.1 : false' \
+      '-r -k 3.5 : echo 3.5.2'
 
   run pyenv-install 3.4 3.5.1 3.5
   assert_success <<OUT

test/latest.bats

@@ -115,3 +115,25 @@ echo 3.8.1/envs/foo
 3.8.1
 !
 }
+
+@test "falls back to argument with -b" {
+  create_executable pyenv-versions <<!
+#!$BASH
+!
+  run pyenv-latest -b nonexistent
+  assert_failure
+  assert_output <<!
+nonexistent
+!
+}
+
+@test "falls back to argument and succeeds with -f" {
+  create_executable pyenv-versions <<!
+#!$BASH
+!
+  run pyenv-latest -f nonexistent
+  assert_success
+  assert_output <<!
+nonexistent
+!
+}

test/pyenv.bats

@@ -46,12 +46,7 @@ load test_helper
   assert_output "pyenv: cannot change working directory to \`$dir'"
 }
 
-@test "adds its own libexec to PATH" {
-  run pyenv echo "PATH"
-  assert_success "${BATS_TEST_DIRNAME%/*}/libexec:${BATS_TEST_DIRNAME%/*}/plugins/python-build/bin:$PATH"
-}
-
-@test "adds plugin bin dirs to PATH" {
+@test "adds its own libexec and plugin bin dirs to PATH" {
   mkdir -p "$PYENV_ROOT"/plugins/python-build/bin
   mkdir -p "$PYENV_ROOT"/plugins/pyenv-each/bin
   run pyenv echo -F: "PATH"