v2.3.26

Add CPython 3.12.0rc2 (#2778 )
2025-11-08 11:33:49 -05:00 · 2023-09-07 11:36:40 +03:00 · 2023-09-07 11:36:22 +03:00 · 2023-09-07 01:14:28 +03:00 · 2023-08-30 21:16:25 +03:00 · 2023-08-29 11:50:54 +03:00
12 changed files with 63 additions and 8 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Version History

+## Release v2.3.26
+
+* Prevent `grep` warning in `conda.bash` by @aphedges in https://github.com/pyenv/pyenv/pull/2768
+* fix a typo in README.md by @xzmeng in https://github.com/pyenv/pyenv/pull/2769
+* use -I with ensurepip by @xaocon in https://github.com/pyenv/pyenv/pull/2764
+* Add CPython 3.12.0rc2 by @edgarrmondragon in https://github.com/pyenv/pyenv/pull/2778
+
+## Release v2.3.25
+
+* Add CPython 3.8.18, 3.9.18, 3.10.13, 3.11.5 by @edgarrmondragon in https://github.com/pyenv/pyenv/pull/2763
+ 
 ## Release v2.3.24

 * README update: Added UNIX reference near Automatic installer by @VictorieeMan in https://github.com/pyenv/pyenv/pull/2744
--- a/README.md
+++ b/README.md
@@ -573,7 +573,7 @@ uninstall from the system.

 ## Pyenv plugins

-Pyenv provides a simple, flexible and maintainable way to extend and customize its functionalty with plugins --
+Pyenv provides a simple, flexible and maintainable way to extend and customize its functionality with plugins --
 as simple as creating a plugin directory and dropping a shell script on a certain subpath of it
 with whatever extra logic you need to be run at certain moments.

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

-version="2.3.24"
+version="2.3.26"
 git_revision=""

 if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then
--- a/plugins/.gitignore
+++ b/plugins/.gitignore
@@ -2,3 +2,4 @@
 !/.gitignore
 !/version-ext-compat
 !/python-build
+/python-build/test/build
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -2025,7 +2025,7 @@ build_package_ensurepip() {
    ensurepip_opts="--altinstall"
  fi
  # FIXME: `--altinstall` with `get-pip.py`
-  "$PYTHON_BIN" -s -m ensurepip ${ensurepip_opts} 1>/dev/null 2>&1 || build_package_get_pip "$@" || return 1
+  "$PYTHON_BIN" -I -m ensurepip ${ensurepip_opts} 1>/dev/null 2>&1 || build_package_get_pip "$@" || return 1
  build_package_symlink_version_suffix
 }

--- a/plugins/python-build/share/python-build/3.10.13
+++ b/plugins/python-build/share/python-build/3.10.13
@@ -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.13" "https://www.python.org/ftp/python/3.10.13/Python-3.10.13.tar.xz#5c88848668640d3e152b35b4536ef1c23b2ca4bd2c957ef1ecbb053f571dd3f6" standard verify_py310 copy_python_gdb ensurepip
+else
+    install_package "Python-3.10.13" "https://www.python.org/ftp/python/3.10.13/Python-3.10.13.tgz#698ec55234c1363bd813b460ed53b0f108877c7a133d48bde9a50a1eb57b7e65" standard verify_py310 copy_python_gdb ensurepip
+fi
--- a/plugins/python-build/share/python-build/3.12.0rc1
+++ b/plugins/python-build/share/python-build/3.12.0rc1
@@ -1,9 +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.12.0rc1" "https://www.python.org/ftp/python/3.12.0/Python-3.12.0rc1.tar.xz#bd88d516b51474d7facae3ed7ab6a421efb17e583c21c8a749470f293e2575fc" standard verify_py312 copy_python_gdb ensurepip
+    install_package "Python-3.11.5" "https://www.python.org/ftp/python/3.11.5/Python-3.11.5.tar.xz#85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f" standard verify_py311 copy_python_gdb ensurepip
 else
-    install_package "Python-3.12.0rc1" "https://www.python.org/ftp/python/3.12.0/Python-3.12.0rc1.tgz#ccd2e1bc72caaa0296c455198893c0fee7e25e56e7a23eb7d667fc8d2ba525c6" standard verify_py312 copy_python_gdb ensurepip
+    install_package "Python-3.11.5" "https://www.python.org/ftp/python/3.11.5/Python-3.11.5.tgz#a12a0a013a30b846c786c010f2c19dd36b7298d888f7c4bd1581d90ce18b5e58" standard verify_py311 copy_python_gdb ensurepip
 fi
--- a/plugins/python-build/share/python-build/3.12.0rc2
+++ b/plugins/python-build/share/python-build/3.12.0rc2
@@ -0,0 +1,9 @@
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-3.1.1s" "https://www.openssl.org/source/openssl-3.1.1s.tar.gz#b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674" 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.0rc2" "https://www.python.org/ftp/python/3.12.0/Python-3.12.0rc2.tar.xz#11eb10376e6baf7bea53001f5181eaee1797788c4db6e83a061e422357927674" standard verify_py312 copy_python_gdb ensurepip
+else
+    install_package "Python-3.12.0rc2" "https://www.python.org/ftp/python/3.12.0/Python-3.12.0rc2.tgz#c3ef992c5c0067bc9a185de79fe0c1650a9a061b4d47d8787de20e04f22e2b29" standard verify_py312 copy_python_gdb ensurepip
+fi
--- a/plugins/python-build/share/python-build/3.8.18
+++ b/plugins/python-build/share/python-build/3.8.18
@@ -0,0 +1,12 @@
+prefer_openssl11
+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-1.1.1u" "https://www.openssl.org/source/openssl-1.1.1u.tar.gz#e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6" 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.8.18" "https://www.python.org/ftp/python/3.8.18/Python-3.8.18.tar.xz#3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f" standard verify_py38 copy_python_gdb ensurepip
+else
+  install_package "Python-3.8.18" "https://www.python.org/ftp/python/3.8.18/Python-3.8.18.tgz#7c5df68bab1be81a52dea0cc2e2705ea00553b67107a301188383d7b57320b16" standard verify_py38 copy_python_gdb ensurepip
+fi
--- a/plugins/python-build/share/python-build/3.9.18
+++ b/plugins/python-build/share/python-build/3.9.18
@@ -0,0 +1,12 @@
+prefer_openssl11
+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-1.1.1u" "https://www.openssl.org/source/openssl-1.1.1u.tar.gz#e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6" 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.18" "https://www.python.org/ftp/python/3.9.18/Python-3.9.18.tar.xz#01597db0132c1cf7b331eff68ae09b5a235a3c3caa9c944c29cac7d1c4c4c00a" standard verify_py39 copy_python_gdb ensurepip
+else
+  install_package "Python-3.9.18" "https://www.python.org/ftp/python/3.9.18/Python-3.9.18.tgz#504ce8cfd59addc04c22f590377c6be454ae7406cb1ebf6f5a350149225a9354" standard verify_py39 copy_python_gdb ensurepip
+fi
--- a/plugins/python-build/test/pyenv_ext.bats
+++ b/plugins/python-build/test/pyenv_ext.bats
@@ -200,7 +200,7 @@ OUT
  assert_success

  assert_build_log <<OUT
-python -s -m ensurepip
+python -I -m ensurepip
 OUT
 }

