-dead code

[no ci]

.github/workflows/add_version.yml

@@ -41,7 +41,7 @@ jobs:
       # https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#authenticating-with-github-app-generated-tokens
       - name: Generate Github token
         if: env.rc == 0
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         id: generate-token
         with:
           app-id: ${{ vars.PYENV_BOT_APP_ID }}

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Version History
 
+## Release v2.6.27
+* commands: fast path for --sh, replace sort|uniq with sort -u by @jakelodwick in https://github.com/pyenv/pyenv/pull/3423
+* which: update the `pyenv help global` tip by @native-api in https://github.com/pyenv/pyenv/pull/3424
+* Bump actions/create-github-app-token from 2 to 3 in the github-actions group by @dependabot[bot] in https://github.com/pyenv/pyenv/pull/3428
+* python-build: advise user with no c compiler by @exurd in https://github.com/pyenv/pyenv/pull/3294
+* Add CPython 3.13.13, 3.14.4, 3.15.0a8 by @pyenv-bot[bot] in https://github.com/pyenv/pyenv/pull/3432
+* Add miniforge3 26.1.1-2, 26.1.1-3 by @native-api in https://github.com/pyenv/pyenv/pull/3433
+
 ## Release v2.6.26
 * versions: fast path for --bare --skip-aliases by @jakelodwick in https://github.com/pyenv/pyenv/pull/3411
 * Fix MacPorts OpenSSL formula detection by @tekintian in https://github.com/pyenv/pyenv/pull/3417

COMMANDS.md

@@ -40,9 +40,8 @@ Lists all available pyenv commands.
 
 Sets a local application-specific Python version by writing the version
 name to a `.python-version` file in the current directory. This version
