v1.2.2

CPython 3.7.0b1 -> 3.7.0b2
Merge pull request #1101 from Calinou/readme-use-markdown-image
2025-11-10 04:23:47 -05:00 · 2018-02-28 16:32:37 -05:00 · 2018-02-28 16:24:58 -05:00 · 2018-02-23 09:36:08 +09:00 · 2018-02-22 15:43:44 +01:00 · 2018-02-19 10:46:56 +09:00
16 changed files with 148 additions and 8 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 ## Version History

+## 1.2.2
+
+* python-build: Add PyPy3 5.10.1 (#1084)
+* python-build: Add CPython 3.5.5 (#1090)
+* python-build: Add Anaconda[23]-5.1.0 (#1100)
+* python-build: Fix checksum issue for CPython 3.4.8 (#1094)
+* python-build: Prevent Anaconda from installing a `clear` shim (#1084)
 ## 1.2.1

 * python-build: Add CPython 3.6.4
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ tools that do one thing well.
 This project was forked from [rbenv](https://github.com/rbenv/rbenv) and
 [ruby-build](https://github.com/rbenv/ruby-build), and modified for Python.

-<img src="https://i.gyazo.com/699a58927b77e46e71cd674c7fc7a78d.png" width="735" height="490" />
+![Terminal output example](/terminal_output.png)


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

-version="1.2.1"
+version="1.2.2"
 git_revision=""

 if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -1773,6 +1773,11 @@ build_package_verify_py37() {
  build_package_verify_py36 "$1" "${2:-3.7}"
 }

+# Post-install check for Python 3.8.x
+build_package_verify_py38() {
+  build_package_verify_py37 "$1" "${2:-3.8}"
+}
+
 build_package_ez_setup() {
  local ez_setup="ez_setup.py"
  rm -f "${ez_setup}"
--- a/plugins/python-build/share/python-build/3.4.8
+++ b/plugins/python-build/share/python-build/3.4.8
@@ -0,0 +1,8 @@
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+if has_tar_xz_support; then
+  install_package "Python-3.4.8" "https://www.python.org/ftp/python/3.4.8/Python-3.4.8.tar.xz#29a472fa902c7b2add152f5e1e82e0885a8d360645689c1db5d1949a7e8ac3ea" ldflags_dirs standard verify_py34 ensurepip
+else
+  install_package "Python-3.4.8" "https://www.python.org/ftp/python/3.4.8/Python-3.4.8.tgz#8b1a1ce043e132082d29a5d09f2841f193c77b631282a82f98895a5dbaba1639" ldflags_dirs standard verify_py34 ensurepip
+fi
--- a/plugins/python-build/share/python-build/3.5.5
+++ b/plugins/python-build/share/python-build/3.5.5
@@ -0,0 +1,8 @@
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+if has_tar_xz_support; then
+  install_package "Python-3.5.5" "https://www.python.org/ftp/python/3.5.5/Python-3.5.5.tar.xz#063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009" ldflags_dirs standard verify_py35 ensurepip
+else
+  install_package "Python-3.5.5" "https://www.python.org/ftp/python/3.5.5/Python-3.5.5.tgz#2f988db33913dcef17552fd1447b41afb89dbc26e3cdfc068ea6c62013a3a2a5" ldflags_dirs standard verify_py35 ensurepip
+fi
--- a/plugins/python-build/share/python-build/3.5.5rc1
+++ b/plugins/python-build/share/python-build/3.5.5rc1
@@ -0,0 +1,8 @@
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+if has_tar_xz_support; then
+  install_package "Python-3.5.5rc1" "https://www.python.org/ftp/python/3.5.5/Python-3.5.5rc1.tar.xz#e30ca77929c859c25cd19afafa247c63d6046ec06a7f8fe6e316e6ed62781b3e" ldflags_dirs standard verify_py35 ensurepip
+else
+  install_package "Python-3.5.5rc1" "https://www.python.org/ftp/python/3.5.5/Python-3.5.5rc1.tgz#95182d74ba96bbed4db3f01fc0b9defcc90bf0acdf36c3713be4dc1d4056d4cc" ldflags_dirs standard verify_py35 ensurepip
+fi
--- a/plugins/python-build/share/python-build/3.7-dev
+++ b/plugins/python-build/share/python-build/3.7-dev
@@ -1,4 +1,4 @@
 #require_gcc
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_git "Python-3.7-dev" "https://github.com/python/cpython" master standard verify_py37 ensurepip
+install_git "Python-3.7-dev" "https://github.com/python/cpython" "3.7" standard verify_py37 ensurepip
--- a/plugins/python-build/share/python-build/3.7.0b2
+++ b/plugins/python-build/share/python-build/3.7.0b2
@@ -2,7 +2,7 @@
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 if has_tar_xz_support; then
-  install_package "Python-3.7.0a3" "https://www.python.org/ftp/python/3.7.0/Python-3.7.0a3.tar.xz#3432d3ddf97483339badda961f7d0564595460fee166dd8f106dc4201e68446e" ldflags_dirs standard verify_py37 ensurepip
+  install_package "Python-3.7.0b2" "https://www.python.org/ftp/python/3.7.0/Python-3.7.0b2.tar.xz#92082de7fafdcdab61a91b908f32b35f13a7aef3c2671c0fa388eb574c3fc882" ldflags_dirs standard verify_py37 ensurepip
 else
-  install_package "Python-3.7.0a3" "https://www.python.org/ftp/python/3.7.0/Python-3.7.0a3.tgz#ef75398e6f978a4ead005b11d988ab2d871cf24afa4bdeef97fe09b506a76736" ldflags_dirs standard verify_py37 ensurepip
+  install_package "Python-3.7.0b2" "https://www.python.org/ftp/python/3.7.0/Python-3.7.0b2.tgz#2c787957e79bc916c913d6aeea899f07539729329ea76500387fd11cf1bd3b0a" ldflags_dirs standard verify_py37 ensurepip
 fi
--- a/plugins/python-build/share/python-build/3.8-dev
+++ b/plugins/python-build/share/python-build/3.8-dev
@@ -0,0 +1,4 @@
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_git "Python-3.8-dev" "https://github.com/python/cpython" master standard verify_py38 ensurepip
--- a/plugins/python-build/share/python-build/anaconda2-5.1.0
+++ b/plugins/python-build/share/python-build/anaconda2-5.1.0
@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Anaconda2-5.1.0-Linux-x86" "https://repo.continuum.io/archive/Anaconda2-5.1.0-Linux-x86.sh#5af0c7a09a5f3aaf3666c0b362246d342d80e782128ef043998c9ead5ad41df7" "anaconda" verify_py27
+  ;;
+"Linux-x86_64" )
+  install_script "Anaconda2-5.1.0-Linux-x86_64" "https://repo.continuum.io/archive/Anaconda2-5.1.0-Linux-x86_64.sh#5f26ee92860d1dffdcd20910ff2cf75572c39d2892d365f4e867a611cca2af5b" "anaconda" verify_py27
+  ;;
+"MacOSX-x86_64" )
+  install_script "Anaconda2-5.1.0-MacOSX-x86_64" "https://repo.continuum.io/archive/Anaconda2-5.1.0-MacOSX-x86_64.sh#b686e01aeadb33526d9c154a0ac6f691dfad135080df96fb44d3ae1e4b128521" "anaconda" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of Anaconda2 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac
--- a/plugins/python-build/share/python-build/anaconda3-5.1.0
+++ b/plugins/python-build/share/python-build/anaconda3-5.1.0
@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Anaconda3-5.1.0-Linux-x86" "https://repo.continuum.io/archive/Anaconda3-5.1.0-Linux-x86.sh#0e940272517d8f8a6f26316a19e4be2bdaea8477a3a32cc2ecee7b48fd0fae84" "anaconda" verify_py36
+  ;;
+"Linux-x86_64" )
+  install_script "Anaconda3-5.1.0-Linux-x86_64" "https://repo.continuum.io/archive/Anaconda3-5.1.0-Linux-x86_64.sh#7e6785caad25e33930bc03fac4994a434a21bc8401817b7efa28f53619fa9c29" "anaconda" verify_py36
+  ;;
+"MacOSX-x86_64" )
+  install_script "Anaconda3-5.1.0-MacOSX-x86_64" "https://repo.continuum.io/archive/Anaconda3-5.1.0-MacOSX-x86_64.sh#be705b3c3a0ca29ee32ce7658890bb5edb32a9eadedc09dec3d7e3cfbfd23cb7" "anaconda" verify_py36
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of Anaconda3 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac
--- a/plugins/python-build/share/python-build/pypy3.5-5.10.1
+++ b/plugins/python-build/share/python-build/pypy3.5-5.10.1
@@ -0,0 +1,58 @@
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  if require_distro "Ubuntu 14.04" 1>/dev/null 2>&1; then
+    install_package "pypy3-v5.10.1-linux32" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.1-linux32.tar.bz2#a6ceca9ee5dc511de7902164464b88311fec9366c5673d0c00528eda862bbe54" "pypy" verify_py27 ensurepip
+  fi
+  ;;
+"linux64" )
+  if require_distro "Ubuntu 14.04" "Ubuntu 16.04" 1>/dev/null 2>&1; then
+    install_package "pypy3-v5.10.1-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.1-linux64.tar.bz2#75a276e1ee1863967bbacb70c5bff636de200768c0ec90e72f7ec17aace0aefe" "pypy" verify_py27 ensurepip
+  else
+    install_package "pypy3.5-5.10.1-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3.5-5.10.1-linux_x86_64-portable.tar.bz2#b7c7b0e0905208ce8a8061b1a0ae136a702e5218d0d350cb5216ad5a7c20d12e" "pypy" verify_py35 ensurepip
+  fi
+  ;;
+"linux-armel" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy3-v5.10.1-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.1-linux-armel.tar.bz2#5065e9ad958d06b9612ba974f43997d20168d4245c054dd43270e4b458782282" "pypy" verify_py27 ensurepip
+  ;;
+"linux-armhf" )
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
+    install_package "pypy3-v5.10.1-linux-armhf-raspbian" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.1-linux-armhf-raspbian.tar.bz2#203dd595fbad7055340b23326f20c85b0d6c11c4877e3559a437611fc2ac40c2" "pypy" verify_py27 ensurepip
+  else
+    { echo
+      colorize 1 "ERROR"
+      echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
+      echo "try 'pypy3.5-5.10.1-src' to build from source."
+      echo
+    } >&2
+    exit 1
+  fi
+  ;;
+"osx64" )
+  if require_osx_version "10.13"; then
+    install_package "pypy3-v5.10.1-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.1-osx64.tar.bz2#52f006611513c995fdebba6e72d394186d4085460408cbbe086e5467bf3fb9b6" "pypy" verify_py27 ensurepip
+  else
+  #  install_package "pypy3-v5.10.1-osx64-2" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.1-osx64-2.tar.bz2#" "pypy" verify_py27 ensurepip
+    { echo
+      colorize 1 "ERROR"
+      echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < 10.13."
+      echo "try 'pypy3.5-5.10.1-src' to build from source."
+      echo
+    } >&2
+    exit 1
+  fi
+  ;;
+"win32" )
+  # FIXME: never tested on Windows
+  install_zip "pypy3-v5.10.1-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.1-win32.zip#4edf4f021689a529e5a631c5cca72a1a9dc19a6ea2091e64289cdd5b60eaf929" "pypy" verify_py27 ensurepip
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo "try 'pypy3.5-5.10.1-src' to build from source."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac
--- a/plugins/python-build/share/python-build/pypy3.5-5.10.1-src
+++ b/plugins/python-build/share/python-build/pypy3.5-5.10.1-src
@@ -0,0 +1,3 @@
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
+install_package "pypy3-v5.10.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.1-src.tar.bz2#f5548e06e2fc0c24ec8b6e3c5b09f90081818f7caa3e436dc312592611724713" "pypy_builder" verify_py35 ensurepip
--- a/pyenv.d/rehash/conda.d/default.list
+++ b/pyenv.d/rehash/conda.d/default.list
@@ -1,4 +1,5 @@
 bunzip2
