v1.0.8 (fixes #841)

The option is available only if verifying digest, not available when computing digest.

>       --quiet
>              don't print OK for each successfully verified file

CHANGELOG.md

@@ -1,5 +1,54 @@
 ## Version History
 
+## 1.0.8
+
+* pyenv: Fix fish subcommand completion (#831)
+* python-build: Add Anaconda2/Anaconda3 4.3.0  (#824)
+* python-build: Use CPython on GitHub as the source repository of CPython development versions (#836, #837)
+* python-build: Fix checksum verification issue on the platform where OpenSSL isn't available (#840)
+
+## 1.0.7
+
+* python-build: Add CPython 3.5.3 (#811)
+* python-build: Add CPython 3.4.6 (#812)
+* python-build: Fix tar.gz checksum of CPython 3.6.0 (#793)
+* python-build: Jython installer workaround (#800)
+* python-build: Disable optimization (`-O0`) when `--debug` was specified (#808)
+
+## 1.0.6
+
+* python-build: Add CPython 3.6.0 (#787)
+
+## 1.0.5
+
+* python-build: Add CPython 2.7.13 (#782)
+* python-build: Add CPython 3.6.0rc2 (#781)
+* python-build: Add Anaconda 4.2.0 (#774)
+* python-build: Add Anaconda3 4.2.0 (#765)
+* python-build: Add IronPython 2.7.7 (#755)
+
+## 1.0.4
+
+* python-build: Add PyPy 5.6.0 (#751)
+* python-build: Add PyPy3 3.5 nightlies (`pypy3.5-c-jit-latest` #737)
+* python-build: Add Stackless 2.7.12 (#753)
+* python-build: Add Stackless 2.7.11
+* python-build: Add Stackless 2.7.10
+* python-build: Add Pyston 0.6.0
+* python-build: Add CPython 3.6.0b4 (#762)
+
+## 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)
@@ -315,7 +364,7 @@
 * python-build: Fix build of Tkinter with Tcl/Tk 8.6 (#131)
 * python-build: Fix build problem with Readline 6.3 (#126, #131, #149, #152)
 * python-build: Do not exit with errors even if some of modules are absent (#131)
-* python-build: MacOSX was mispelled as MaxOSX in `anaconda_architecture` (#136)
+* python-build: MacOSX was misspelled as MaxOSX in `anaconda_architecture` (#136)
 * python-build: Use default `cc` as the C Compiler to build CPython (#148, #150)
 * python-build: Display value from `pypy_architecture` and `anaconda_architecture` on errors (yyuu/pyenv-virtualenv#18)
 * python-build: Remove old development version; 2.6-dev

Makefile

@@ -9,4 +9,4 @@ test: bats
 	cd plugins/python-build && $(PWD)/bats/bin/bats $${CI:+--tap} test
 
 bats:
-	git clone https://github.com/sstephenson/bats.git
+	git clone --depth 1 https://github.com/sstephenson/bats.git

README.md

@@ -87,7 +87,7 @@ then `/bin`.
 pyenv works by inserting a directory of _shims_ at the front of your
 `PATH`:
 
-    ~/.pyenv/shims:/usr/local/bin:/usr/bin:/bin
+    $(pyenv root)/shims:/usr/local/bin:/usr/bin:/bin
 
 Through a process called _rehashing_, pyenv maintains shims in that
 directory to match every Python command across every installed version
@@ -119,7 +119,7 @@ reading it from the following sources, in this order:
 3. The first `.python-version` file found (if any) by searching each parent
    directory, until reaching the root of your filesystem.
 
-4. The global `~/.pyenv/version` file. You can modify this file using
+4. The global `$(pyenv root)/version` file. You can modify this file using
    the [`pyenv global`](https://github.com/yyuu/pyenv/blob/master/COMMANDS.md#pyenv-global) command. If the global version
    file is not present, pyenv assumes you want to use the "system"
    Python. (In other words, whatever version would run if pyenv weren't in your
@@ -133,8 +133,9 @@ in this example), but also have Python 3.3.6, 3.2, and 2.5 available on your
 `PATH`, one would first `pyenv install` the missing versions, then set `pyenv
 global system 3.3.6 3.2 2.5`. At this point, one should be able to find the full
 executable path to each of these using `pyenv which`, e.g. `pyenv which python2.5`
-(should display `$PYENV_ROOT/versions/2.5/bin/python2.5`), or `pyenv which
-python3.4` (should display path to system Python3).
+(should display `$(pyenv root)/versions/2.5/bin/python2.5`), or `pyenv which
+python3.4` (should display path to system Python3). You can also specify multiple
+versions in a `.python-version` file, separated by newlines or any whitespace.
 
 ### Locating the Python Installation
 
@@ -143,16 +144,22 @@ specified, it passes the command along to the corresponding Python
 installation.
 
 Each Python version is installed into its own directory under
-`~/.pyenv/versions`.
+`$(pyenv root)/versions`.
 
 For example, you might have these versions installed:
 
-* `~/.pyenv/versions/2.7.8/`
-* `~/.pyenv/versions/3.4.2/`
-* `~/.pyenv/versions/pypy-2.4.0/`
+* `$(pyenv root)/versions/2.7.8/`
+* `$(pyenv root)/versions/3.4.2/`
+* `$(pyenv root)/versions/pypy-2.4.0/`
 
 As far as pyenv is concerned, version names are simply the directories in
-`~/.pyenv/versions`.
+`$(pyenv root)/versions`.
+
+### Managing Virtual Environments
+
+There is a pyenv plugin named [pyenv-virtualenv](https://github.com/yyuu/pyenv-virtualenv) which comes with various features to help pyenv users to manage virtual environments created by virtualenv or Anaconda.
+Because the `activate` script of those virtual environments are relying on mutating `$PATH` variable of user's interactive shell, it will intercept pyenv's shim style command execution hooks.
+We'd recommend to install pyenv-virtualenv as well if you have some plan to play with those virtual environments.
 
 
 ----
@@ -184,20 +191,21 @@ easy to fork and contribute any changes back upstream.
    pyenv repo is cloned and add `$PYENV_ROOT/bin` to your `$PATH` for access
    to the `pyenv` command-line utility.
 
-        $ echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bash_profile
-        $ echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bash_profile
-
-    **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.
-    **Ubuntu note**: Modify your `~/.bashrc` file instead of `~/.bash_profile`.
+    ```sh
+    $ echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bash_profile
+    $ echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bash_profile
+    ```
+    **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.  
+    **Ubuntu and Fedora note**: Modify your `~/.bashrc` file instead of `~/.bash_profile`.
 
 3. **Add `pyenv init` to your shell** to enable shims and autocompletion.
    Please make sure `eval "$(pyenv init -)"` is placed toward the end of the shell
    configuration file since it manipulates `PATH` during the initialization.
-
-        $ echo 'eval "$(pyenv init -)"' >> ~/.bash_profile
-
-    **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.
-    **Ubuntu note**: Modify your `~/.bashrc` file instead of `~/.bash_profile`.
+    ```sh
+    $ echo 'eval "$(pyenv init -)"' >> ~/.bash_profile
+    ```
+    **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.  
+    **Ubuntu and Fedora note**: Modify your `~/.bashrc` file instead of `~/.bash_profile`.
     
     **General warning**: There are some systems where the `BASH_ENV` variable is configured
     to point to `.bashrc`. On such systems you should almost certainly put the abovementioned line
@@ -207,14 +215,14 @@ easy to fork and contribute any changes back upstream.
 
 4. **Restart your shell so the path changes take effect.**
    You can now begin using pyenv.
-
-        $ exec $SHELL
-
-5. **Install Python versions into `$PYENV_ROOT/versions`.**
+    ```sh
+    $ exec $SHELL
+    ```
+5. **Install Python versions into `$(pyenv root)/versions`.**
    For example, to download and install Python 2.7.8, run:
-
-        $ pyenv install 2.7.8
-
+    ```sh
+    $ pyenv install 2.7.8
+    ```
    **NOTE:** If you need to pass configure option to build, please use
    ```CONFIGURE_OPTS``` environment variable.
    
@@ -233,16 +241,20 @@ upgrade your installation at any time using git.
 
 To upgrade to the latest development version of pyenv, use `git pull`:
 
-    $ cd ~/.pyenv
-    $ git pull
+```sh
+$ cd $(pyenv root)
+$ git pull
+```
 
 To upgrade to a specific release of pyenv, check out the corresponding tag:
 
-    $ cd ~/.pyenv
-    $ git fetch
-    $ git tag
-    v0.1.0
-    $ git checkout v0.1.0
+```sh
+$ cd $(pyenv root)
+$ git fetch
+$ git tag
+v0.1.0
+$ git checkout v0.1.0
+```
 
 ### Uninstalling pyenv
 
@@ -259,10 +271,10 @@ uninstall from the system.
 
 2. To completely **uninstall** pyenv, perform step (1) and then remove
    its root directory. This will **delete all Python versions** that were
-   installed under `` `pyenv root`/versions/ `` directory:
-
-        rm -rf `pyenv root`
-
+   installed under `` $(pyenv root)/versions/ `` directory:
+    ```sh
+    rm -rf $(pyenv root)
+    ```
    If you've installed pyenv using a package manager, as a final step
    perform the pyenv package removal. For instance, for Homebrew:
 
@@ -296,11 +308,11 @@ opposed to this idea. Here's what `pyenv init` actually does:
 
 1. **Sets up your shims path.** This is the only requirement for pyenv to
    function properly. You can do this by hand by prepending
-   `~/.pyenv/shims` to your `$PATH`.
+   `$(pyenv root)/shims` to your `$PATH`.
 
 2. **Installs autocompletion.** This is entirely optional but pretty
-   useful. Sourcing `~/.pyenv/completions/pyenv.bash` will set that
-   up. There is also a `~/.pyenv/completions/pyenv.zsh` for Zsh
+   useful. Sourcing `$(pyenv root)/completions/pyenv.bash` will set that
+   up. There is also a `$(pyenv root)/completions/pyenv.zsh` for Zsh
    users.
 
 3. **Rehashes shims.** From time to time you'll need to rebuild your
@@ -320,7 +332,7 @@ To see exactly what happens under the hood for yourself, run `pyenv init -`.
 ### Uninstalling Python Versions
 
 As time goes on, you will accumulate Python versions in your
-`~/.pyenv/versions` directory.
+`$(pyenv root)/versions` directory.
 
 To remove old Python versions, `pyenv uninstall` command to automate
 the removal process.
@@ -351,6 +363,9 @@ name | default | description
 `PYENV_DEBUG` | | Outputs debug information.<br>Also as: `pyenv --debug <subcommand>`
 `PYENV_HOOK_PATH` | [_see wiki_][hooks] | Colon-separated list of paths searched for pyenv hooks.
 `PYENV_DIR` | `$PWD` | Directory to start searching for `.python-version` files.
+`PYTHON_BUILD_ARIA2_OPTS` | | Used to pass aditional parameters to [`aria2`](https://aria2.github.io/).<br>if `aria2c` binary is available on PATH, pyenv use `aria2c` instead of `curl` or `wget` to download the Python Source code. If you have an unstable internet connection, you can use this variable to instruct `aria2` to accelerate the download.<br>In most cases, you will only need to use `-x 10 -k 1M` as value to `PYTHON_BUILD_ARIA2_OPTS` environment variable
+
+
 
 ## Development
 

completions/pyenv.fish

@@ -18,5 +18,6 @@ end
 
 complete -f -c pyenv -n '__fish_pyenv_needs_command' -a '(pyenv commands)'
 for cmd in (pyenv commands)
-  complete -f -c pyenv -n "__fish_pyenv_using_command $cmd" -a "(pyenv completions $cmd)"
+  complete -f -c pyenv -n "__fish_pyenv_using_command $cmd" -a \
+    "(pyenv completions (commandline -opc)[2..-1])"
 end

libexec/pyenv---version

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

plugins/python-build/README.md

@@ -175,7 +175,7 @@ definition. (All bundled definitions include checksums.)
 python-build will first attempt to download package files from a mirror hosted on
 GitHub Pages. If a package is not available on the mirror, if the mirror
 is down, or if the download is corrupt, python-build will fall back to the
-official URL specified in the defintion file.
+official URL specified in the definition file.
 
 You can point python-build to another mirror by specifying the
 `PYTHON_BUILD_MIRROR_URL` environment variable--useful if you'd like to run your

plugins/python-build/bin/pyenv-install

@@ -191,7 +191,7 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then
     # unsatisfied local .python-version file can cause the installer to
     # fail.)
     for version_info in "${VERSION_NAME%-dev}" "${VERSION_NAME%.*}" "${VERSION_NAME%%.*}"; do
-      # Anaconda's `curl` doesn't work on platfrom where `/etc/pki/tls/certs/ca-bundle.crt` isn't available (e.g. Debian)
+      # Anaconda's `curl` doesn't work on platform where `/etc/pki/tls/certs/ca-bundle.crt` isn't available (e.g. Debian)
       for version in $(pyenv-whence "python${version_info}" 2>/dev/null || true); do
         if [[ "${version}" != "anaconda"* ]] && [[ "${version}" != "miniconda"* ]]; then
           PYENV_BOOTSTRAP_VERSION="${version}"

plugins/python-build/bin/python-build

@@ -247,7 +247,7 @@ compute_sha2() {
     output="$("$openssl" dgst -sha256 2>/dev/null)" || return 1
     echo "${output##* }"
   elif type sha256sum &>/dev/null; then
-    output="$(sha256sum --quiet)" || return 1
+    output="$(sha256sum -b)" || return 1
     echo "${output% *}"
   else
     return 1
@@ -588,7 +588,7 @@ fetch_jar() {
 
   # Must use full path to jar and destination directory:
   #   http://bugs.jython.org/issue2350
-  { if $JAVA -jar $PWD/${package_name}.jar -s -d $PWD/${package_name}; then
+  { if $JAVA -jar "$PWD/${package_name}.jar" -s -d "$PWD/${package_name}"; then
       if [ -z "$KEEP_BUILD_PATH" ]; then
         rm -f "$package_filename"
       else
@@ -902,11 +902,10 @@ fix_jython_shebangs() {
   for file in "${PREFIX_PATH}/bin"/*; do
     case "$(head -1 "${file}")" in
     "#!"*"/bin/jython" )
-      sed -i.bak "1 s:.*:#\!\/usr\/bin\/env ${PREFIX_PATH}\/bin\/jython:" "${file}"
+      sed -i.bak "1 s:.*:#\!${PREFIX_PATH}\/bin\/jython:" "${file}"
       ;;
     "#!"*"/bin/python2.7"* )
-      # Jython 2.7+ requires CPython 2.7 to run
-      sed -i.bak "1 s:.*:#\!\/usr\/bin\/env python2.7:" "${file}"
+      sed -i.bak "1 s:.*:#\!\/usr\/bin\/env python:" "${file}"
       ;;
     esac
     rm -f "${file}.bak"
@@ -918,6 +917,15 @@ build_package_jython_builder() {
   ( cd "dist" && build_package_jython )
 }
 
+build_package_pyston() {
+  mkdir -p "${PREFIX_PATH}/"
+  cp -fR . "${PREFIX_PATH}/"
+  chmod +x "${PREFIX_PATH}/"pyston
+  # FIXME ugly hack below adapted from
+  # https://github.com/dropbox/pyston/blob/master/docker/pyston/Dockerfile
+  ( cd "${PREFIX_PATH}/" && ./pyston virtualenv/virtualenv.py . )
+}
+
 build_package_ironpython() {
   mkdir -p "${PREFIX_PATH}/bin"
   cp -fR . "${PREFIX_PATH}/bin"
@@ -955,6 +963,10 @@ pypy_architecture() {
   esac
 }
 
+pyston_architecture() {
+  pypy_architecture
+}
+
 build_package_pypy() {
   build_package_copy
   mkdir -p "${PREFIX_PATH}/bin" "${PREFIX_PATH}/lib"
@@ -1263,6 +1275,17 @@ require_java() {
   export JAVA="$java"
 }
 
+# Let Jython installer to generate shell script instead of python script even if there's `python2.7` available in `$PATH` (#800)
+# FIXME: better function naming
+unrequire_python27() {
+  export PATH="${BUILD_PATH}/bin:${PATH}"
+  mkdir -p "${BUILD_PATH}/bin"
+  if command -v python2.7 1>/dev/null 2>&1; then
+    echo false > "${BUILD_PATH}/bin/python2.7"
+    chmod +x "${BUILD_PATH}/bin/python2.7"
+  fi
+}
+
 require_distro() {
   for arg; do
     if [[ "$(cat /etc/issue 2>/dev/null || true)" == "$arg"* ]]; then
@@ -1642,6 +1665,11 @@ build_package_verify_py36() {
   build_package_verify_py35 "$1" "${2:-3.6}"
 }
 
+# Post-install check for Python 3.7.x
+build_package_verify_py37() {
+  build_package_verify_py36 "$1" "${2:-3.7}"
+}
+
 build_package_ez_setup() {
   local ez_setup="ez_setup.py"
   rm -f "${ez_setup}"
@@ -1755,6 +1783,8 @@ for option in "${OPTIONS[@]}"; do
     ;;
   "g" | "debug" )
     DEBUG=true
+    # Disable optimization (#808)
+    PYTHON_CFLAGS="-O0 ${PYTHON_CFLAGS}"
     ;;
   "4" | "ipv4")
     IPV4=true
@@ -1921,7 +1951,9 @@ fi
 
 # Compile with `--enable-unicode=ucs4` by default (#257)
 if [[ "$PYTHON_CONFIGURE_OPTS" != *"--enable-unicode="* ]]; then
-  package_option python configure --enable-unicode=ucs4
+  if ! is_mac; then
+    package_option python configure --enable-unicode=ucs4
+  fi
 fi
 
 # SSL Certificate error with older wget that does not support Server Name Indication (#60)

plugins/python-build/share/python-build/2.7-dev

@@ -1,4 +1,4 @@
 #require_gcc
 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
-install_hg "Python-2.7-dev" "https://hg.python.org/cpython" "2.7" standard verify_py27 ensurepip
+install_git "Python-2.7-dev" "https://github.com/python/cpython" "2.7" standard verify_py27 ensurepip

plugins/python-build/share/python-build/2.7.13

@@ -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.0b1" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0b1.tar.xz#a83b094a8abf8a1fba7c548a5e8dd0aabe87a87a6ebd87c97f4a5a2527a74d42" ldflags_dirs standard verify_py36 ensurepip
+  install_package "Python-2.7.13" "https://www.python.org/ftp/python/2.7.13/Python-2.7.13.tar.xz#35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f731" ldflags_dirs standard verify_py27 ensurepip
 else
-  install_package "Python-3.6.0b1" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0b1.tgz#41e8e4e8f6d44992f9cb979da2a2927c60554045fe0a2ee556e0bf8fe5f7014f" ldflags_dirs standard verify_py36 ensurepip
+  install_package "Python-2.7.13" "https://www.python.org/ftp/python/2.7.13/Python-2.7.13.tgz#a4f05a0720ce0fd92626f0278b6b433eee9a6173ddf2bced7957dfb599a5ece1" ldflags_dirs standard verify_py27 ensurepip
 fi

plugins/python-build/share/python-build/3.2-dev

@@ -1,6 +1,6 @@
 #require_gcc
 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
-install_hg "Python-3.2-dev" "https://hg.python.org/cpython" "3.2" standard verify_py32
+install_git "Python-3.2-dev" "https://github.com/python/cpython" "3.2" standard verify_py32
 install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
 install_package "pip-7.1.2" "https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz#ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477" python

plugins/python-build/share/python-build/3.3-dev

@@ -1,4 +1,4 @@
 #require_gcc
 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
-install_hg "Python-3.3-dev" "https://hg.python.org/cpython" "3.3" standard verify_py33 ensurepip
+install_git "Python-3.3-dev" "https://github.com/python/cpython" "3.3" standard verify_py33 ensurepip

plugins/python-build/share/python-build/3.4-dev

@@ -1,4 +1,4 @@
 #require_gcc
 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
-install_hg "Python-3.4-dev" "https://hg.python.org/cpython" "3.4" standard verify_py34 ensurepip
+install_git "Python-3.4-dev" "https://github.com/python/cpython" "3.4" standard verify_py34 ensurepip

plugins/python-build/share/python-build/3.4.6

@@ -0,0 +1,8 @@
+#require_gcc
+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.4.6" "https://www.python.org/ftp/python/3.4.6/Python-3.4.6.tar.xz#f13428bbe6aa9e3b9b6499502dc488c26096349ed7a21f7a0c1db90911115f40" ldflags_dirs standard verify_py34 ensurepip
+else
+  install_package "Python-3.4.6" "https://www.python.org/ftp/python/3.4.6/Python-3.4.6.tgz#fe59daced99549d1d452727c050ae486169e9716a890cffb0d468b376d916b48" ldflags_dirs standard verify_py34 ensurepip
+fi

plugins/python-build/share/python-build/3.5-dev

@@ -1,4 +1,4 @@
 #require_gcc
 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
-install_hg "Python-3.5-dev" "https://hg.python.org/cpython" "3.5" standard verify_py35 ensurepip
+install_git "Python-3.5-dev" "https://github.com/python/cpython" "3.5" standard verify_py35 ensurepip

plugins/python-build/share/python-build/3.5.3

@@ -0,0 +1,8 @@
+#require_gcc
+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.5.3" "https://www.python.org/ftp/python/3.5.3/Python-3.5.3.tar.xz#eefe2ad6575855423ab630f5b51a8ef6e5556f774584c06beab4926f930ddbb0" ldflags_dirs standard verify_py35 ensurepip
+else
+  install_package "Python-3.5.3" "https://www.python.org/ftp/python/3.5.3/Python-3.5.3.tgz#d8890b84d773cd7059e597dbefa510340de8336ec9b9e9032bf030f19291565a" ldflags_dirs standard verify_py35 ensurepip
+fi

plugins/python-build/share/python-build/3.6-dev

@@ -1,4 +1,4 @@
 #require_gcc
 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
-install_hg "Python-3.6-dev" "https://hg.python.org/cpython" "default" standard verify_py36 ensurepip
+install_git "Python-3.6-dev" "https://github.com/python/cpython" "3.6" standard verify_py36 ensurepip

plugins/python-build/share/python-build/3.6.0

@@ -0,0 +1,8 @@
+#require_gcc
+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.0" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tar.xz#b0c5f904f685e32d9232f7bdcbece9819a892929063b6e385414ad2dd6a23622" ldflags_dirs standard verify_py36 ensurepip
+else
+  install_package "Python-3.6.0" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tgz#aa472515800d25a3739833f76ca3735d9f4b2fe77c3cb21f69275e0cce30cb2b" ldflags_dirs standard verify_py36 ensurepip
+fi

plugins/python-build/share/python-build/3.7-dev

@@ -0,0 +1,4 @@
+#require_gcc
+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
+install_git "Python-3.7-dev" "https://github.com/python/cpython" master standard verify_py37 ensurepip

plugins/python-build/share/python-build/anaconda2-4.2.0

@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Anaconda2-4.2.0-Linux-x86" "https://repo.continuum.io/archive/Anaconda2-4.2.0-Linux-x86.sh#618b720f309fe8da4f235415f11b6ce3db0a16d702ca67fdceeecf6bec78c32a" "anaconda" verify_py27
+  ;;
+"Linux-x86_64" )
+  install_script "Anaconda2-4.2.0-Linux-x86_64" "https://repo.continuum.io/archive/Anaconda2-4.2.0-Linux-x86_64.sh#beee286d24fb37dd6555281bba39b3deb5804baec509a9dc5c69185098cf661a" "anaconda" verify_py27
+  ;;
+"MacOSX-x86_64" )
+  install_script "Anaconda2-4.2.1-MacOSX-x86_64" "https://repo.continuum.io/archive/Anaconda2-4.2.0-MacOSX-x86_64.sh#a8b3ef86233635d9dcc3499dc384980762a0b42d354a318f8307029c399db452" "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

plugins/python-build/share/python-build/anaconda2-4.3.0

@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Anaconda2-4.3.0-Linux-x86" "https://repo.continuum.io/archive/Anaconda2-4.3.0-Linux-x86.sh#b80d471839e8cf7b100e59308720cc13c141deb1ba903a4776c9a05f613e5078" "anaconda" verify_py27
+  ;;
+"Linux-x86_64" )
+  install_script "Anaconda2-4.3.0-Linux-x86_64" "https://repo.continuum.io/archive/Anaconda2-4.3.0-Linux-x86_64.sh#7c52e6e99aabb24a49880130615a48e685da444c3c14eb48d6a65f3313bf745c" "anaconda" verify_py27
+  ;;
+"MacOSX-x86_64" )
+  install_script "Anaconda2-4.2.1-MacOSX-x86_64" "https://repo.continuum.io/archive/Anaconda2-4.3.0-MacOSX-x86_64.sh#834ac0287062929ab5930661735ee617fd379bdfe79f3e0a20aebd614835b6c5" "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

plugins/python-build/share/python-build/anaconda3-4.2.0

@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Anaconda3-4.2.0-Linux-x86" "https://repo.continuum.io/archive/Anaconda3-4.2.0-Linux-x86.sh#1a8320635f2f06ec9d8610e77d6d0f9cb2c5d11d20a4ff7fcda113e04b0a8a50" "anaconda" verify_py35
+  ;;
+"Linux-x86_64" )
+  install_script "Anaconda3-4.2.0-Linux-x86_64" "https://repo.continuum.io/archive/Anaconda3-4.2.0-Linux-x86_64.sh#73b51715a12b6382dd4df3dd1905b531bd6792d4aa7273b2377a0436d45f0e78" "anaconda" verify_py35
+  ;;
+"MacOSX-x86_64" )
+  install_script "Anaconda3-4.2.0-MacOSX-x86_64" "https://repo.continuum.io/archive/Anaconda3-4.2.0-MacOSX-x86_64.sh#95448921601e1952e01a17ba9767cd3621c154af7fc52dd6b7f57d462155a358" "anaconda" verify_py35
+  ;;
+* )
+  { 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

plugins/python-build/share/python-build/anaconda3-4.3.0

@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Anaconda3-4.3.0-Linux-x86" "https://repo.continuum.io/archive/Anaconda3-4.3.0-Linux-x86.sh#f7ce2eeec3e42c2ba1ee3b9fcd670478fd30f4be547c6e0a675d183c4ca9dd9b" "anaconda" verify_py36
+  ;;
+"Linux-x86_64" )
+  install_script "Anaconda3-4.3.0-Linux-x86_64" "https://repo.continuum.io/archive/Anaconda3-4.3.0-Linux-x86_64.sh#e9169c3a5029aa820393ac92704eb9ee0701778a085ca7bdc3c57b388ac1beb6" "anaconda" verify_py36
+  ;;
+"MacOSX-x86_64" )
+  install_script "Anaconda3-4.3.0-MacOSX-x86_64" "https://repo.continuum.io/archive/Anaconda3-4.3.0-MacOSX-x86_64.sh#c53059b810c5e7a9a5ef9c46a7ed76675dfc7183f4ea867b4d81449cbd5a093d" "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

plugins/python-build/share/python-build/ironpython-2.7.6.3

@@ -0,0 +1,2 @@
+install_zip "IronPython-2.7.6.3" "https://github.com/IronLanguages/main/releases/download/ipy-2.7.6.3/IronPython-2.7.6.3.zip#dfd00598f4752104f90c248c1662eafbebf7ead24e17531d852ffc32a5a8075b" ironpython
+# FIXME: have not confirmed to install setuptools into IronPython yet

plugins/python-build/share/python-build/ironpython-2.7.7

@@ -0,0 +1,2 @@
+install_zip "IronPython-2.7.7" "https://github.com/IronLanguages/main/releases/download/ipy-2.7.7/IronPython-2.7.7-win.zip#657c134ff6d6f0ed86557d9455dcdfeac11823944f7aa36d72a41cc5444c4a89" ironpython ensurepip
+

plugins/python-build/share/python-build/jython-2.7.0

@@ -1,4 +1,5 @@
 require_java
+unrequire_python27
 install_jar "jython-2.7.0" "https://repo1.maven.org/maven2/org/python/jython-installer/2.7.0/jython-installer-2.7.0.jar#b44352ece72382268a60e2848741c96609a91d796bb9a9c6ebeff62f0c12c9cf" jython
 
 case "$(pypy_architecture 2>/dev/null || true)" in

plugins/python-build/share/python-build/jython-2.7.1b1

@@ -1,4 +1,5 @@
 require_java
+unrequire_python27
 install_jar "jython-2.7.1b1" "https://repo1.maven.org/maven2/org/python/jython-installer/2.7.1b1/jython-installer-2.7.1b1.jar#c7a05911fed666c8f9df5bdce50bb5dc75482b7f6b1f1dbe433162d94c960ec3" jython
 
 case "$(pypy_architecture 2>/dev/null || true)" in

plugins/python-build/share/python-build/jython-2.7.1b2

@@ -1,4 +1,5 @@
 require_java
+unrequire_python27
 install_jar "jython-2.7.1b2" "https://repo1.maven.org/maven2/org/python/jython-installer/2.7.1b2/jython-installer-2.7.1b2.jar#d994500808c8d448baab1f98e043e6a11360cff302f401901e73f0e34c27251a" jython
 
 case "$(pypy_architecture 2>/dev/null || true)" in

plugins/python-build/share/python-build/jython-2.7.1b3

@@ -1,4 +1,5 @@
 require_java
+unrequire_python27
 install_jar "jython-2.7.1b3" "https://repo1.maven.org/maven2/org/python/jython-installer/2.7.1b3/jython-installer-2.7.1b3.jar#5c6c7dc372a131dbc2b29b95407c69a4ebab22c1823d9098b7f993444f3090c5" jython
 
 case "$(pypy_architecture 2>/dev/null || true)" in

plugins/python-build/share/python-build/jython-dev

@@ -1,4 +1,5 @@
 require_java
+unrequire_python27
 install_hg "jython-dev" "https://hg.python.org/jython" "default" jython_builder ez_setup
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15

plugins/python-build/share/python-build/patches/3.5.2/Python-3.5.2/venv.patch

@@ -0,0 +1,23 @@
+
+# HG changeset patch
+# User Brett Cannon <brett@python.org>
+# Date 1467312199 25200
+# Node ID 8d7bde14d7a48f747b1ea2f77385352c507da6b9
+# Parent  f2d1dba10a0e9db6c77889ff8ca18718ce1e76c6# Parent  4fc0154ec84a65feb580e62729ac1d26ddfcbfa1
+Merge from 3.5 for issue #26664
+
+diff --git a/Lib/venv/scripts/posix/activate.fish b/Lib/venv/scripts/posix/activate.fish
+--- a/Lib/venv/scripts/posix/activate.fish
++++ b/Lib/venv/scripts/posix/activate.fish
+@@ -55,8 +55,8 @@ if test -z "$VIRTUAL_ENV_DISABLE_PROMPT"
+     # with the original prompt function renamed, we can override with our own.
+     function fish_prompt
+         # Prompt override?
+-        if test -n "$__VENV_PROMPT__"
+-            printf "%s%s%s" "$__VENV_PROMPT__" (set_color normal) (_old_fish_prompt)
++        if test -n "__VENV_PROMPT__"
++            printf "%s%s%s" "__VENV_PROMPT__" (set_color normal) (_old_fish_prompt)
+             return
+         end
+         # ...Otherwise, prepend env
+

plugins/python-build/share/python-build/pypy-1.7

@@ -16,7 +16,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-1.7-dev' to build from soruce."
+    echo "try 'pypy-1.7-dev' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-1.8

@@ -16,7 +16,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-1.8-dev' to build from soruce."
+    echo "try 'pypy-1.8-dev' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-1.9

@@ -16,7 +16,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-1.9-dev' to build from soruce."
+    echo "try 'pypy-1.9-dev' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-2.0

@@ -26,7 +26,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-2.0-src' to build from soruce."
+    echo "try 'pypy-2.0-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-2.0.1

@@ -18,7 +18,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-2.0.1-src' to build from soruce."
+    echo "try 'pypy-2.0.1-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-2.0.2

@@ -18,7 +18,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-2.0.2-src' to build from soruce."
+    echo "try 'pypy-2.0.2-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-2.1

@@ -30,7 +30,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-2.1-src' to build from soruce."
+    echo "try 'pypy-2.1-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-2.2

@@ -30,7 +30,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-2.2-src' to build from soruce."
+    echo "try 'pypy-2.2-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-2.2.1

@@ -30,7 +30,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-2.2.1-src' to build from soruce."
+    echo "try 'pypy-2.2.1-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-2.3

@@ -30,7 +30,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-2.3-src' to build from soruce."
+    echo "try 'pypy-2.3-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-2.3.1

@@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-2.3.1-src' to build from soruce."
+    echo "try 'pypy-2.3.1-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-2.4-beta1

@@ -30,7 +30,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-2.4-beta1-src' to build from soruce."
+    echo "try 'pypy-2.4-beta1-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-2.4.0

@@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-2.4.0-src' to build from soruce."
+    echo "try 'pypy-2.4.0-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-2.5.0

@@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-2.5.0-src' to build from soruce."
+    echo "try 'pypy-2.5.0-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-2.5.1

@@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-2.5.1-src' to build from soruce."
+    echo "try 'pypy-2.5.1-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-2.6.0

@@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-2.6.0-src' to build from soruce."
+    echo "try 'pypy-2.6.0-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-2.6.1

@@ -39,7 +39,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-2.6.1-src' to build from soruce."
+    echo "try 'pypy-2.6.1-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-4.0.0

@@ -44,7 +44,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-4.0.0-src' to build from soruce."
+    echo "try 'pypy-4.0.0-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-4.0.1

@@ -44,7 +44,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-4.0.1-src' to build from soruce."
+    echo "try 'pypy-4.0.1-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-5.0.0

@@ -44,7 +44,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-5.0.0-src' to build from soruce."
+    echo "try 'pypy-5.0.0-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-5.0.1

@@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-5.0.1-src' to build from soruce."
+    echo "try 'pypy-5.0.1-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-5.1

@@ -44,7 +44,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-5.1.0-src' to build from soruce."
+    echo "try 'pypy-5.1.0-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy-5.1.1

@@ -44,7 +44,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-5.1.1-src' to build from soruce."
+    echo "try 'pypy-5.1.1-src' to build from source."
     echo
   } >&2
   exit 1

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.3

@@ -6,7 +6,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
     { echo
       colorize 1 "ERROR"
       echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-      echo "try 'pypy2-5.3-src' to build from soruce."
+      echo "try 'pypy2-5.3-src' to build from source."
       echo
     } >&2
     exit 1
@@ -31,7 +31,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
     { echo
       colorize 1 "ERROR"
       echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-      echo "try 'pypy2-5.3-src' to build from soruce."
+      echo "try 'pypy2-5.3-src' to build from source."
       echo
     } >&2
     exit 1
@@ -48,7 +48,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy-5.3-src' to build from soruce."
+    echo "try 'pypy-5.3-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy2-5.3.1

@@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy2-5.3.1-src' to build from soruce."
+    echo "try 'pypy2-5.3.1-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy2-5.4

@@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy2-5.4-src' to build from soruce."
+    echo "try 'pypy2-5.4-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy2-5.4.1

@@ -1,7 +1,7 @@
 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.4.1-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.4.1-linux32.tar.bz2#6d1e2386ec1e05dffed493aa2d5e6db5cf5de18d7350d44b85f2e45aa5c9a774" "pypy" verify_py27 ensurepip
+    install_package "pypy2-v5.4.1-linux32" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.4.1-linux32.tar.bz2#6d1e2386ec1e05dffed493aa2d5e6db5cf5de18d7350d44b85f2e45aa5c9a774" "pypy" verify_py27 ensurepip
   else
     install_package "pypy-5.4.1-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.4.1-linux_i686-portable.tar.bz2#190e1df78886f0b2bd700f110b7d312d91cafc84886c5de3c5d55c10fe1a5e75" "pypy" verify_py27 ensurepip
   fi

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

plugins/python-build/share/python-build/pypy3-2.3.1

@@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy3-2.3.1-src' to build from soruce."
+    echo "try 'pypy3-2.3.1-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy3-2.4.0

@@ -36,7 +36,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy3-2.4.0-src' to build from soruce."
+    echo "try 'pypy3-2.4.0-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy3.3-5.2-alpha1

@@ -32,7 +32,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   { echo
     colorize 1 "ERROR"
     echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-    echo "try 'pypy3.3-5.2-alpha1-src' to build from soruce."
+    echo "try 'pypy3.3-5.2-alpha1-src' to build from source."
     echo
   } >&2
   exit 1

plugins/python-build/share/python-build/pypy3.3-5.5-alpha

@@ -0,0 +1,45 @@
+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 "pypy3.3-v5.5.0-linux32" "https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v5.5.0-alpha-linux32.tar.bz2#966ee7951ad497ac907e01554fe48da77cc64a5e35a1307477c2f78652eba622" "pypy" verify_py33 ensurepip
+  else
+    install_package "pypy3.3-5.5-alpha-20161014-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3.3-5.5-alpha-20161014-linux_i686-portable.tar.bz2#af32420f368bc3276d15a5cf4e2e8cb0bef16f711ee830a636ad117e55c3268f" "pypy" verify_py33 ensurepip
+  fi
+  ;;
+"linux-armel" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy3-v5.5.0-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v5.5.0-alpha-linux-armel.tar.bz2#9f081041867f434f18456f936befbacd9f40c0ede24137cbf80f9f45ff37b69f" "pypy" verify_py33 ensurepip
+  ;;
+"linux-armhf" )
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
+    install_package "pypy3-v5.5.0-linux-armhf-raspbian" "https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v5.5.0-alpha-linux-armhf-raspbian.tar.bz2#d8e94c834307081d5c4be863fab935e34df360a77b06e8bc833624c4b712b2aa" "pypy" verify_py33 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.3-5.5-alpha-src' to build from source."
+      echo
+    } >&2
+    exit 1
+  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 "pypy3-v5.5.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v5.5.0-alpha-linux64.tar.bz2#41ef7c25fd04eeb20deaa83c5d88c10aef2bbc8bcfd9e53e7cc61136220861cc" "pypy" verify_py33 ensurepip
+  else
+    install_package "pypy3.3-5.5-alpha-20161013-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3.3-5.5-alpha-20161013-linux_x86_64-portable.tar.bz2#1cd7a00da376b2db29b3e1f3e9bb7a77afc8ad988b3f13fd0805f37b23960a34" "pypy" verify_py33 ensurepip
+  fi
+  ;;
+"osx64" )
+  install_package "pypy3-v5.5.0-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v5.5.0-alpha-osx64.tar.bz2#fa45f861a6c40ae44f99ec94c521adfb6b64b0c9c0b6fc6e9df018241a648986" "pypy" verify_py33 ensurepip
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo "try 'pypy3.3-5.5-alpha-src' to build from source."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src

@@ -0,0 +1,2 @@
+require_gcc
+install_package "pypy3-v5.5.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v5.5.0-alpha-src.tar.bz2#d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f" "pypy_builder" verify_py33 ensurepip

plugins/python-build/share/python-build/pypy3.5-c-jit-latest

@@ -0,0 +1,49 @@
+echo
+colorize 1 "WARNING"
+echo ": This may eat your kittens/ affect timespace in alternate dimensions/"
+echo "cause you to complain more. Nightly builds are meant for testing only."
+echo "The PyPy team is interested in reports of what's already implemented, see:"
+echo
+echo "https://bitbucket.org/pypy/extradoc/src/c70f20cfb870/planning/py3.5/?at=extradoc"
+echo
+echo "for the latest status updates. To report bugs/regressions, please see:"
+echo
+echo "http://doc.pypy.org/en/latest/faq.html#how-should-i-report-a-bug"
+echo
+
+case "$(pypy_architecture 2>/dev/null || true)" in
+#"linux" )
+#  install_nightly_package "pypy-c-jit-latest-linux" "http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-linux.tar.bz2" "pypy-c-jit-*-linux" "pypy" verify_py27 ensurepip
+#  ;;
+#"linux-armel" )
+#  install_nightly_package "pypy-c-jit-latest-linux-armel" "http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-linux-armel.tar.bz2" "pypy-c-jit-*-linux-armel" "pypy" verify_py27 ensurepip
+#  ;;
+#"linux-armhf" )
+#  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
+#    install_nightly_package "pypy-c-jit-latest-linux-armhf-raspbian" "http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-linux-armhf-raspbian.tar.bz2" "pypy-c-jit-*-linux-armhf-raspbian" "pypy" verify_py27 ensurepip
+#  else
+#    install_nightly_package "pypy-c-jit-latest-linux-armhf-raring" "http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-linux-armhf-raring.tar.bz2" "pypy-c-jit-*-linux-armhf-raring" "pypy" verify_py27 ensurepip
+#  fi
+#  ;;
+"linux64" )
+  install_nightly_package "pypy3.5-c-jit-latest-linux64" "http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-linux64.tar.bz2" "pypy-c-jit-*-linux64" "pypy" verify_py35 ensurepip
+  ;;
+#"osx64" )
+#  install_nightly_package "pypy-c-jit-latest-osx64" "http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-osx64.tar.bz2" "pypy-c-jit-*-osx64" "pypy" verify_py27 ensurepip
+#  ;;
+#"freebsd64" )
+#  install_nightly_package "pypy-c-jit-latest-freebsd64" "http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-freebsd64.tar.bz2" "pypy-c-jit-*-freebsd64" "pypy" verify_py27 ensurepip
+#  ;;
+#"win32" )
+#  install_zip "pypy-c-jit-latest-win32" "http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-win32.zip" "pypy" verify_py27 ensurepip
+#  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The latest nightly build of PyPy 3.5 is not available for $(pypy_architecture 2>/dev/null || true),"
+    echo "Please check http://buildbot.pypy.org/nightly/py3.5/ for previous builds."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

plugins/python-build/share/python-build/pyston-0.5.1

@@ -0,0 +1,23 @@
+case "$(pyston_architecture 2>/dev/null || true)" in
+"linux64" )
+  install_package "pyston-0.5.1-linux64" "https://github.com/dropbox/pyston/releases/download/v0.5.1/pyston-0.5.1-linux64.tar.gz#4b0d2ad2c19f6393b79adbb9312649d38cb8cb3daf0c8fdf8631465c7761bb79" "pyston" verify_py27
+  # disabling ensurepip avoids having installation aborted because of a coredump
+  # pyston targets python 2.7.7 and does not have ensurepip, when attempting to
+  # run https://bootstrap.pypa.io/get-pip.py it dumps core, see
+  # https://github.com/dropbox/pyston/issues/1373
+  # activate the virtualenv so that we're using the correct pip and site-packages location
+  # ( source "${PREFIX_PATH}/bin/activate" )
+  # FIXME: if this fails it should not break the installation
+  # ( cd "${PREFIX_PATH}/bin" && ./pip install https://github.com/dropbox/pyston/releases/download/v0.5.1/Cython-0.24-pyston.tar.gz && ./pip install git+git://github.com/numpy/numpy@v1.11.0 )
+  # deactivate the virtualenv
+  # ( deactivate )
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": A Pyston 0.5.1 binary is not available for $(pyston_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

plugins/python-build/share/python-build/pyston-0.6.0

@@ -0,0 +1,23 @@
+case "$(pyston_architecture 2>/dev/null || true)" in
+"linux64" )
+  install_package "pyston-0.6.0-linux64" "https://github.com/dropbox/pyston/releases/download/v0.6/pyston-0.6.0-linux64.tar.gz#c31240a66cd3ed566ef88a8818a960d925fbf60ab17db722224794346b827f9f" "pyston" verify_py27
+  # disabling ensurepip avoids having installation aborted because of a coredump
+  # pyston targets python 2.7.7 and does not have ensurepip, when attempting to
+  # run https://bootstrap.pypa.io/get-pip.py it dumps core, see
+  # https://github.com/dropbox/pyston/issues/1373
+  # activate the virtualenv so that we're using the correct pip and site-packages location
+  # ( source "${PREFIX_PATH}/bin/activate" )
+  # FIXME: if this fails it should not break the installation
+  # ( cd "${PREFIX_PATH}/bin" && ./pip install https://github.com/dropbox/pyston/releases/download/v0.6/Cython-0.24-pyston.tar.gz && ./pip install git+git://github.com/numpy/numpy@v1.11.0 )
+  # deactivate the virtualenv
+  # ( deactivate )
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": A Pyston 0.6.0 binary is not available for $(pyston_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

plugins/python-build/share/python-build/stackless-2.7.10

@@ -0,0 +1,4 @@
+#require_gcc
+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
+install_package "stackless-dev-stackless-b6b4c928e880" "https://bitbucket.org/stackless-dev/stackless/get/v2.7.10-slp.tar.bz2#70ac8fd4f9c6a735757520fd3faa35180324d72108752d956c40f0571c732f22" ldflags_dirs standard verify_py27 ensurepip

plugins/python-build/share/python-build/stackless-2.7.11

@@ -0,0 +1,4 @@
+#require_gcc
+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
+install_package "stackless-dev-stackless-456e93659e69" "https://bitbucket.org/stackless-dev/stackless/get/v2.7.11-slp.tar.bz2#74093ac2824b167ecf8592164291c610dd9b31c8dce8b40b485ba9f39721e5b8" ldflags_dirs standard verify_py27 ensurepip

plugins/python-build/share/python-build/stackless-2.7.12

@@ -0,0 +1,4 @@
+#require_gcc
+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
+install_package "stackless-dev-stackless-82aaa252fbdc" "https://bitbucket.org/stackless-dev/stackless/get/v2.7.12-slp.tar.bz2#af57d08477e8b9545d30b36df0ea903bdc96073898af6b4730f713bb74fd277d" ldflags_dirs standard verify_py27 ensurepip

plugins/python-build/share/python-build/stackless-2.7.9

@@ -0,0 +1,4 @@
+#require_gcc
+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
+install_package "stackless-dev-stackless-43302de87df4" "https://bitbucket.org/stackless-dev/stackless/get/v2.7.9-slp.tar.bz2#83857fb269a59cca51c68aef84295892f86ce775700dbe9a3f7fe8322f7dd6ff" ldflags_dirs standard verify_py27 ensurepip

plugins/python-build/share/python-build/stackless-3.4.2

@@ -0,0 +1,4 @@
+#require_gcc
+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
+install_package "stackless-dev-stackless-587417070fe4" "https://bitbucket.org/stackless-dev/stackless/get/v3.4.2-slp.tar.bz2#c3dbdde536fa6bf366fdbc3e957596487608ba11009758ce599357512eb74103" ldflags_dirs standard verify_py34 ensurepip

plugins/python-build/test/build.bats

@@ -67,6 +67,10 @@ assert_build_log() {
   stub_make_install
   stub_make_install
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   install_fixture definitions/needs-yaml
   assert_success
 
@@ -93,6 +97,10 @@ OUT
   stub_make_install
   stub patch ' : echo patch "$@" | sed -E "s/\.[[:alnum:]]+$/.XXX/" >> build.log'
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   TMPDIR="$TMP" install_fixture --patch definitions/needs-yaml <<<""
   assert_success
 
@@ -121,6 +129,10 @@ OUT
   stub_make_install
   stub patch ' : echo patch "$@" | sed -E "s/\.[[:alnum:]]+$/.XXX/" >> build.log'
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   TMPDIR="$TMP" install_fixture --patch definitions/needs-yaml <<<"diff --git a/script.py"
   assert_success
 
@@ -149,6 +161,10 @@ OUT
   stub brew "--prefix libyaml : echo '$brew_libdir'" false
   stub_make_install
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   install_fixture definitions/needs-yaml
   assert_success
 
@@ -172,6 +188,10 @@ OUT
   stub brew "--prefix readline : echo '$readline_libdir'"
   stub_make_install
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   run_inline_definition <<DEF
 install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
 DEF
@@ -199,6 +219,10 @@ OUT
   stub brew
   stub_make_install
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   export PYTHON_CONFIGURE_OPTS="CPPFLAGS=-I$readline_libdir/include LDFLAGS=-L$readline_libdir/lib"
   run_inline_definition <<DEF
 install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
@@ -223,7 +247,11 @@ OUT
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.10'
 
+  # yyuu/pyenv#257
   stub uname '-s : echo Darwin'
+
+  stub uname '-s : echo Darwin'
+
   stub sysctl false
   stub_make_install
 
@@ -238,7 +266,7 @@ DEF
 
   assert_build_log <<OUT
 Python-3.2.1: CPPFLAGS="-I${TMP}/install/include " LDFLAGS="-L${TMP}/install/lib "
-Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib --enable-unicode=ucs4
+Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
 make -j 2
 make install
 OUT
@@ -251,7 +279,11 @@ OUT
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.10'
 
+  # yyuu/pyenv#257
   stub uname '-s : echo Darwin'
+
+  stub uname '-s : echo Darwin'
+
   stub sysctl '-n hw.ncpu : echo 4'
   stub_make_install
 
@@ -267,7 +299,7 @@ DEF
 
   assert_build_log <<OUT
 Python-3.2.1: CPPFLAGS="-I${TMP}/install/include " LDFLAGS="-L${TMP}/install/lib "
-Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib --enable-unicode=ucs4
+Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
 make -j 4
 make install
 OUT
@@ -283,6 +315,9 @@ OUT
   # yyuu/pyenv#222
   stub uname '-s : echo FreeBSD'
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo FreeBSD'
+
   export -n MAKE_OPTS
   run_inline_definition <<DEF
 install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
@@ -306,6 +341,10 @@ OUT
 
   stub_make_install
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   export PYTHON_MAKE_INSTALL_OPTS="DOGE=\"such wow\""
   run_inline_definition <<DEF
 install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
@@ -327,6 +366,10 @@ OUT
 
   stub_make_install
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   export MAKE_INSTALL_OPTS="DOGE=\"such wow\""
   run_inline_definition <<DEF
 install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
@@ -361,6 +404,9 @@ OUT
   # yyuu/pyenv#222
   stub uname '-s : echo FreeBSD'
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo FreeBSD'
+
   MAKE= install_fixture definitions/vanilla-python
   assert_success
 
@@ -377,6 +423,9 @@ OUT
   # yyuu/pyenv#222
   stub uname '-s : echo FreeBSD'
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo FreeBSD'
+
   MAKE= install_fixture definitions/vanilla-python
   assert_success
 
@@ -395,6 +444,10 @@ CONF
   stub apply 'echo apply "$@" >> build.log'
   stub_make_install
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   export PYTHON_CONFIGURE="${TMP}/custom-configure"
   run_inline_definition <<DEF
 install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"

plugins/python-build/test/compiler.bats

@@ -12,6 +12,9 @@ export -n PYTHON_CONFIGURE_OPTS
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.9.5'
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Darwin'
+
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.9.5'
   stub gcc '--version : echo 4.2.1'
@@ -33,6 +36,9 @@ OUT
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.10'
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Darwin'
+
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.10'
   stub gcc '--version : echo 4.2.1'
@@ -67,6 +73,9 @@ DEF
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.10'
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Darwin'
+
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.10'
   stub cc 'false'
@@ -89,7 +98,7 @@ build_package_standard python
 DEF
   assert_success
   assert_output <<OUT
-./configure --prefix=$INSTALL_ROOT --libdir=${TMP}/install/lib --enable-unicode=ucs4
+./configure --prefix=$INSTALL_ROOT --libdir=${TMP}/install/lib
 CC=clang
 CFLAGS=no
 make -j 2

plugins/python-build/test/pyenv_ext.bats

@@ -101,6 +101,10 @@ resolve_link() {
 
   echo | install_patch definitions/vanilla-python "Python-3.2.1/empty.patch"
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   TMPDIR="$TMP" install_tmp_fixture definitions/vanilla-python < /dev/null
   assert_success
 
@@ -127,6 +131,10 @@ OUT
   echo "bar" | install_patch definitions/vanilla-python "Python-3.2.1/bar.patch"
   echo "baz" | install_patch definitions/vanilla-python "Python-3.2.1/baz.patch"
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   TMPDIR="$TMP" install_tmp_fixture definitions/vanilla-python < /dev/null
   assert_success
 
@@ -152,6 +160,10 @@ OUT
     " : echo \"$MAKE \$@\" >> build.log" \
     " : echo \"$MAKE \$@\" >> build.log && cat build.log >> '$INSTALL_ROOT/build.log'"
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   PYTHON_MAKE_INSTALL_TARGET="altinstall" TMPDIR="$TMP" install_tmp_fixture definitions/vanilla-python < /dev/null
   assert_success
 
@@ -234,6 +246,9 @@ OUT
   touch "${INSTALL_ROOT}/Python.framework/Versions/Current/bin/python3.4-config"
   chmod +x "${INSTALL_ROOT}/Python.framework/Versions/Current/bin/python3.4-config"
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Darwin'
+
   stub uname '-s : echo Darwin'
 
   PYTHON_CONFIGURE_OPTS="--enable-framework" TMPDIR="$TMP" run_inline_definition <<OUT
@@ -242,7 +257,7 @@ verify_python python3.4
 OUT
   assert_success
   assert_output <<EOS
-PYTHON_CONFIGURE_OPTS_ARRAY=(--libdir=${TMP}/install/lib --enable-framework=${TMP}/install --enable-unicode=ucs4)
+PYTHON_CONFIGURE_OPTS_ARRAY=(--libdir=${TMP}/install/lib --enable-framework=${TMP}/install)
 EOS
 
   [ -L "${INSTALL_ROOT}/Python.framework/Versions/Current/bin/python" ]
@@ -250,6 +265,9 @@ EOS
 }
 
 @test "enable universalsdk" {
+  # yyuu/pyenv#257
+  stub uname '-s : echo Darwin'
+
   stub uname '-s : echo Darwin'
 
   PYTHON_CONFIGURE_OPTS="--enable-universalsdk" TMPDIR="$TMP" run_inline_definition <<OUT
@@ -257,7 +275,7 @@ echo "PYTHON_CONFIGURE_OPTS_ARRAY=(\${PYTHON_CONFIGURE_OPTS_ARRAY[@]})"
 OUT
   assert_success
   assert_output <<EOS
-PYTHON_CONFIGURE_OPTS_ARRAY=(--libdir=${TMP}/install/lib --enable-universalsdk=/ --with-universal-archs=intel --enable-unicode=ucs4)
+PYTHON_CONFIGURE_OPTS_ARRAY=(--libdir=${TMP}/install/lib --enable-universalsdk=/ --with-universal-archs=intel)
 EOS
 }
 
@@ -283,6 +301,9 @@ OUT
 }
 
 @test "default MACOSX_DEPLOYMENT_TARGET" {
+  # yyuu/pyenv#257
+  stub uname '-s : echo Darwin'
+
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.10'
 
@@ -294,6 +315,9 @@ OUT
 }
 
 @test "use custom MACOSX_DEPLOYMENT_TARGET if defined" {
+  # yyuu/pyenv#257
+  stub uname '-s : echo Darwin'
+
   stub uname '-s : echo Darwin'
 
   MACOSX_DEPLOYMENT_TARGET="10.4" TMPDIR="$TMP" run_inline_definition <<OUT

test/version-name.bats

@@ -17,7 +17,7 @@ setup() {
   assert_success "system"
 }
 
-@test "system version is not checked for existance" {
+@test "system version is not checked for existence" {
   PYENV_VERSION=system run pyenv-version-name
   assert_success "system"
 }