@@ -218,7 +218,7 @@ OUT
  assert_success

  assert_build_log <<OUT
-python -s -m ensurepip --altinstall
+python -I -m ensurepip --altinstall
 OUT
 }

--- a/pyenv.d/rehash/conda.bash
+++ b/pyenv.d/rehash/conda.bash
@@ -35,7 +35,7 @@ make_shims() {

 deregister_conda_shims() {
  # adapted for Bash 4.x's associative array (#1749)
-  if declare -p registered_shims 2> /dev/null | grep -Eq '^(declare|typeset) \-A'; then
+  if declare -p registered_shims 2> /dev/null | grep -Eq '^(declare|typeset) -A'; then
    for shim in ${!registered_shims[*]}; do
      if conda_shim "${shim}" 1>&2; then
        unset registered_shims[${shim}]
Author	SHA1	Message	Date
Anton Petrov	bdfb80cc12	v2.3.26	2023-09-07 11:36:40 +03:00
Anton Petrov	abfa56e31d	v2.3.26	2023-09-07 11:36:22 +03:00
Edgar Ramírez Mondragón	1dbb100933	Add CPython 3.12.0rc2 (#2778 )	2023-09-07 01:14:28 +03:00
native-api	9100243866	Merge pull request #2764 from xaocon/pip-fix use -I with ensurepip	2023-08-30 21:16:25 +03:00
Anton Petrov	18ed727eb0	Merge pull request #2769 from xzmeng/fix-a-typo fix a typo in README.md	2023-08-29 11:50:54 +03:00
Meng Xiangzhuo	3ba8df29e5	fix a typo in README.md	2023-08-29 16:45:11 +08:00
Alex Hedges	e1b7e1b519	Fix "grep: warning: stray \ before -" in `conda.bash` (#2768 ) According to the POSIX spec, an unescaped backslash not followed by an escapable character is undefined behavior, and it has become an error in GNU grep 3.8 (2022-09-02).	2023-08-28 23:57:04 +03:00
Ivan Pozdeev	2cbba05966	gitignore the bulid directory for tests	2023-08-27 20:27:48 +03:00
Evan Pitstick	6be6231444	Use -I with ensurepip The -s flag assures that nothing can be installed to user site-packages but doesn't keep ensurepip from looking there for Pip. If Pip is installed in the user site-packages directory, pip won't be installed for the newly built python -- and its shim won't be created. -I makes the build install Pip in any case. The user site-packages installation will override it -- but we'll have the shim at least.	2023-08-27 20:27:47 +03:00
Anton Petrov	7ec5c30451	Update pyenv---version	2023-08-27 01:29:50 -07:00
Anton Petrov	14cf54fb1c	Update CHANGELOG.md	2023-08-27 01:29:26 -07:00
Anton Petrov	6e79eb0b7c	Merge pull request #2763 from edgarrmondragon/cpython-3.10.13 Add CPython 3.8.18, 3.9.18, 3.10.13, 3.11.5	2023-08-25 08:47:19 +03:00
Edgar Ramírez Mondragón	a8075debe5	Add CPython 3.8.18	2023-08-24 14:56:43 -06:00
Edgar Ramírez Mondragón	552827d3f9	Add CPython 3.9.18	2023-08-24 14:06:46 -06:00
Edgar Ramírez Mondragón	035c9336d2	Add CPython 3.11.5	2023-08-24 12:16:47 -06:00
Edgar Ramírez Mondragón	c85ca6ce60	Add CPython 3.10.13	2023-08-24 08:51:13 -06:00