+clear
 # curl
 curl
 curl-config
--- a/terminal_output.png
+++ b/terminal_output.png
Author	SHA1	Message	Date
Josh Friend	a8e207f330	v1.2.2	2018-02-28 16:32:37 -05:00
Josh Friend	5f74547379	CPython 3.7.0b1 -> 3.7.0b2	2018-02-28 16:24:58 -05:00
Yamashita, Yuu	23e1c5049f	Merge pull request #1101 from Calinou/readme-use-markdown-image Use Markdown image markup in README	2018-02-23 09:36:08 +09:00
Hugo Locurcio	7ca1923a44	Use Markdown image markup in README This also fixes the aspect ratio of the image being incorrect.	2018-02-22 15:43:44 +01:00
Yamashita, Yuu	445d59ae2e	Merge pull request #1100 from shoichiaizawa/add-anaconda-5.1.0 python-build: add anaconda[23]-5.1.0	2018-02-19 10:46:56 +09:00
Shoichi Aizawa	bc9687576e	python-build: add anaconda[23]-5.1.0	2018-02-16 18:03:57 +09:00
Yamashita, Yuu	907a86b743	Merge pull request #1094 from claco/update-3.4.8 Correct CPython 3.4.8 Checksums	2018-02-09 13:13:02 +09:00
Christopher H. Laco	812f02662b	Correct CPython 3.4.8 Checksums The current checksums for tar.xz and .tgz files are reversed. This causes python-build to fail with a checksum mismatch error. Reversing the checksums to allow the build to succeed.	2018-02-08 22:40:04 -05:00
Yamashita, Yuu	5c0570cdc0	Merge pull request #1093 from charlesreid1/master Improve screenshot in readme	2018-02-09 09:37:18 +09:00
Yamashita, Yuu	43c4063f51	Merge pull request #1091 from BanzaiMan/python-build-updates Python-build updates	2018-02-09 09:33:52 +09:00
Charles Reid	aab718844a	Changing background to be lighter/lower contrast	2018-02-08 16:10:37 -08:00
Charles Reid	59050aa093	Fixing image of terminal output to use carbon (cleaner and easier-to-read colors)	2018-02-08 16:08:24 -08:00
Hiro Asari	42349d9d24	Update 3.4.8rc1 to 3.4.8 release	2018-02-08 08:34:01 -05:00
Hiro Asari	2ba2d8797b	Add 3.8-dev to point to `master` Push 3.7-dev to `3.7` branch	2018-02-08 08:27:18 -05:00
Yamashita, Yuu	04d9342f82	Merge pull request #1090 from draeath/master Add CPython 3.5.5	2018-02-08 09:38:09 +09:00
Paul Bransford	d85bc23592	Add CPython 3.5.5	2018-02-07 17:25:15 -05:00
INADA Naoki	f114557698	3.7.0a4 -> 3.7.0b1 (#1086 )	2018-02-01 13:31:38 -05:00
Yamashita, Yuu	95ad305bcb	Merge pull request #1084 from scop/pypy3-5.10.1 Add pypy3 5.10.1	2018-01-29 09:05:27 +09:00
Ville Skyttä	6c0625710f	Add pypy3 5.10.1	2018-01-29 00:11:11 +02:00
Yamashita, Yuu	86e1b9a8ad	Merge pull request #1082 from shoichiaizawa/add-clear-to-conda-blacklist Do not create `clear` shim when Anaconda is installed	2018-01-26 15:17:19 +09:00
Shoichi Aizawa	b64c445b61	Do not create `clear` shim when Anaconda is installed Add `clear` to the Anaconda's default blacklist in order to prevent pyenv from creating the shim script for it. The `clear` command executable began included from Anaconda 5.0.0 onwards, and this executable now conceals that of the user's base system - this hinders the user from running the `clear` command with the `command not found` error output if a user installs and selects one or more Python version(s) other than Anaconda 5.x.x. Adding this one-liner to the blacklist allows the user to use the `clear` command even when Anaconda 5.x.x is not selected by pyenv.	2018-01-26 13:29:48 +09:00
Josh Friend	1864fd7b93	Add CPython 3.4.8rc1 and 3.5.5rc1	2018-01-23 10:13:57 -05:00
Josh Friend	6f27c91b5f	Update CPython 3.7.0a3 -> 3.7.0a4	2018-01-12 18:56:44 -05:00