-overrides the global version, and can be overridden itself by setting
-the `PYENV_VERSION` environment variable or with the `pyenv shell`
-command.
+overrides the [global version](#pyenv-global), and can be overridden
+itself with the [`pyenv shell`](#pyenv-shell) command.
 
     $ pyenv local 2.7.6
 
@@ -98,9 +97,8 @@ This is mainly useful in special cases like provisioning scripts.
 ## `pyenv global`
 
 Sets the global version of Python to be used in all shells by writing
-the version name to the `~/.pyenv/version` file. This version can be
-overridden by an application-specific `.python-version` file, or by
-setting the `PYENV_VERSION` environment variable.
+the version name to the `$PYENV_ROOT/version` file. This version can be
+overridden with [`pyenv local`](#pyenv-local) or [`pyenv shell`](#pyenv-shell).
 
     $ pyenv global 2.7.6
 
@@ -236,6 +234,7 @@ Then install the desired versions:
 You can also install the latest version of Python in a specific version line by supplying a prefix instead of a complete name:
 
     $ pyenv install 3.10
+    $ pyenv install 3
 
 See the [`pyenv latest` documentation](#pyenv-latest) for details on prefix resolution.
 
@@ -243,9 +242,6 @@ An older option is to use the `:latest` syntax. For example, to install the late
 
     pyenv install 3.8:latest
 
-To install the latest major release for Python 3 try:
-
-    pyenv install 3:latest
 
 ## `pyenv uninstall`
 
@@ -352,10 +348,9 @@ locations of the currently selected versions.
 
 Displays 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
 
 Only full prefixes are searched: in the actual name, the given prefix must be followed by a dot or a dash.
 

README.md

@@ -407,7 +407,7 @@ of the following commands:
 
 * [`pyenv shell <version>`](COMMANDS.md#pyenv-shell) -- select just for current shell session
 * [`pyenv local <version>`](COMMANDS.md#pyenv-local) -- automatically select whenever you are in the current directory (or its subdirectories)
-* [`pyenv global <version>`](COMMANDS.md#pyenv-shell) -- select globally for your user account
+* [`pyenv global <version>`](COMMANDS.md#pyenv-global) -- select globally for your user account
 
 E.g. to select the above-mentioned newly-installed Python 3.10.4 as your preferred version to use:
 

libexec/pyenv---version

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

libexec/pyenv-commands

@@ -3,19 +3,19 @@
 # Usage: pyenv commands [--sh|--no-sh]
 
 set -e
-[ -n "$PYENV_DEBUG" ] && set -x
+[[ -n $PYENV_DEBUG ]] && set -x
 
 # Provide pyenv completions
-if [ "$1" = "--complete" ]; then
+if [[ $1 = "--complete" ]]; then
   echo --sh
   echo --no-sh
   exit
 fi
 
-if [ "$1" = "--sh" ]; then
+if [[ $1 = "--sh" ]]; then
   sh=1
   shift
-elif [ "$1" = "--no-sh" ]; then
+elif [[ $1 = "--no-sh" ]]; then
   nosh=1
   shift
 fi
@@ -24,20 +24,25 @@ IFS=: paths=($PATH)
 
 shopt -s nullglob
 
-{ for path in "${paths[@]}"; do
-    for command in "${path}/pyenv-"*; do
-      command="${command##*pyenv-}"
-      if [ -n "$sh" ]; then
-        if [ "${command:0:3}" = "sh-" ]; then
-          echo "${command##sh-}"
-        fi
-      elif [ -n "$nosh" ]; then
-        if [ "${command:0:3}" != "sh-" ]; then
-          echo "${command##sh-}"
-        fi
-      else
-        echo "${command##sh-}"
-      fi
+{ 
+  if [[ -n $sh ]]; then
+    for path in "${paths[@]}"; do
+      for command in "${path}"/pyenv-sh-*; do
+        echo "${command##*/pyenv-sh-}"
+      done
     done
-  done
-} | sort | uniq
+  else
+    for path in "${paths[@]}"; do
+      for command in "${path}"/pyenv-*; do
+        command="${command##*/pyenv-}"
+        if [[ -n $nosh ]]; then
+          if [[ ${command:0:3} != "sh-" ]]; then
+            echo "$command"
+          fi
+        else
+          echo "${command##sh-}"
+        fi
+      done
+    done
+  fi
+} | sort -u

libexec/pyenv-which

@@ -112,8 +112,8 @@ else
         echo "The \`$PYENV_COMMAND' command exists in these Python versions:"
         echo "$versions" | sed 's/^/  /g'
         echo
-        echo "Note: See 'pyenv help global' for tips on allowing both"
-        echo "      python2 and python3 to be found."
+        echo "Note: See 'pyenv help global' for tips on allowing multiple"
+        echo "      Python versions to be found at the same time."
       } >&2
     fi
   fi

plugins/python-build/bin/python-build

@@ -14,7 +14,7 @@
 #   -g/--debug       Build a debug version
 #
 
-PYTHON_BUILD_VERSION="2.6.26"
+PYTHON_BUILD_VERSION="2.6.27"
 
 OLDIFS="$IFS"
 
@@ -202,7 +202,14 @@ build_failed() {
       colorize 33 "Results logged to ${LOG_PATH}"
       printf "\n\n"
       echo "Last 10 log lines:"
-      tail -n 10 "$LOG_PATH"
+      TAIL=`tail -n 10 "$LOG_PATH"`
+      echo "$TAIL"
+      if echo "$TAIL" | grep -q "no acceptable C compiler found"; then
+        printf "\n"
+        echo "Are the build dependencies for Python correctly installed?"
+        echo "Please consult to the Wiki page for more info."
+        echo "https://github.com/pyenv/pyenv/wiki#suggested-build-environment"
+      fi
     fi
   } >&3
   exit 1

plugins/python-build/scripts/add_cpython.py

@@ -168,7 +168,6 @@ def handle_t_thunks(version, previous_version, is_prerelease_upgrade):
     thunk_name = (str(version) + "t")
     thunk_path = OUT_DIR / thunk_name
     previous_thunk_name = str(previous_version) + "t"
-    previous_thunk_path = OUT_DIR / previous_thunk_name
     if is_prerelease_upgrade:
         logger.info(f"Git moving {previous_thunk_name} to {thunk_name}")
         subprocess.check_call(("git","-C",OUT_DIR,

plugins/python-build/share/python-build/3.13.13

@@ -0,0 +1,10 @@
+prefer_openssl3
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
+install_package "openssl-3.6.2" "https://github.com/openssl/openssl/releases/download/openssl-3.6.2/openssl-3.6.2.tar.gz#aaf51a1fe064384f811daeaeb4ec4dce7340ec8bd893027eee676af31e83a04f" 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.13.13" "https://www.python.org/ftp/python/3.13.13/Python-3.13.13.tar.xz#2ab91ff401783ccca64f75d10c882e957bdfd60e2bf5a72f8421793729b78a71" standard verify_py313 copy_python_gdb ensurepip
+else
+    install_package "Python-3.13.13" "https://www.python.org/ftp/python/3.13.13/Python-3.13.13.tgz#f9cde7b0e2ec8165d7326e2a0f59ea2686ce9d0c617dbbb3d66a7e54d31b74b9" standard verify_py313 copy_python_gdb ensurepip
+fi

plugins/python-build/share/python-build/3.14.4

@@ -0,0 +1,10 @@
+prefer_openssl3
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
+install_package "openssl-3.6.2" "https://github.com/openssl/openssl/releases/download/openssl-3.6.2/openssl-3.6.2.tar.gz#aaf51a1fe064384f811daeaeb4ec4dce7340ec8bd893027eee676af31e83a04f" 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.14.4" "https://www.python.org/ftp/python/3.14.4/Python-3.14.4.tar.xz#d923c51303e38e249136fc1bdf3568d56ecb03214efdef48516176d3d7faaef8" standard verify_py314 copy_python_gdb ensurepip
+else
+    install_package "Python-3.14.4" "https://www.python.org/ftp/python/3.14.4/Python-3.14.4.tgz#b4c059d5895f030e7df9663894ce3732bfa1b32cd3ab2883980266a45ce3cb3b" standard verify_py314 copy_python_gdb ensurepip
+fi

plugins/python-build/share/python-build/3.14.4t

@@ -0,0 +1,2 @@
+export PYTHON_BUILD_FREE_THREADING=1
+source "${BASH_SOURCE[0]%t}"

plugins/python-build/share/python-build/3.15.0a7

@@ -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.1" "https://github.com/openssl/openssl/releases/download/openssl-3.6.1/openssl-3.6.1.tar.gz#b1bfedcd5b289ff22aee87c9d600f515767ebf45f77168cb6d64f231f518a82e" 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.0a7" "https://www.python.org/ftp/python/3.15.0/Python-3.15.0a7.tar.xz#8f590c428b7f0d406df928b85737e7a3afa28eddd4d1419410ea809687ed1ea7" standard verify_py315 copy_python_gdb ensurepip
-else
-    install_package "Python-3.15.0a7" "https://www.python.org/ftp/python/3.15.0/Python-3.15.0a7.tgz#a3ab00d82e04559369fecc98fab90ccb38e14f00bc0171f06e94821c1d2b1413" standard verify_py315 copy_python_gdb ensurepip
-fi

plugins/python-build/share/python-build/3.15.0a8

@@ -0,0 +1,10 @@
+prefer_openssl3
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
+install_package "openssl-3.6.2" "https://github.com/openssl/openssl/releases/download/openssl-3.6.2/openssl-3.6.2.tar.gz#aaf51a1fe064384f811daeaeb4ec4dce7340ec8bd893027eee676af31e83a04f" 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.0a8" "https://www.python.org/ftp/python/3.15.0/Python-3.15.0a8.tar.xz#28f1b6358609042ebcc81488ec24569519f50804bb07dc23cc707b281b031c69" standard verify_py315 copy_python_gdb ensurepip
+else
+    install_package "Python-3.15.0a8" "https://www.python.org/ftp/python/3.15.0/Python-3.15.0a8.tgz#1aadddd942e7c80e92fd2d83ab36887cec860c48fa9a2b47efe8c5acaa4a29f3" standard verify_py315 copy_python_gdb ensurepip
+fi

plugins/python-build/share/python-build/3.15.0a8t

@@ -0,0 +1,2 @@
+export PYTHON_BUILD_FREE_THREADING=1
+source "${BASH_SOURCE[0]%t}"

plugins/python-build/share/python-build/miniforge3-26.1.1-2

@@ -0,0 +1,31 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-aarch64" )
+  install_script "Miniforge3-26.1.1-2-Linux-aarch64.sh" "https://github.com/conda-forge/miniforge/releases/download/26.1.1-2/Miniforge3-26.1.1-2-Linux-aarch64.sh#6525bfb24940c5e063ed14f2d840968b0fc4152a3f4edd253b7a1049a15656e7" "miniconda" verify_py312
+  ;;
+"Linux-ppc64le" )
+  install_script "Miniforge3-26.1.1-2-Linux-ppc64le.sh" "https://github.com/conda-forge/miniforge/releases/download/26.1.1-2/Miniforge3-26.1.1-2-Linux-ppc64le.sh#637cf03310343d199bcd7725aab54f59666fb1694bb99fc841973203da9c3f25" "miniconda" verify_py312
+  ;;
+"Linux-x86_64" )
+  install_script "Miniforge3-26.1.1-2-Linux-x86_64.sh" "https://github.com/conda-forge/miniforge/releases/download/26.1.1-2/Miniforge3-26.1.1-2-Linux-x86_64.sh#831421c1f32d8b510e0ef7f261aaabdbf567bdbba37373432d492621b824ab1f" "miniconda" verify_py312
+  ;;
+"MacOSX-arm64.pkg" )
+  install_script "Miniforge3-26.1.1-2-MacOSX-arm64.pkg" "https://github.com/conda-forge/miniforge/releases/download/26.1.1-2/Miniforge3-26.1.1-2-MacOSX-arm64.pkg#2cf96ab02ab575028bfe2c0d0f8ee8e7c39953588042189507d8f99c53971baf" "miniconda" verify_py312
+  ;;
+"MacOSX-arm64" )
+  install_script "Miniforge3-26.1.1-2-MacOSX-arm64.sh" "https://github.com/conda-forge/miniforge/releases/download/26.1.1-2/Miniforge3-26.1.1-2-MacOSX-arm64.sh#ed60de20689ab24dd646b9ec4b06762d35f8c0043026778699ba7c9f0816492c" "miniconda" verify_py312
+  ;;
+"MacOSX-x86_64.pkg" )
+  install_script "Miniforge3-26.1.1-2-MacOSX-x86_64.pkg" "https://github.com/conda-forge/miniforge/releases/download/26.1.1-2/Miniforge3-26.1.1-2-MacOSX-x86_64.pkg#5b7e555b22515debaf049b7cfe0eec73e0c8dc71ea1ba773b7132c852277aa72" "miniconda" verify_py312
+  ;;
+"MacOSX-x86_64" )
+  install_script "Miniforge3-26.1.1-2-MacOSX-x86_64.sh" "https://github.com/conda-forge/miniforge/releases/download/26.1.1-2/Miniforge3-26.1.1-2-MacOSX-x86_64.sh#74f3e5cdb70bf0ff9bab3e4ba8d35aee5b46bf7eebca94202cbd8d46e16ecf77" "miniconda" verify_py312
+  ;;
+* )
+  { 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/share/python-build/miniforge3-26.1.1-3

@@ -0,0 +1,31 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-aarch64" )
+  install_script "Miniforge3-26.1.1-3-Linux-aarch64.sh" "https://github.com/conda-forge/miniforge/releases/download/26.1.1-3/Miniforge3-26.1.1-3-Linux-aarch64.sh#83280e4ee71a5bd547d6b318f96e9ababe1054911ff6cc2b8801ce5493fe67e5" "miniconda" verify_py312
+  ;;
+"Linux-ppc64le" )
+  install_script "Miniforge3-26.1.1-3-Linux-ppc64le.sh" "https://github.com/conda-forge/miniforge/releases/download/26.1.1-3/Miniforge3-26.1.1-3-Linux-ppc64le.sh#5711fd69219bc9746389ef751ee4c2549d40d9b1626a0ea93cc63db1a739eee6" "miniconda" verify_py312
+  ;;
+"Linux-x86_64" )
+  install_script "Miniforge3-26.1.1-3-Linux-x86_64.sh" "https://github.com/conda-forge/miniforge/releases/download/26.1.1-3/Miniforge3-26.1.1-3-Linux-x86_64.sh#b25b828b702df4dd2a6d24d4eb56cfa912471dd8e3342cde2c3d86fe3dc2d870" "miniconda" verify_py312
+  ;;
+"MacOSX-arm64.pkg" )
+  install_script "Miniforge3-26.1.1-3-MacOSX-arm64.pkg" "https://github.com/conda-forge/miniforge/releases/download/26.1.1-3/Miniforge3-26.1.1-3-MacOSX-arm64.pkg#864d4ba41bae5ad85d41d00a163535ea4b8b1ab7a4fd3b03f875c36c0c323b80" "miniconda" verify_py312
+  ;;
+"MacOSX-arm64" )
+  install_script "Miniforge3-26.1.1-3-MacOSX-arm64.sh" "https://github.com/conda-forge/miniforge/releases/download/26.1.1-3/Miniforge3-26.1.1-3-MacOSX-arm64.sh#38e73713bc504e11cf2a70f8bc01de4a778c547e9191e682606ba76fa4397fd9" "miniconda" verify_py312
+  ;;
+"MacOSX-x86_64.pkg" )
+  install_script "Miniforge3-26.1.1-3-MacOSX-x86_64.pkg" "https://github.com/conda-forge/miniforge/releases/download/26.1.1-3/Miniforge3-26.1.1-3-MacOSX-x86_64.pkg#34cb544a2473f2b4755bdd361520114f20a61284bcdf3c2b124a392a1aa9923f" "miniconda" verify_py312
+  ;;
+"MacOSX-x86_64" )
+  install_script "Miniforge3-26.1.1-3-MacOSX-x86_64.sh" "https://github.com/conda-forge/miniforge/releases/download/26.1.1-3/Miniforge3-26.1.1-3-MacOSX-x86_64.sh#d81e77d8f3c104c64e0ab27256f901e58ac9965288ccec774db87bf1a98a03e7" "miniconda" verify_py312
+  ;;
+* )
+  { 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

test/which.bats

@@ -68,8 +68,8 @@ pyenv: py.test: command not found
 The \`py.test' command exists in these Python versions:
   3.4
 
- Note: See 'pyenv help global' for tips on allowing both
-       python2 and python3 to be found.
+Note: See 'pyenv help global' for tips on allowing multiple
+      Python versions to be found at the same time.
 OUT
 }
 
@@ -85,8 +85,8 @@ pyenv: py.test: command not found
 The \`py.test' command exists in these Python versions:
   3.4
 
- Note: See 'pyenv help global' for tips on allowing both
-       python2 and python3 to be found.
+Note: See 'pyenv help global' for tips on allowing multiple
+      Python versions to be found at the same time.
 OUT
 }
 
@@ -118,8 +118,8 @@ The \`py.test' command exists in these Python versions:
   3.3
   3.4
 
-Note: See 'pyenv help global' for tips on allowing both
-      python2 and python3 to be found.
+Note: See 'pyenv help global' for tips on allowing multiple
+      Python versions to be found at the same time.
 OUT
 }