Update pyenv---version

Update CHANGELOG.md
Merge pull request #2044 from poad/master
2025-11-09 12:03:49 -05:00 · 2021-08-31 08:44:12 +03:00 · 2021-08-31 08:43:56 +03:00 · 2021-08-31 08:36:49 +03:00 · 2021-08-31 08:29:43 +09:00 · 2021-08-30 23:39:24 +03:00
9 changed files with 53 additions and 21 deletions
--- a/.github/workflows/ubuntu_tests.yml
+++ b/.github/workflows/ubuntu_tests.yml
@@ -12,6 +12,7 @@ jobs:
          - 3.7.10
          - 3.8.10
          - 3.9.5
+          - 3.10.0rc1
    runs-on: Ubuntu-20.04
    steps:
      - uses: actions/checkout@v2
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 ## Version History

+## Release 2.0.6
+* Add CPython 3.9.7 (#2044)
+* Add CPython v3.8.12 (#2043)
+* Adapt conda.bash for bash associative array (#2037)
+
+## Release 2.0.5
+
+* Move man page to location where it can be automatically found by man (#2032)
+* Update checksums for CPython 3.10.0rc1 (#2025)
+* Remove 3.9.3 (#2022)
+* Add CPython 3.10.0rc1(#2023)
+
 ## Release 2.0.4

 - Added scripts for rolling releases of Miniforge (#2019)
--- a/libexec/pyenv---version
+++ b/libexec/pyenv---version
@@ -12,7 +12,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-version="2.0.4"
+version="2.0.6"
 git_revision=""

 if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then
--- a/man/man1/pyenv.1
+++ b/man/man1/pyenv.1
--- a/plugins/python-build/share/python-build/3.10.0rc1
+++ b/plugins/python-build/share/python-build/3.10.0rc1
@@ -4,7 +4,7 @@ export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
 install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
-    install_package "Python-3.10.0b4" "https://www.python.org/ftp/python/3.10.0/Python-3.10.0b4.tar.xz#27d2f40401144830bd89d632002d1ab7c7898637f098d83e813e3edf70dd3b40" standard verify_py310 copy_python_gdb ensurepip
+    install_package "Python-3.10.0rc1" "https://www.python.org/ftp/python/3.10.0/Python-3.10.0rc1.tar.xz#797061692282d0e573a0093476e57e39cf52cad56782ab2dfb79afadb3c1e638" standard verify_py310 copy_python_gdb ensurepip
 else
-    install_package "Python-3.10.0b4" "https://www.python.org/ftp/python/3.10.0/Python-3.10.0b4.tgz#f7ab6d8c05102bcdfcfa54ab0478fc9b945d699c896307b0ae177504cabc435c" standard verify_py310 copy_python_gdb ensurepip
+    install_package "Python-3.10.0rc1" "https://www.python.org/ftp/python/3.10.0/Python-3.10.0rc1.tgz#b7efa6edd72bfeae57295f1ccc7c38c9ede8087f9f082382f16f92aa38f684d3" standard verify_py310 copy_python_gdb ensurepip
 fi
--- a/plugins/python-build/share/python-build/3.8.12
+++ b/plugins/python-build/share/python-build/3.8.12
@@ -0,0 +1,10 @@
+#require_gcc
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" 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.12" "https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tar.xz#b1d3a76420375343b5e8a22fceb1ac65b77193e9ed27146524f0a9db058728ea" standard verify_py38 copy_python_gdb ensurepip
+else
+  install_package "Python-3.8.12" "https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tgz#316aa33f3b7707d041e73f246efedb297a70898c4b91f127f66dc8d80c596f1a" standard verify_py38 copy_python_gdb ensurepip
+fi
--- a/plugins/python-build/share/python-build/3.9.3
+++ b/plugins/python-build/share/python-build/3.9.3
@@ -1,10 +0,0 @@
-#require_gcc
-prefer_openssl11
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-    install_package "Python-3.9.3" "https://www.python.org/ftp/python/3.9.3/Python-3.9.3.tar.xz#30811039c65e04c14fc698e423947e464f9316e69fb44610bd38446046bb82b5" standard verify_py39 copy_python_gdb ensurepip
-else
-    install_package "Python-3.9.3" "https://www.python.org/ftp/python/3.9.3/Python-3.9.3.tgz#3afeb61a45b5a2e6f1c0f621bd8cf925a4ff406099fdb3d8c97b993a5f43d048" standard verify_py39 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/3.9.7
+++ b/plugins/python-build/share/python-build/3.9.7
@@ -0,0 +1,10 @@
+#require_gcc
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" 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.7" "https://www.python.org/ftp/python/3.9.7/Python-3.9.7.tar.xz#f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57" standard verify_py39 copy_python_gdb ensurepip
+else
+  install_package "Python-3.9.7" "https://www.python.org/ftp/python/3.9.7/Python-3.9.7.tgz#a838d3f9360d157040142b715db34f0218e535333696a5569dc6f854604eb9d1" standard verify_py39 copy_python_gdb ensurepip
+fi
--- a/pyenv.d/rehash/conda.bash
+++ b/pyenv.d/rehash/conda.bash
@@ -34,14 +34,23 @@ make_shims() {
 }

 deregister_conda_shims() {
-  local shim
-  local shims=()
-  for shim in ${registered_shims}; do
-    if ! conda_shim "${shim}" 1>&2; then
-      shims[${#shims[*]}]="${shim}"
-    fi
-  done
-  registered_shims=" ${shims[@]} "
+  # adapted for Bash 4.x's associative array (#1749)
+  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}]
+      fi
+    done
+  else
+    local shim
+    local shims=()
+    for shim in ${registered_shims}; do
+      if ! conda_shim "${shim}" 1>&2; then
+        shims[${#shims[*]}]="${shim}"
+      fi
+    done
+    registered_shims=" ${shims[@]} "
+  fi
 }

 if conda_exists; then
Author	SHA1	Message	Date
Anton Petrov	2d64fb1cb9	Update pyenv---version	2021-08-31 08:44:12 +03:00
Anton Petrov	a85875c39e	Update CHANGELOG.md	2021-08-31 08:43:56 +03:00
Anton Petrov	8db5778b12	Merge pull request #2044 from poad/master Add CPython 3.9.7	2021-08-31 08:36:49 +03:00
Kenji Saito	c7d8a1c33d	Add CPython 3.9.7	2021-08-31 08:29:43 +09:00
Ricardo N Feliciano	44b7da194b	Add CPython v3.8.12 (#2043 )	2021-08-30 23:39:24 +03:00
Anton Petrov	b2eb2d28d1	Merge pull request #2037 from NyaMisty/master [Fixed] Adapt conda.bash for bash associative array	2021-08-24 13:42:02 +03:00
Anton Petrov	8b60418361	Update CHANGELOG.md	2021-08-23 10:35:08 +03:00
Anton Petrov	e9c8dfc197	Update pyenv---version	2021-08-23 10:34:26 +03:00
Sakuragawa Misty	dfeda54079	fixes checking of associative array in conda.bash	2021-08-21 04:20:23 +08:00
Anton Petrov	4f8b15fecd	Merge pull request #2035 from pyenv/revert-2027-master Revert "Adapt conda.bash for bash associative array"	2021-08-20 14:18:30 +03:00
Anton Petrov	07609cc579	Revert "Adapt conda.bash for bash associative array"	2021-08-20 09:58:18 +03:00
Anton Petrov	3738c2a282	Merge pull request #2027 from NyaMisty/master Adapt conda.bash for bash associative array	2021-08-19 19:38:25 +03:00
Anton Petrov	9668be8850	Merge pull request #2032 from vatosarmat/master Move man page to location where it can be automatically found by man	2021-08-19 13:29:12 +03:00
V S	dc36c300e1	Move man page to location where in can be automatically found by manpage utility without manual MANPATH setting	2021-08-19 19:55:22 +10:00
Sakuragawa Misty	351ddb1095	Adapt conda.bash for bash associative array	2021-08-10 05:54:51 +08:00
native-api	d209e0612b	Merge pull request #2025 from fredrikaverpil/fix-checksums Update checksums for CPython 3.10.0rc1 Remove 3.10.0rc1	2021-08-04 23:23:24 +03:00
Fredrik Averpil	825ef64995	Remove CPython 3.10.0b4	2021-08-04 22:22:11 +02:00
Fredrik Averpil	65588f51d9	Update checksums for CPython 3.10.0rc1	2021-08-04 22:16:34 +02:00
Anton Petrov	ab1a9d290c	Merge pull request #2022 from native-api/remove_3.9.3 Remove 3.9.3	2021-08-03 21:58:21 +03:00
Anton Petrov	b40ef3c698	Merge pull request #2023 from fredrikaverpil/add-3100rc1 Add CPython 3.10.0rc1	2021-08-03 21:57:08 +03:00
Fredrik Averpil	1427f80828	Add test to CI	2021-08-03 20:10:53 +02:00
Fredrik Averpil	9db1193c2a	Add CPython 3.10.0rc1	2021-08-03 20:07:38 +02:00
Ivan Pozdeev	1f906baae8	Remove 3.9.3 It has been recalled due to introducing an unexpected incompatibility: https://www.python.org/downloads/release/python-393/	2021-08-03 06:52:44 +03:00