2.3.17

Merge pull request #2670 from mirekdlugosz/cpython-3.10.11
2025-11-10 12:33:48 -05:00 · 2023-04-06 06:58:52 +03:00 · 2023-04-06 06:58:33 +03:00 · 2023-04-05 18:28:35 +03:00 · 2023-04-05 18:07:59 +03:00 · 2023-04-05 15:52:01 +02:00
9 changed files with 38 additions and 7 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Version History

+## Release 2.3.17
+
+* Try locate `readlink` first in pyenv-hooks, fix #2654 by @Harry-Chen in https://github.com/pyenv/pyenv/pull/2655
+* Add CPython 3.12.0a7 by @edgarrmondragon in https://github.com/pyenv/pyenv/pull/2668
+* Add CPython 3.11.3 by @mirekdlugosz in https://github.com/pyenv/pyenv/pull/2671
+* Add CPython 3.10.11 by @mirekdlugosz in https://github.com/pyenv/pyenv/pull/2670
+
 ## Release 2.3.16

 * Add Miniforge3-22.11.1-4 by @jlec in https://github.com/pyenv/pyenv/pull/2642
--- a/libexec/pyenv
+++ b/libexec/pyenv
@@ -29,7 +29,7 @@ if enable -f "${BASH_SOURCE%/*}"/../libexec/pyenv-realpath.dylib realpath 2>/dev
 else
  [ -z "$PYENV_NATIVE_EXT" ] || abort "failed to load \`realpath' builtin"

-  READLINK=$(type -P greadlink readlink | head -n1)
+  READLINK=$(type -P readlink)
  [ -n "$READLINK" ] || abort "cannot find readlink - are you missing GNU coreutils?"

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

-version="2.3.16"
+version="2.3.17"
 git_revision=""

 if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then
--- a/libexec/pyenv-hooks
+++ b/libexec/pyenv-hooks
@@ -26,7 +26,7 @@ if ! enable -f "${BASH_SOURCE%/*}"/pyenv-realpath.dylib realpath 2>/dev/null; th
    echo "pyenv: failed to load \`realpath' builtin" >&2
    exit 1
  fi
-READLINK=$(type -P greadlink readlink | head -n1)
+READLINK=$(type -P readlink)
 if [ -z "$READLINK" ]; then
  echo "pyenv: cannot find readlink - are you missing GNU coreutils?" >&2
  exit 1
--- a/libexec/pyenv-versions
+++ b/libexec/pyenv-versions
@@ -34,7 +34,7 @@ if ! enable -f "${BASH_SOURCE%/*}"/pyenv-realpath.dylib realpath 2>/dev/null; th
    exit 1
  fi

-  READLINK=$(type -P greadlink readlink | head -n1)
+  READLINK=$(type -P readlink)
  if [ -z "$READLINK" ]; then
    echo "pyenv: cannot find readlink - are you missing GNU coreutils?" >&2
    exit 1
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -56,9 +56,14 @@ lib() {
 }
 lib "$1"

