Merge branch 'master' of github.com:yyuu/pyenv into pypy3.5-c-jit-latest

CHANGELOG.md

@@ -1,5 +1,17 @@
 ## Version History
 
+## 1.0.3
+
+* python-build: Add CPython 3.6.0b3 (#731, #744)
+* python-build: Add PyPy3.3 5.5-alpha (#734, #736)
+* python-build: Stop specifying `--enable-unicode=ucs4` on OS X (#257, #726)
+* python-build: Fix 3.6-dev and add 3.7-dev (#729, #730)
+* python-build: Add a patch for https://bugs.python.org/issue26664 (#725)
+* python-build: Add Pyston 0.5.1 (#718)
+* python-build: Add Stackless 3.4.2 (#720)
+* python-build: Add IronPython 2.7.6.3 (#716)
+* python-build: Add Stackless 2.7.9 (#714)
+
 ## 1.0.2
 
 * python-build: Add CPython 3.6.0b1 (#699)

libexec/pyenv---version

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

plugins/python-build/share/python-build/3.6.0b2 → plugins/python-build/share/python-build/3.6.0b3

@@ -2,7 +2,7 @@
 install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" 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.6.0b2" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0b2.tar.xz#3afd4544b99933275c513f7c3d3a23e183de8e209709ed8785bbd42e2c4869ea" ldflags_dirs standard verify_py36 ensurepip
+  install_package "Python-3.6.0b3" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0b3.tar.xz#b417a9024c8e5221c8b6bc154dd8e776653aed9d650f8e0d85d8ec82bf5c8fa5" ldflags_dirs standard verify_py36 ensurepip
 else
-  install_package "Python-3.6.0b2" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0b2.tgz#6322b3be346ee41dc22539eaa1c28294363fb6238335d236a51bf23d96513d02" ldflags_dirs standard verify_py36 ensurepip
+  install_package "Python-3.6.0b3" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0b3.tgz#61aa21e9fac878b8c0c1372e42b6e131890e8ce47c73c604101e3231e7f84923" ldflags_dirs standard verify_py36 ensurepip
 fi

plugins/python-build/share/python-build/pypy-5.6.0

@@ -0,0 +1 @@
+source "${BASH_SOURCE%/*}/pypy2-5.6.0"

plugins/python-build/share/python-build/pypy-5.6.0-src

@@ -0,0 +1 @@
+source "${BASH_SOURCE%/*}/pypy2-5.6.0-src"

plugins/python-build/share/python-build/pypy-portable-5.6.0

@@ -0,0 +1,16 @@
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  install_package "pypy-5.6-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.6-linux_i686-portable.tar.bz2#1f220e05ddd4423882794f0e9d3e2dfdecee259d00f1151a52dd244607313399" "pypy" verify_py27 ensurepip
+  ;;
+"linux64" )
+  install_package "pypy-5.6-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.6-linux_x86_64-portable.tar.bz2#9bd220bc54000e142bd4929435959305efeef8c832fbe3c907211cc5214095ce" "pypy" verify_py27 ensurepip
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": Portable PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

plugins/python-build/share/python-build/pypy2-5.6.0

@@ -0,0 +1,44 @@
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  if require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" 1>/dev/null 2>&1; then
+    install_package "pypy2-v5.6.0-linux32" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.6.0-linux32.tar.bz2#5d4ad43aed5c5e147f7e7c84766c729f34f63b714b6d224e912a2bb42dc95d62" "pypy" verify_py27 ensurepip
+  else
+    install_package "pypy-5.6-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.6-linux_i686-portable.tar.bz2#1f220e05ddd4423882794f0e9d3e2dfdecee259d00f1151a52dd244607313399" "pypy" verify_py27 ensurepip
+  fi
+  ;;
+"linux-armel" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy2-v5.6.0-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.6.0-linux-armel.tar.bz2#2d1c7820f6368c92bb43a153d2c995f70aa183ff8f1df6916b0d2e57838d8a30" "pypy" verify_py27 ensurepip
+  ;;
+"linux-armhf" )
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
+    install_package "pypy2-v5.6.0-linux-armhf-raspbian" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.6.0-linux-armhf-raspbian.tar.bz2#0f69c40a38d72254bf12094620bda9d2face758f763cd0d989588642d81eccae" "pypy" verify_py27 ensurepip
+  else
+    require_distro "Ubuntu 13.04" || true
+    install_package "pypy2-v5.6.0-linux-armhf-raring" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.6.0-linux-armhf-raring.tar.bz2#2c430240cecb562102c677598f106aa57899f00cd37f719989e18ed9ca44bd01" "pypy" verify_py27 ensurepip
+  fi
+  ;;
+"linux64" )
+  if require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" 1>/dev/null 2>&1; then
+    install_package "pypy2-v5.6.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.6.0-linux64.tar.bz2#aad55328cb0673a60b2633dcc3c36cf452917ac906b577eb3aed5876a7666fca" "pypy" verify_py27 ensurepip
+  else
+    install_package "pypy-5.6-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.6-linux_x86_64-portable.tar.bz2#9bd220bc54000e142bd4929435959305efeef8c832fbe3c907211cc5214095ce" "pypy" verify_py27 ensurepip
+  fi
+  ;;
+"osx64" )
+  install_package "pypy2-v5.6.0-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.6.0-osx64.tar.bz2#6121f791f440564d3a0a41315e9f2d2d61bc484654acffd85d9e1c6e92b85c36" "pypy" verify_py27 ensurepip
+  ;;
+"win32" )
+  # FIXME: never tested on Windows
+  install_zip "pypy2-v5.6.0-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.6.0-win32.zip#bab4fa37ef2d32660e291393d955a4e951d5e883abea8bee83be1ec044ddcaac" "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 'pypy2-5.6.0-src' to build from source."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

plugins/python-build/share/python-build/pypy2-5.6.0-src

@@ -0,0 +1,2 @@
+require_gcc
+install_package "pypy2-v5.6.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.6.0-src.tar.bz2#7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0" "pypy_builder" verify_py27 ensurepip