+READLINK=$(type -P readlink)
+if [ -z "$READLINK" ]; then
+  echo "pyenv: cannot find readlink - are you missing GNU coreutils?" >&2
+  exit 1
+fi

 resolve_link() {
-  $(type -P greadlink readlink | head -n1) "$1"
+  $READLINK "$1"
 }

 abs_dirname() {
--- a/plugins/python-build/share/python-build/3.10.11
+++ b/plugins/python-build/share/python-build/3.10.11
@@ -0,0 +1,9 @@
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1o" "https://www.openssl.org/source/openssl-1.1.1o.tar.gz#9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f" 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.10.11" "https://www.python.org/ftp/python/3.10.11/Python-3.10.11.tar.xz#3c3bc3048303721c904a03eb8326b631e921f11cc3be2988456a42f115daf04c" standard verify_py310 copy_python_gdb ensurepip
+else
+    install_package "Python-3.10.11" "https://www.python.org/ftp/python/3.10.11/Python-3.10.11.tar.xz#3c3bc3048303721c904a03eb8326b631e921f11cc3be2988456a42f115daf04c" standard verify_py310 copy_python_gdb ensurepip
+fi
--- a/plugins/python-build/share/python-build/3.11.3
+++ b/plugins/python-build/share/python-build/3.11.3
@@ -0,0 +1,10 @@
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
+install_package "openssl-1.1.1s" "https://www.openssl.org/source/openssl-1.1.1s.tar.gz#c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa" 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.11.3" "https://www.python.org/ftp/python/3.11.3/Python-3.11.3.tar.xz#8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e" standard verify_py311 copy_python_gdb ensurepip
+else
+    install_package "Python-3.11.3" "https://www.python.org/ftp/python/3.11.3/Python-3.11.3.tar.xz#8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e" standard verify_py311 copy_python_gdb ensurepip
+fi
--- a/plugins/python-build/share/python-build/3.12.0a7
+++ b/plugins/python-build/share/python-build/3.12.0a7
@@ -3,7 +3,7 @@ export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
 install_package "openssl-1.1.1s" "https://www.openssl.org/source/openssl-1.1.1s.tar.gz#c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa" 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.12.0a6" "https://www.python.org/ftp/python/3.12.0/Python-3.12.0a6.tar.xz#298440252c4b6b4e120e014c15d729eaf8ab779300dcca61d422c537e4e85eca" standard verify_py312 copy_python_gdb ensurepip
+    install_package "Python-3.12.0a7" "https://www.python.org/ftp/python/3.12.0/Python-3.12.0a7.tar.xz#a19ae4dc5afebdff5e1312346f160062a11e0dbd5f9e68a6a981ea37b21608e1" standard verify_py312 copy_python_gdb ensurepip
 else
-    install_package "Python-3.12.0a6" "https://www.python.org/ftp/python/3.12.0/Python-3.12.0a6.tgz#9301a243da5a1982133ddf804b76ee1fe11aa98e2d3dfb09f095485eaa50edfd" standard verify_py312 copy_python_gdb ensurepip
+    install_package "Python-3.12.0a7" "https://www.python.org/ftp/python/3.12.0/Python-3.12.0a7.tgz#86d288766153193706e545cc98f73ea8ef1a9cb057608cfdecbd89190b796cf6" standard verify_py312 copy_python_gdb ensurepip
 fi
Author	SHA1	Message	Date
Anton Petrov	9a4f9c2511	2.3.17	2023-04-06 06:58:52 +03:00
Anton Petrov	bee178a95d	2.3.17	2023-04-06 06:58:33 +03:00
Anton Petrov	0f75cd8800	Merge pull request #2670 from mirekdlugosz/cpython-3.10.11 Add CPython 3.10.11	2023-04-05 18:28:35 +03:00
Anton Petrov	29c4f279a3	Merge pull request #2671 from mirekdlugosz/cpython-3.11.3 Add CPython 3.11.3	2023-04-05 18:07:59 +03:00
Mirek Długosz	be4939604e	Add CPython 3.11.3	2023-04-05 15:52:01 +02:00
Mirek Długosz	fc616a0aee	Add CPython 3.10.11	2023-04-05 15:51:13 +02:00
Edgar R. M	b613a4abeb	Add CPython 3.12.0a7 (#2668 )	2023-04-05 05:56:24 +03:00
Shengqi Chen	b1ee6c93c4	Try locate `readlink` first in pyenv-hooks, fix #2654 (#2655 ) * Remove all use of `greadlink`, fix #2654 Signed-off-by: Harry Chen <i@harrychen.xyz> * revert greadlink back in tests --------- Signed-off-by: Harry Chen <i@harrychen.xyz> Co-authored-by: Anton Petrov <anton.a.petrov@gmail.com>	2023-03-28 11:25:27 +03:00