From 5462e8df8c0db1e85754f8d98a251da542089669 Mon Sep 17 00:00:00 2001
From: Zhiming Wang <zmwangx@gmail.com>
Date: Tue, 13 Sep 2016 00:28:41 -0400
Subject: [PATCH 01/41] Add CPython 3.6.0b1

https://www.python.org/downloads/release/python-360b1/
---
 plugins/python-build/share/python-build/3.6.0b1 | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 plugins/python-build/share/python-build/3.6.0b1

diff --git a/plugins/python-build/share/python-build/3.6.0b1 b/plugins/python-build/share/python-build/3.6.0b1
new file mode 100644
index 00000000..caf95252
--- /dev/null
+++ b/plugins/python-build/share/python-build/3.6.0b1
@@ -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.0b1" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0b1.tar.xz#a83b094a8abf8a1fba7c548a5e8dd0aabe87a87a6ebd87c97f4a5a2527a74d42" ldflags_dirs standard verify_py36 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
+fi

From 9dcc477c3f2a3836794d146cadbb042b2f27d241 Mon Sep 17 00:00:00 2001
From: Zhiming Wang <zmwangx@gmail.com>
Date: Tue, 13 Sep 2016 00:29:00 -0400
Subject: [PATCH 02/41] Remove CPython 3.6.0a4 in favor of 3.6.0b1

---
 plugins/python-build/share/python-build/3.6.0a4 | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 plugins/python-build/share/python-build/3.6.0a4

diff --git a/plugins/python-build/share/python-build/3.6.0a4 b/plugins/python-build/share/python-build/3.6.0a4
deleted file mode 100644
index ed1b4c1a..00000000
--- a/plugins/python-build/share/python-build/3.6.0a4
+++ /dev/null
@@ -1,8 +0,0 @@
-#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.0a4" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0a4.tar.xz#63acec349d20de412682f64c013f7c3374c695430b44e1c0ef12076da1d7fd2c" ldflags_dirs standard verify_py36 ensurepip
-else
-  install_package "Python-3.6.0a4" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0a4.tgz#3cedd7c1462b41648c779b0c88d0acf4fa298179014ffe75791af9da166fed62" ldflags_dirs standard verify_py36 ensurepip
-fi

From 36647a66deacba22a0ce6b8b0d1c5b1a454884ba Mon Sep 17 00:00:00 2001
From: s1341 <github@shmarya.net>
Date: Mon, 5 Sep 2016 12:03:10 +0300
Subject: [PATCH 03/41] Only mv bin to bin.orig the first time, otherwise the
 mv will fail

---
 plugins/python-build/bin/python-build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 059bcdf5..a4c6e511 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -1470,7 +1470,9 @@ build_package_symlink_version_suffix() {
   if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-framework"* ]]; then
     if [ -e "${PREFIX_PATH}/bin" ]; then
       # Always create `bin` as symlink to framework path if the version was built with `--enable-frameowrk` (#590)
-      mv -f "${PREFIX_PATH}/bin" "${PREFIX_PATH}/bin.orig"
+      if [ ! -e "${PREFIX_PATH}/bin.orig" ]; then
+        mv -f "${PREFIX_PATH}/bin" "${PREFIX_PATH}/bin.orig"
+      fi
     fi
     # Only symlinks are installed in ${PREFIX_PATH}/bin
     ln -fs "${PREFIX_PATH}/Python.framework/Versions/Current/bin" "${PREFIX_PATH}/bin"

From bc4abf06bdd417eb15b4f52e3000561aa3d3f55f Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Wed, 14 Sep 2016 09:49:43 +0900
Subject: [PATCH 04/41] Remove `bin.orig` if it already exists (fixes #687)

The directory may exist if the `build_package_symlink_version_suffix`
ran multiple times.
---
 plugins/python-build/bin/python-build | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index a4c6e511..43fd0be7 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -1470,9 +1470,8 @@ build_package_symlink_version_suffix() {
   if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-framework"* ]]; then
     if [ -e "${PREFIX_PATH}/bin" ]; then
       # Always create `bin` as symlink to framework path if the version was built with `--enable-frameowrk` (#590)
-      if [ ! -e "${PREFIX_PATH}/bin.orig" ]; then
-        mv -f "${PREFIX_PATH}/bin" "${PREFIX_PATH}/bin.orig"
-      fi
+      rm -rf "${PREFIX_PATH}/bin.orig"
+      mv -f "${PREFIX_PATH}/bin" "${PREFIX_PATH}/bin.orig"
     fi
     # Only symlinks are installed in ${PREFIX_PATH}/bin
     ln -fs "${PREFIX_PATH}/Python.framework/Versions/Current/bin" "${PREFIX_PATH}/bin"

From 9c78edcdafbc3ad61a697bf5c0588d9abdbb9133 Mon Sep 17 00:00:00 2001
From: "Francis T. O'Donovan" <francis.odonovan@gmail.com>
Date: Wed, 14 Sep 2016 17:34:37 -0400
Subject: [PATCH 05/41] Add anaconda3 4.1.1

---
 .../share/python-build/anaconda3-4.1.1        | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 plugins/python-build/share/python-build/anaconda3-4.1.1

diff --git a/plugins/python-build/share/python-build/anaconda3-4.1.1 b/plugins/python-build/share/python-build/anaconda3-4.1.1
new file mode 100644
index 00000000..0a99791f
--- /dev/null
+++ b/plugins/python-build/share/python-build/anaconda3-4.1.1
@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Anaconda3-4.1.1-Linux-x86" "https://repo.continuum.io/archive/Anaconda3-4.1.1-Linux-x86.sh#931626363f4030c7a1e8897549b1d3589dc3f429874dc3dd8a79869ecf5c895c" "anaconda" verify_py35
+  ;;
+"Linux-x86_64" )
+  install_script "Anaconda3-4.1.1-Linux-x86_64" "https://repo.continuum.io/archive/Anaconda3-4.1.1-Linux-x86_64.sh#4f5c95feb0e7efeadd3d348dcef117d7787c799f24b0429e45017008f3534e55" "anaconda" verify_py35
+  ;;
+"MacOSX-x86_64" )
+  install_script "Anaconda3-4.1.1-MacOSX-x86_64" "https://repo.continuum.io/archive/Anaconda3-4.1.1-MacOSX-x86_64.sh#7c3c06e9281c41f1213d357cb5f233fd99d6d0db6bdba8d9fd7cfad1f1a85df9" "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

From fd19e45fa91b0339a621ba2f0438cf3f5fd6dec1 Mon Sep 17 00:00:00 2001
From: "Francis T. O'Donovan" <francis.odonovan@gmail.com>
Date: Wed, 14 Sep 2016 21:54:31 -0400
Subject: [PATCH 06/41] Add anaconda2 4.1.1

---
 .../share/python-build/anaconda2-4.1.1        | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 plugins/python-build/share/python-build/anaconda2-4.1.1

diff --git a/plugins/python-build/share/python-build/anaconda2-4.1.1 b/plugins/python-build/share/python-build/anaconda2-4.1.1
new file mode 100644
index 00000000..b1353832
--- /dev/null
+++ b/plugins/python-build/share/python-build/anaconda2-4.1.1
@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Anaconda2-4.1.1-Linux-x86" "https://repo.continuum.io/archive/Anaconda2-4.1.1-Linux-x86.sh#1ab001c7a469345a90d549ebf4afa3376f0f3a57a0df5f042cac7d773b0e0b0d" "anaconda" verify_py27
+  ;;
+"Linux-x86_64" )
+  install_script "Anaconda2-4.1.1-Linux-x86_64" "https://repo.continuum.io/archive/Anaconda2-4.1.1-Linux-x86_64.sh#9413b1d3ca9498ba6f53913df9c43d685dd973440ff10b7fe0c45b1cbdcb582e" "anaconda" verify_py27
+  ;;
+"MacOSX-x86_64" )
+  install_script "Anaconda2-4.1.1-MacOSX-x86_64" "https://repo.continuum.io/archive/Anaconda2-4.1.1-MacOSX-x86_64.sh#3b2fb323eb26c1c58788f63c41e164c20c417f7f24e30b8057e92ab4d6102b70" "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

From a2298f7660ea79f41870d2bbe4e9e5d4a322a340 Mon Sep 17 00:00:00 2001
From: "Francis T. O'Donovan" <francis.odonovan@gmail.com>
Date: Wed, 14 Sep 2016 21:57:09 -0400
Subject: [PATCH 07/41] Add miniconda2 4.1.1

---
 .../share/python-build/miniconda2-4.1.1       | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 plugins/python-build/share/python-build/miniconda2-4.1.1

diff --git a/plugins/python-build/share/python-build/miniconda2-4.1.1 b/plugins/python-build/share/python-build/miniconda2-4.1.1
new file mode 100644
index 00000000..56741622
--- /dev/null
+++ b/plugins/python-build/share/python-build/miniconda2-4.1.1
@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Miniconda2-4.1.1-Linux-x86" "https://repo.continuum.io/miniconda/Miniconda2-4.1.1-Linux-x86.sh#5c4f6e121ddcbd24c7f7d3e7a6ce06c60cf2c98b14895620f1d7805d75bc5a9f" "miniconda" verify_py27
+  ;;
+"Linux-x86_64" )
+  install_script "Miniconda2-4.1.1-Linux-x86_64" "https://repo.continuum.io/miniconda/Miniconda2-4.1.1-Linux-x86_64.sh#4cdd4707c8bd2959551e40c6d4561ebec2711e034a04305e2dd1f88f038edb04" "miniconda" verify_py27
+  ;;
+"MacOSX-x86_64" )
+  install_script "Miniconda2-4.1.1-MacOSX-x86_64" "https://repo.continuum.io/miniconda/Miniconda2-4.1.1-MacOSX-x86_64.sh#a974389c7aab8058f14fa7d4bc00e5bb5316a3da4b0ca1463b854701532297d7" "miniconda" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of Miniconda2 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

From fe25b8598295d41b4a9500e72ac88965e67d85fb Mon Sep 17 00:00:00 2001
From: "Francis T. O'Donovan" <francis.odonovan@gmail.com>
Date: Wed, 14 Sep 2016 21:58:22 -0400
Subject: [PATCH 08/41] Add miniconda3 4.1.1

---
 .../share/python-build/miniconda3-4.1.1       | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 plugins/python-build/share/python-build/miniconda3-4.1.1

diff --git a/plugins/python-build/share/python-build/miniconda3-4.1.1 b/plugins/python-build/share/python-build/miniconda3-4.1.1
new file mode 100644
index 00000000..97c239b8
--- /dev/null
+++ b/plugins/python-build/share/python-build/miniconda3-4.1.1
@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Miniconda3-4.1.1-Linux-x86" "https://repo.continuum.io/miniconda/Miniconda3-4.1.1-Linux-x86.sh#4e89584027016060ce4e1dc40b8cb9e1c2dfd0d9f99335fca48d419ec90753c5" "miniconda" verify_py35
+  ;;
+"Linux-x86_64" )
+  install_script "Miniconda3-4.1.1-Linux-x86_64" "https://repo.continuum.io/miniconda/Miniconda3-4.1.1-Linux-x86_64.sh#efd6a9362fc6b4085f599a881d20e57de628da8c1a898c08ec82874f3bad41bf" "miniconda" verify_py35
+  ;;
+"MacOSX-x86_64" )
+  install_script "Miniconda3-4.1.1-MacOSX-x86_64" "https://repo.continuum.io/miniconda/Miniconda3-4.1.1-MacOSX-x86_64.sh#c4e3ba528721278f74e68ef070493a27d920ba10432dd2c2d563774799eda79c" "miniconda" verify_py35
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

From 1fc3b4890706b3c9820144ea495fdf443a08c6d3 Mon Sep 17 00:00:00 2001
From: "Francis T. O'Donovan" <francis.odonovan@gmail.com>
Date: Thu, 15 Sep 2016 09:28:54 -0400
Subject: [PATCH 09/41] Rearrange 'pyenv install' sections in COMMANDS.md

I noticed that there were 3 sections for `pyenv install`, so I've rearranged these to make 1 section.
---
 COMMANDS.md | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/COMMANDS.md b/COMMANDS.md
index a4520da8..fb396d7f 100644
--- a/COMMANDS.md
+++ b/COMMANDS.md
@@ -185,7 +185,7 @@ or, if you prefer 3.3.3 over 2.7.6,
 
 ## `pyenv install`
 
-Install a Python version (using `python-build`).
+Install a Python version (using [`python-build`](https://github.com/yyuu/pyenv/tree/master/plugins/python-build)).
 
     Usage: pyenv install [-f] [-kvp] <version>
            pyenv install [-f] [-kvp] <definition-file>
@@ -203,6 +203,18 @@ Install a Python version (using `python-build`).
       -p/--patch       Apply a patch from stdin before building
       -g/--debug       Build a debug version
 
+To list the all available versions of Python, including Anaconda, Jython, pypy, and stackless, use:
+
+    $ pyenv install --list
+
+Then install the desired versions:
+
+    $ pyenv install 2.7.6
+    $ pyenv install 2.6.8
+    $ pyenv versions
+      system
+      2.6.8
+    * 2.7.6 (set by /home/yyuu/.pyenv/version)
 
 ## `pyenv uninstall`
 
@@ -264,24 +276,3 @@ Lists all Python versions with the given command installed.
     2.6.8
     2.7.6
     3.3.3
-
-
-## `pyenv install`
-
-Part of [Python-build](https://github.com/yyuu/pyenv/tree/master/plugins/python-build), this installs versions of python
-
-    $ pyenv install 2.7.6
-    $ pyenv install 2.6.8
-    $ pyenv versions
-      system
-      2.6.8
-    * 2.7.6 (set by /home/yyuu/.pyenv/version)
-
-
-## `pyenv install --list`
-
-List available remote versions of Python, including Anaconda, Jython, pypy, and stackless
-
-    $ pyenv install --list
-
-

From 89a150f434e0cbfbf2652dd254dc0f06f7d06f50 Mon Sep 17 00:00:00 2001
From: "Francis T. O'Donovan" <francis@betteroutcomes.com>
Date: Thu, 15 Sep 2016 09:49:02 -0400
Subject: [PATCH 10/41] Latest version of miniconda is 4.1.11 not 4.1.1

My bad!
---
 .../share/python-build/miniconda2-4.1.1       | 19 -------------------
 .../share/python-build/miniconda2-4.1.11      | 19 +++++++++++++++++++
 .../share/python-build/miniconda3-4.1.1       | 19 -------------------
 .../share/python-build/miniconda3-4.1.11      | 19 +++++++++++++++++++
 4 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 plugins/python-build/share/python-build/miniconda2-4.1.1
 create mode 100644 plugins/python-build/share/python-build/miniconda2-4.1.11
 delete mode 100644 plugins/python-build/share/python-build/miniconda3-4.1.1
 create mode 100644 plugins/python-build/share/python-build/miniconda3-4.1.11

diff --git a/plugins/python-build/share/python-build/miniconda2-4.1.1 b/plugins/python-build/share/python-build/miniconda2-4.1.1
deleted file mode 100644
index 56741622..00000000
--- a/plugins/python-build/share/python-build/miniconda2-4.1.1
+++ /dev/null
@@ -1,19 +0,0 @@
-case "$(anaconda_architecture 2>/dev/null || true)" in
-"Linux-x86" )
-  install_script "Miniconda2-4.1.1-Linux-x86" "https://repo.continuum.io/miniconda/Miniconda2-4.1.1-Linux-x86.sh#5c4f6e121ddcbd24c7f7d3e7a6ce06c60cf2c98b14895620f1d7805d75bc5a9f" "miniconda" verify_py27
-  ;;
-"Linux-x86_64" )
-  install_script "Miniconda2-4.1.1-Linux-x86_64" "https://repo.continuum.io/miniconda/Miniconda2-4.1.1-Linux-x86_64.sh#4cdd4707c8bd2959551e40c6d4561ebec2711e034a04305e2dd1f88f038edb04" "miniconda" verify_py27
-  ;;
-"MacOSX-x86_64" )
-  install_script "Miniconda2-4.1.1-MacOSX-x86_64" "https://repo.continuum.io/miniconda/Miniconda2-4.1.1-MacOSX-x86_64.sh#a974389c7aab8058f14fa7d4bc00e5bb5316a3da4b0ca1463b854701532297d7" "miniconda" verify_py27
-  ;;
-* )
-  { echo
-    colorize 1 "ERROR"
-    echo ": The binary distribution of Miniconda2 is not available for $(anaconda_architecture 2>/dev/null || true)."
-    echo
-  } >&2
-  exit 1
-  ;;
-esac
diff --git a/plugins/python-build/share/python-build/miniconda2-4.1.11 b/plugins/python-build/share/python-build/miniconda2-4.1.11
new file mode 100644
index 00000000..d3d16b54
--- /dev/null
+++ b/plugins/python-build/share/python-build/miniconda2-4.1.11
@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Miniconda2-4.1.11-Linux-x86" "https://repo.continuum.io/miniconda/Miniconda2-4.1.11-Linux-x86.sh#5c4f6e121ddcbd24c7f7d3e7a6ce06c60cf2c98b14895620f1d7805d75bc5a9f" "miniconda" verify_py27
+  ;;
+"Linux-x86_64" )
+  install_script "Miniconda2-4.1.11-Linux-x86_64" "https://repo.continuum.io/miniconda/Miniconda2-4.1.11-Linux-x86_64.sh#4cdd4707c8bd2959551e40c6d4561ebec2711e034a04305e2dd1f88f038edb04" "miniconda" verify_py27
+  ;;
+"MacOSX-x86_64" )
+  install_script "Miniconda2-4.1.11-MacOSX-x86_64" "https://repo.continuum.io/miniconda/Miniconda2-4.1.11-MacOSX-x86_64.sh#a974389c7aab8058f14fa7d4bc00e5bb5316a3da4b0ca1463b854701532297d7" "miniconda" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of Miniconda2 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac
diff --git a/plugins/python-build/share/python-build/miniconda3-4.1.1 b/plugins/python-build/share/python-build/miniconda3-4.1.1
deleted file mode 100644
index 97c239b8..00000000
--- a/plugins/python-build/share/python-build/miniconda3-4.1.1
+++ /dev/null
@@ -1,19 +0,0 @@
-case "$(anaconda_architecture 2>/dev/null || true)" in
-"Linux-x86" )
-  install_script "Miniconda3-4.1.1-Linux-x86" "https://repo.continuum.io/miniconda/Miniconda3-4.1.1-Linux-x86.sh#4e89584027016060ce4e1dc40b8cb9e1c2dfd0d9f99335fca48d419ec90753c5" "miniconda" verify_py35
-  ;;
-"Linux-x86_64" )
-  install_script "Miniconda3-4.1.1-Linux-x86_64" "https://repo.continuum.io/miniconda/Miniconda3-4.1.1-Linux-x86_64.sh#efd6a9362fc6b4085f599a881d20e57de628da8c1a898c08ec82874f3bad41bf" "miniconda" verify_py35
-  ;;
-"MacOSX-x86_64" )
-  install_script "Miniconda3-4.1.1-MacOSX-x86_64" "https://repo.continuum.io/miniconda/Miniconda3-4.1.1-MacOSX-x86_64.sh#c4e3ba528721278f74e68ef070493a27d920ba10432dd2c2d563774799eda79c" "miniconda" verify_py35
-  ;;
-* )
-  { echo
-    colorize 1 "ERROR"
-    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
-    echo
-  } >&2
-  exit 1
-  ;;
-esac
diff --git a/plugins/python-build/share/python-build/miniconda3-4.1.11 b/plugins/python-build/share/python-build/miniconda3-4.1.11
new file mode 100644
index 00000000..92e9fd28
--- /dev/null
+++ b/plugins/python-build/share/python-build/miniconda3-4.1.11
@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Miniconda3-4.1.11-Linux-x86" "https://repo.continuum.io/miniconda/Miniconda3-4.1.11-Linux-x86.sh#4e89584027016060ce4e1dc40b8cb9e1c2dfd0d9f99335fca48d419ec90753c5" "miniconda" verify_py35
+  ;;
+"Linux-x86_64" )
+  install_script "Miniconda3-4.1.11-Linux-x86_64" "https://repo.continuum.io/miniconda/Miniconda3-4.1.11-Linux-x86_64.sh#efd6a9362fc6b4085f599a881d20e57de628da8c1a898c08ec82874f3bad41bf" "miniconda" verify_py35
+  ;;
+"MacOSX-x86_64" )
+  install_script "Miniconda3-4.1.11-MacOSX-x86_64" "https://repo.continuum.io/miniconda/Miniconda3-4.1.11-MacOSX-x86_64.sh#c4e3ba528721278f74e68ef070493a27d920ba10432dd2c2d563774799eda79c" "miniconda" verify_py35
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

From d74daad8f5aadcc553f03bb18fff33b1663d7fb6 Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Tue, 20 Sep 2016 00:52:12 +0000
Subject: [PATCH 11/41] v1.0.2 (fixes #709)

---
 CHANGELOG.md            | 7 +++++++
 libexec/pyenv---version | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d947da67..146b8a2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 ## Version History
 
+## 1.0.2
+
+* python-build: Add CPython 3.6.0b1 (#699)
+* python-build: Add anaconda[23] 4.1.1 (#701, #702)
+* python-build: Add miniconda[23] 4.1.11 (#703, #704, #706)
+* python-build: Remove `bin.orig` if exists to fix an issue with `--enable-framework` (#687, #700)
+
 ## 1.0.1
 
 * python-build: Add CPython 3.6.0a4 (#673)
diff --git a/libexec/pyenv---version b/libexec/pyenv---version
index 5f548d19..8bfdfea3 100755
--- a/libexec/pyenv---version
+++ b/libexec/pyenv---version
@@ -12,7 +12,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-version="1.0.1"
+version="1.0.2"
 git_revision=""
 
 if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then

From 53fd32c2b66f5d08d33d054d94562613bba747e2 Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <samo@meluria.com>
Date: Sat, 24 Sep 2016 10:39:11 -0500
Subject: [PATCH 12/41] Added stackless-2.7.9

---
 plugins/python-build/share/python-build/stackless-2.7.9 | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 plugins/python-build/share/python-build/stackless-2.7.9

diff --git a/plugins/python-build/share/python-build/stackless-2.7.9 b/plugins/python-build/share/python-build/stackless-2.7.9
new file mode 100644
index 00000000..53b69da0
--- /dev/null
+++ b/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" ldflags_dirs standard verify_py27 ensurepip

From 7ac203bc11db8f73beacb8a7c1fc7485353263b0 Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <samo@meluria.com>
Date: Sat, 24 Sep 2016 11:43:24 -0500
Subject: [PATCH 13/41] Add ironpython-2.7.6.3

---
 plugins/python-build/share/python-build/ironpython-2.7.6.3 | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 plugins/python-build/share/python-build/ironpython-2.7.6.3

diff --git a/plugins/python-build/share/python-build/ironpython-2.7.6.3 b/plugins/python-build/share/python-build/ironpython-2.7.6.3
new file mode 100644
index 00000000..94bca05e
--- /dev/null
+++ b/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" ironpython
+# FIXME: have not confirmed to install setuptools into IronPython yet

From 7fed8c9c54429c0eb9bd4d7709de655a137d3872 Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <Samureus@users.noreply.github.com>
Date: Sun, 25 Sep 2016 00:46:14 -0500
Subject: [PATCH 14/41] Added SHA256 checksum

---
 plugins/python-build/share/python-build/ironpython-2.7.6.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/python-build/share/python-build/ironpython-2.7.6.3 b/plugins/python-build/share/python-build/ironpython-2.7.6.3
index 94bca05e..fce1f312 100644
--- a/plugins/python-build/share/python-build/ironpython-2.7.6.3
+++ b/plugins/python-build/share/python-build/ironpython-2.7.6.3
@@ -1,2 +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" ironpython
+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

From 7890b27bcfd1220e661fa11b30517583518ad336 Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <Samureus@users.noreply.github.com>
Date: Sun, 25 Sep 2016 00:52:03 -0500
Subject: [PATCH 15/41] Added SHA256 checksum to stackless-2.7.9

---
 plugins/python-build/share/python-build/stackless-2.7.9 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/python-build/share/python-build/stackless-2.7.9 b/plugins/python-build/share/python-build/stackless-2.7.9
index 53b69da0..806e4235 100644
--- a/plugins/python-build/share/python-build/stackless-2.7.9
+++ b/plugins/python-build/share/python-build/stackless-2.7.9
@@ -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_package "stackless-dev-stackless-43302de87df4" "https://bitbucket.org/stackless-dev/stackless/get/v2.7.9-slp.tar.bz2" ldflags_dirs standard verify_py27 ensurepip
+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

From 866dcd408e5ccbb3708404f4916e12dcce6cc878 Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <samo@meluria.com>
Date: Sun, 25 Sep 2016 17:25:55 -0500
Subject: [PATCH 16/41] Add build_package_pyston() to python-build

---
 plugins/python-build/bin/python-build | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 43fd0be7..279b23af 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -918,6 +918,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"

From e03cb557b067da2b223ea0336135addb085ee02e Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <samo@meluria.com>
Date: Sun, 25 Sep 2016 17:27:36 -0500
Subject: [PATCH 17/41] Add pyston-0.5.1

---
 .../share/python-build/pyston-0.5.1           | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 plugins/python-build/share/python-build/pyston-0.5.1

diff --git a/plugins/python-build/share/python-build/pyston-0.5.1 b/plugins/python-build/share/python-build/pyston-0.5.1
new file mode 100644
index 00000000..850b2dcb
--- /dev/null
+++ b/plugins/python-build/share/python-build/pyston-0.5.1
@@ -0,0 +1,19 @@
+case "$(pypy_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
+  # FIXME: more ugly hacks because Olenna Tyrell would approve
+  ( 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 )
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": A Pyston 0.5.1 binary is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

From 800488bbc151e1b56589e3bb9d1f7fbeddd46a60 Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <samo@meluria.com>
Date: Sun, 25 Sep 2016 17:31:56 -0500
Subject: [PATCH 18/41] Add pyston-0.5.1-numpy shim

---
 plugins/python-build/share/python-build/pyston-0.5.1-numpy | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 plugins/python-build/share/python-build/pyston-0.5.1-numpy

diff --git a/plugins/python-build/share/python-build/pyston-0.5.1-numpy b/plugins/python-build/share/python-build/pyston-0.5.1-numpy
new file mode 100644
index 00000000..6e7526b0
--- /dev/null
+++ b/plugins/python-build/share/python-build/pyston-0.5.1-numpy
@@ -0,0 +1 @@
+source "${BASH_SOURCE%/*}/pyston-0.5.1"

From e48c2d2f668c9da1cc253278d91874075641c545 Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <Samureus@users.noreply.github.com>
Date: Sun, 25 Sep 2016 23:21:50 -0500
Subject: [PATCH 19/41] Add stackless-3.4.2 with SHA256 checksum

---
 plugins/python-build/share/python-build/stackless-3.4.2 | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 plugins/python-build/share/python-build/stackless-3.4.2

diff --git a/plugins/python-build/share/python-build/stackless-3.4.2 b/plugins/python-build/share/python-build/stackless-3.4.2
new file mode 100644
index 00000000..ef489833
--- /dev/null
+++ b/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

From 8acb4ebaba1010112fd6b48c3c2311894b98ffc9 Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <Samureus@users.noreply.github.com>
Date: Mon, 26 Sep 2016 19:46:29 -0500
Subject: [PATCH 20/41] Delete pyston-0.5.1-numpy

---
 plugins/python-build/share/python-build/pyston-0.5.1-numpy | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 plugins/python-build/share/python-build/pyston-0.5.1-numpy

diff --git a/plugins/python-build/share/python-build/pyston-0.5.1-numpy b/plugins/python-build/share/python-build/pyston-0.5.1-numpy
deleted file mode 100644
index 6e7526b0..00000000
--- a/plugins/python-build/share/python-build/pyston-0.5.1-numpy
+++ /dev/null
@@ -1 +0,0 @@
-source "${BASH_SOURCE%/*}/pyston-0.5.1"

From d24ce2494bc4d2890368b9f15c9d5531e61dcb31 Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <Samureus@users.noreply.github.com>
Date: Mon, 26 Sep 2016 20:28:46 -0500
Subject: [PATCH 21/41] Added pyston_architecture() alias to python-build

---
 plugins/python-build/bin/python-build | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 279b23af..f7e89322 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -964,6 +964,10 @@ pypy_architecture() {
   esac
 }
 
+pyston_architecture() {
+  pypy_architecture
+}
+
 build_package_pypy() {
   build_package_copy
   mkdir -p "${PREFIX_PATH}/bin" "${PREFIX_PATH}/lib"

From 4e4bd420202bcc16da696002171fafd007dae28f Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <Samureus@users.noreply.github.com>
Date: Mon, 26 Sep 2016 20:31:01 -0500
Subject: [PATCH 22/41] Changed pypy_architecture reference to pyston alias

---
 plugins/python-build/share/python-build/pyston-0.5.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/python-build/share/python-build/pyston-0.5.1 b/plugins/python-build/share/python-build/pyston-0.5.1
index 850b2dcb..542ae688 100644
--- a/plugins/python-build/share/python-build/pyston-0.5.1
+++ b/plugins/python-build/share/python-build/pyston-0.5.1
@@ -1,4 +1,4 @@
-case "$(pypy_architecture 2>/dev/null || true)" in
+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

From 7a957c54889da314a50ae8e970246f80e5386e60 Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <Samureus@users.noreply.github.com>
Date: Mon, 26 Sep 2016 21:16:52 -0500
Subject: [PATCH 23/41] Fix missing reference to pypy_architecture

---
 plugins/python-build/share/python-build/pyston-0.5.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/python-build/share/python-build/pyston-0.5.1 b/plugins/python-build/share/python-build/pyston-0.5.1
index 542ae688..8f241f87 100644
--- a/plugins/python-build/share/python-build/pyston-0.5.1
+++ b/plugins/python-build/share/python-build/pyston-0.5.1
@@ -11,7 +11,7 @@ case "$(pyston_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo ": A Pyston 0.5.1 binary is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo ": A Pyston 0.5.1 binary is not available for $(pyston_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1

From b662634abf891311a09226999f6f2412c2344fdc Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <Samureus@users.noreply.github.com>
Date: Sun, 2 Oct 2016 10:07:50 -0500
Subject: [PATCH 24/41] Move virtualenv hack into pyston-0.5.1

---
 plugins/python-build/bin/python-build | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index f7e89322..5c01dbf8 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -922,9 +922,6 @@ 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() {

From 858b3187798f2027fcecec000321a49cfb2d4187 Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <Samureus@users.noreply.github.com>
Date: Sun, 2 Oct 2016 10:24:26 -0500
Subject: [PATCH 25/41] Add workaround hacks into pyston-0.5.1

---
 plugins/python-build/share/python-build/pyston-0.5.1 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/python-build/share/python-build/pyston-0.5.1 b/plugins/python-build/share/python-build/pyston-0.5.1
index 8f241f87..28d97a8a 100644
--- a/plugins/python-build/share/python-build/pyston-0.5.1
+++ b/plugins/python-build/share/python-build/pyston-0.5.1
@@ -5,8 +5,15 @@ case "$(pyston_architecture 2>/dev/null || true)" in
   # 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
-  # FIXME: more ugly hacks because Olenna Tyrell would approve
+  # FIXME ugly hack below adapted from
+  # https://github.com/dropbox/pyston/blob/master/docker/pyston/Dockerfile
+  ( cd "${PREFIX_PATH}/" && ./pyston virtualenv/virtualenv.py . )
+  # 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

From 46bc0b7558c365455863b8f6ab22f611952ad336 Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <samo@meluria.com>
Date: Sun, 2 Oct 2016 11:38:50 -0500
Subject: [PATCH 26/41] Moved this too soon, verify_python() expects bin/python
 to be created first

---
 plugins/python-build/bin/python-build                | 3 +++
 plugins/python-build/share/python-build/pyston-0.5.1 | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 5c01dbf8..f7e89322 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -922,6 +922,9 @@ 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() {
diff --git a/plugins/python-build/share/python-build/pyston-0.5.1 b/plugins/python-build/share/python-build/pyston-0.5.1
index 28d97a8a..3bac8557 100644
--- a/plugins/python-build/share/python-build/pyston-0.5.1
+++ b/plugins/python-build/share/python-build/pyston-0.5.1
@@ -5,9 +5,6 @@ case "$(pyston_architecture 2>/dev/null || true)" in
   # 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
-  # FIXME ugly hack below adapted from
-  # https://github.com/dropbox/pyston/blob/master/docker/pyston/Dockerfile
-  ( cd "${PREFIX_PATH}/" && ./pyston virtualenv/virtualenv.py . )
   # 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

From 4336d8b43aba223da3d71fc76202b4645f5fa670 Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <samo@meluria.com>
Date: Sun, 2 Oct 2016 11:57:06 -0500
Subject: [PATCH 27/41] Drop numpy install for now

---
 plugins/python-build/share/python-build/pyston-0.5.1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/python-build/share/python-build/pyston-0.5.1 b/plugins/python-build/share/python-build/pyston-0.5.1
index 3bac8557..cdb6b77e 100644
--- a/plugins/python-build/share/python-build/pyston-0.5.1
+++ b/plugins/python-build/share/python-build/pyston-0.5.1
@@ -6,11 +6,11 @@ case "$(pyston_architecture 2>/dev/null || true)" in
   # 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" )
+  # ( 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 )
+  # ( 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 )
+  # ( deactivate )
   ;;
 * )
   { echo

From e5ce793ad5c5579ae42997ed5308947a72892b66 Mon Sep 17 00:00:00 2001
From: Robson Roberto Souza Peixoto <robsonpeixoto@gmail.com>
Date: Mon, 3 Oct 2016 08:47:19 -0300
Subject: [PATCH 28/41] Add patch to fix 3.5.2 bug -
 https://bugs.python.org/issue26664

---
 .../patches/3.5.2/Python-3.5.2/venv.patch     | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 plugins/python-build/share/python-build/patches/3.5.2/Python-3.5.2/venv.patch

diff --git a/plugins/python-build/share/python-build/patches/3.5.2/Python-3.5.2/venv.patch b/plugins/python-build/share/python-build/patches/3.5.2/Python-3.5.2/venv.patch
new file mode 100644
index 00000000..7e2858a6
--- /dev/null
+++ b/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
+

From 021b53f924c1b5d4d9cb5827b2d5ec7c2ed0e96a Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Wed, 5 Oct 2016 00:32:33 +0000
Subject: [PATCH 29/41] Stop specifying `--enable-unicode=ucs4` on OS X (#257)

---
 plugins/python-build/bin/python-build    |  4 +++-
 plugins/python-build/test/build.bats     | 21 +++++++++++++++++++--
 plugins/python-build/test/compiler.bats  | 11 ++++++++++-
 plugins/python-build/test/pyenv_ext.bats | 16 ++++++++++++++--
 4 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index f7e89322..3d148096 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -1934,7 +1934,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)
diff --git a/plugins/python-build/test/build.bats b/plugins/python-build/test/build.bats
index 236a3d7c..466aebcf 100644
--- a/plugins/python-build/test/build.bats
+++ b/plugins/python-build/test/build.bats
@@ -223,7 +223,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 +242,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 +255,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 +275,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 +291,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"
@@ -361,6 +372,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 +391,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
 
diff --git a/plugins/python-build/test/compiler.bats b/plugins/python-build/test/compiler.bats
index ce5841ac..3b482838 100644
--- a/plugins/python-build/test/compiler.bats
+++ b/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
diff --git a/plugins/python-build/test/pyenv_ext.bats b/plugins/python-build/test/pyenv_ext.bats
index 37e87b35..bcda77c7 100644
--- a/plugins/python-build/test/pyenv_ext.bats
+++ b/plugins/python-build/test/pyenv_ext.bats
@@ -234,6 +234,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 +245,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 +253,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 +263,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 +289,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 +303,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

From 9f3f38d312d6cb97878571a3b4e74e714550bc3d Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Wed, 5 Oct 2016 00:45:21 +0000
Subject: [PATCH 30/41] Add `uname` stubs to avoid test failures on OS X (#257)

---
 plugins/python-build/test/build.bats     | 32 ++++++++++++++++++++++++
 plugins/python-build/test/pyenv_ext.bats | 12 +++++++++
 2 files changed, 44 insertions(+)

diff --git a/plugins/python-build/test/build.bats b/plugins/python-build/test/build.bats
index 466aebcf..f0e3a1b8 100644
--- a/plugins/python-build/test/build.bats
+++ b/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"
@@ -317,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"
@@ -412,6 +440,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"
diff --git a/plugins/python-build/test/pyenv_ext.bats b/plugins/python-build/test/pyenv_ext.bats
index bcda77c7..823662c0 100644
--- a/plugins/python-build/test/pyenv_ext.bats
+++ b/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
 

From 35ecd398ac3f951a611255e090b6ab8e42894be3 Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Wed, 5 Oct 2016 10:06:03 +0900
Subject: [PATCH 31/41] Fix test failure on OS X

---
 plugins/python-build/test/build.bats | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/python-build/test/build.bats b/plugins/python-build/test/build.bats
index f0e3a1b8..42ca4b08 100644
--- a/plugins/python-build/test/build.bats
+++ b/plugins/python-build/test/build.bats
@@ -366,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"

From 096f0e2ba6845a617b38209a05131ed2de2d1507 Mon Sep 17 00:00:00 2001
From: Samuel Villamonte <Samureus@users.noreply.github.com>
Date: Sun, 9 Oct 2016 00:41:43 -0500
Subject: [PATCH 32/41] Incorrect directory in the 32-bit version

---
 plugins/python-build/share/python-build/pypy2-5.4.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/python-build/share/python-build/pypy2-5.4.1 b/plugins/python-build/share/python-build/pypy2-5.4.1
index e0826867..d8719844 100644
--- a/plugins/python-build/share/python-build/pypy2-5.4.1
+++ b/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

From a87877c381bb7cd17e951700e3a0b61287d51f7d Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Mon, 10 Oct 2016 00:53:44 -0400
Subject: [PATCH 33/41] Add 3.7-dev definition

As reported in https://github.com/travis-ci/travis-ci/issues/6599,
the "default" Python branch has moved on to "3.7-dev".
---
 plugins/python-build/bin/python-build           | 5 +++++
 plugins/python-build/share/python-build/3.7-dev | 4 ++++
 2 files changed, 9 insertions(+)
 create mode 100644 plugins/python-build/share/python-build/3.7-dev

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index f7e89322..73a00e06 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -1655,6 +1655,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}"
diff --git a/plugins/python-build/share/python-build/3.7-dev b/plugins/python-build/share/python-build/3.7-dev
new file mode 100644
index 00000000..8bd7dc97
--- /dev/null
+++ b/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_hg "Python-3.7-dev" "https://hg.python.org/cpython" "default" standard verify_py37 ensurepip

From 72d6b75b5c481070db1c2b47501914e49c71668b Mon Sep 17 00:00:00 2001
From: Sergey B Kirpichev <skirpichev@gmail.com>
Date: Mon, 10 Oct 2016 09:57:47 +0300
Subject: [PATCH 34/41] Point 3.6-dev to the 3.6 branch

As reported in travis-ci/travis-ci#6599,
the "default" Python branch has moved on to "3.7-dev".
---
 plugins/python-build/share/python-build/3.6-dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/python-build/share/python-build/3.6-dev b/plugins/python-build/share/python-build/3.6-dev
index c7f0409c..25ed00d4 100644
--- a/plugins/python-build/share/python-build/3.6-dev
+++ b/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_hg "Python-3.6-dev" "https://hg.python.org/cpython" "3.6" standard verify_py36 ensurepip

From 5fe403d7dabf649b7143d4300b68f466dd2944c0 Mon Sep 17 00:00:00 2001
From: Zhiming Wang <zmwangx@gmail.com>
Date: Mon, 10 Oct 2016 22:10:32 -0400
Subject: [PATCH 35/41] Add CPython 3.6.0b2

https://www.python.org/downloads/release/python-360b2/.
---
 plugins/python-build/share/python-build/3.6.0b2 | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 plugins/python-build/share/python-build/3.6.0b2

diff --git a/plugins/python-build/share/python-build/3.6.0b2 b/plugins/python-build/share/python-build/3.6.0b2
new file mode 100644
index 00000000..e1ab42dd
--- /dev/null
+++ b/plugins/python-build/share/python-build/3.6.0b2
@@ -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.0b2" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0b2.tar.xz#3afd4544b99933275c513f7c3d3a23e183de8e209709ed8785bbd42e2c4869ea" 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
+fi

From bf0cdcf9805a4a47a81f0b05a53e001e5254ba73 Mon Sep 17 00:00:00 2001
From: Zhiming Wang <zmwangx@gmail.com>
Date: Mon, 10 Oct 2016 22:11:24 -0400
Subject: [PATCH 36/41] Remove CPython 3.6.0b1 in favor of 3.6.0b2

---
 plugins/python-build/share/python-build/3.6.0b1 | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 plugins/python-build/share/python-build/3.6.0b1

diff --git a/plugins/python-build/share/python-build/3.6.0b1 b/plugins/python-build/share/python-build/3.6.0b1
deleted file mode 100644
index caf95252..00000000
--- a/plugins/python-build/share/python-build/3.6.0b1
+++ /dev/null
@@ -1,8 +0,0 @@
-#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.0b1" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0b1.tar.xz#a83b094a8abf8a1fba7c548a5e8dd0aabe87a87a6ebd87c97f4a5a2527a74d42" ldflags_dirs standard verify_py36 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
-fi

From 725ff0c5dd8151f22205111473a37df0aef73b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 11 Oct 2016 14:07:48 +0300
Subject: [PATCH 37/41] Spelling fixes

---
 CHANGELOG.md                                               | 2 +-
 plugins/python-build/README.md                             | 2 +-
 plugins/python-build/bin/pyenv-install                     | 2 +-
 plugins/python-build/share/python-build/pypy-1.7           | 2 +-
 plugins/python-build/share/python-build/pypy-1.8           | 2 +-
 plugins/python-build/share/python-build/pypy-1.9           | 2 +-
 plugins/python-build/share/python-build/pypy-2.0           | 2 +-
 plugins/python-build/share/python-build/pypy-2.0.1         | 2 +-
 plugins/python-build/share/python-build/pypy-2.0.2         | 2 +-
 plugins/python-build/share/python-build/pypy-2.1           | 2 +-
 plugins/python-build/share/python-build/pypy-2.2           | 2 +-
 plugins/python-build/share/python-build/pypy-2.2.1         | 2 +-
 plugins/python-build/share/python-build/pypy-2.3           | 2 +-
 plugins/python-build/share/python-build/pypy-2.3.1         | 2 +-
 plugins/python-build/share/python-build/pypy-2.4-beta1     | 2 +-
 plugins/python-build/share/python-build/pypy-2.4.0         | 2 +-
 plugins/python-build/share/python-build/pypy-2.5.0         | 2 +-
 plugins/python-build/share/python-build/pypy-2.5.1         | 2 +-
 plugins/python-build/share/python-build/pypy-2.6.0         | 2 +-
 plugins/python-build/share/python-build/pypy-2.6.1         | 2 +-
 plugins/python-build/share/python-build/pypy-4.0.0         | 2 +-
 plugins/python-build/share/python-build/pypy-4.0.1         | 2 +-
 plugins/python-build/share/python-build/pypy-5.0.0         | 2 +-
 plugins/python-build/share/python-build/pypy-5.0.1         | 2 +-
 plugins/python-build/share/python-build/pypy-5.1           | 2 +-
 plugins/python-build/share/python-build/pypy-5.1.1         | 2 +-
 plugins/python-build/share/python-build/pypy2-5.3          | 6 +++---
 plugins/python-build/share/python-build/pypy2-5.3.1        | 2 +-
 plugins/python-build/share/python-build/pypy2-5.4          | 2 +-
 plugins/python-build/share/python-build/pypy3-2.3.1        | 2 +-
 plugins/python-build/share/python-build/pypy3-2.4.0        | 2 +-
 plugins/python-build/share/python-build/pypy3.3-5.2-alpha1 | 2 +-
 test/version-name.bats                                     | 2 +-
 33 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 146b8a2c..8710a5fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -315,7 +315,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
diff --git a/plugins/python-build/README.md b/plugins/python-build/README.md
index 5a00ab82..c13c51c9 100644
--- a/plugins/python-build/README.md
+++ b/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
diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install
index ae937903..651d5b31 100755
--- a/plugins/python-build/bin/pyenv-install
+++ b/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}"
diff --git a/plugins/python-build/share/python-build/pypy-1.7 b/plugins/python-build/share/python-build/pypy-1.7
index 3f992c43..a951675c 100644
--- a/plugins/python-build/share/python-build/pypy-1.7
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-1.8 b/plugins/python-build/share/python-build/pypy-1.8
index ef1a4b38..5e28f8e3 100644
--- a/plugins/python-build/share/python-build/pypy-1.8
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-1.9 b/plugins/python-build/share/python-build/pypy-1.9
index 5bd0149e..11aa8db2 100644
--- a/plugins/python-build/share/python-build/pypy-1.9
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-2.0 b/plugins/python-build/share/python-build/pypy-2.0
index acbff258..02a623b2 100644
--- a/plugins/python-build/share/python-build/pypy-2.0
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-2.0.1 b/plugins/python-build/share/python-build/pypy-2.0.1
index d4285d40..ee9e3e70 100644
--- a/plugins/python-build/share/python-build/pypy-2.0.1
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-2.0.2 b/plugins/python-build/share/python-build/pypy-2.0.2
index 59089582..b665d6de 100644
--- a/plugins/python-build/share/python-build/pypy-2.0.2
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-2.1 b/plugins/python-build/share/python-build/pypy-2.1
index fdaa6fe8..f1ed28fa 100644
--- a/plugins/python-build/share/python-build/pypy-2.1
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-2.2 b/plugins/python-build/share/python-build/pypy-2.2
index 2c68efad..fd624a07 100644
--- a/plugins/python-build/share/python-build/pypy-2.2
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-2.2.1 b/plugins/python-build/share/python-build/pypy-2.2.1
index 8880aaf7..6ae86521 100644
--- a/plugins/python-build/share/python-build/pypy-2.2.1
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-2.3 b/plugins/python-build/share/python-build/pypy-2.3
index a4487487..28f3dfc5 100644
--- a/plugins/python-build/share/python-build/pypy-2.3
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-2.3.1 b/plugins/python-build/share/python-build/pypy-2.3.1
index e60dede2..c592e248 100644
--- a/plugins/python-build/share/python-build/pypy-2.3.1
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-2.4-beta1 b/plugins/python-build/share/python-build/pypy-2.4-beta1
index f7352bcd..5c6deca0 100644
--- a/plugins/python-build/share/python-build/pypy-2.4-beta1
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-2.4.0 b/plugins/python-build/share/python-build/pypy-2.4.0
index cc6bb69c..2055c04a 100644
--- a/plugins/python-build/share/python-build/pypy-2.4.0
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-2.5.0 b/plugins/python-build/share/python-build/pypy-2.5.0
index c88ace02..7d7d62a6 100644
--- a/plugins/python-build/share/python-build/pypy-2.5.0
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-2.5.1 b/plugins/python-build/share/python-build/pypy-2.5.1
index 7bfdf4f9..06bf7607 100644
--- a/plugins/python-build/share/python-build/pypy-2.5.1
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-2.6.0 b/plugins/python-build/share/python-build/pypy-2.6.0
index b1204cd7..ceed07cb 100644
--- a/plugins/python-build/share/python-build/pypy-2.6.0
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-2.6.1 b/plugins/python-build/share/python-build/pypy-2.6.1
index d6d9847c..6dbeab1b 100644
--- a/plugins/python-build/share/python-build/pypy-2.6.1
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-4.0.0 b/plugins/python-build/share/python-build/pypy-4.0.0
index 330dd94a..62f497af 100644
--- a/plugins/python-build/share/python-build/pypy-4.0.0
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-4.0.1 b/plugins/python-build/share/python-build/pypy-4.0.1
index 6f119c85..388d80b9 100644
--- a/plugins/python-build/share/python-build/pypy-4.0.1
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-5.0.0 b/plugins/python-build/share/python-build/pypy-5.0.0
index 4d17cfbb..fddb41f8 100644
--- a/plugins/python-build/share/python-build/pypy-5.0.0
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-5.0.1 b/plugins/python-build/share/python-build/pypy-5.0.1
index 618b68ea..ba9d0201 100644
--- a/plugins/python-build/share/python-build/pypy-5.0.1
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-5.1 b/plugins/python-build/share/python-build/pypy-5.1
index e259e442..2e20edd6 100644
--- a/plugins/python-build/share/python-build/pypy-5.1
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy-5.1.1 b/plugins/python-build/share/python-build/pypy-5.1.1
index ab1ab043..74c45fd1 100644
--- a/plugins/python-build/share/python-build/pypy-5.1.1
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy2-5.3 b/plugins/python-build/share/python-build/pypy2-5.3
index 66a38b7d..5b668e2f 100644
--- a/plugins/python-build/share/python-build/pypy2-5.3
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy2-5.3.1 b/plugins/python-build/share/python-build/pypy2-5.3.1
index c8a49a99..bd826ffe 100644
--- a/plugins/python-build/share/python-build/pypy2-5.3.1
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy2-5.4 b/plugins/python-build/share/python-build/pypy2-5.4
index e6604e49..1801b8f1 100644
--- a/plugins/python-build/share/python-build/pypy2-5.4
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy3-2.3.1 b/plugins/python-build/share/python-build/pypy3-2.3.1
index a0fca227..ed31268b 100644
--- a/plugins/python-build/share/python-build/pypy3-2.3.1
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy3-2.4.0 b/plugins/python-build/share/python-build/pypy3-2.4.0
index 23ee58a6..ef57afcb 100644
--- a/plugins/python-build/share/python-build/pypy3-2.4.0
+++ b/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
diff --git a/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1 b/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1
index a7c5a2a4..0bab7f06 100644
--- a/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1
+++ b/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
diff --git a/test/version-name.bats b/test/version-name.bats
index d0990473..97604f82 100644
--- a/test/version-name.bats
+++ b/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"
 }

From d5f18d4d82bdba1ae10a36107b81392861ab270b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 11 Oct 2016 14:42:09 +0300
Subject: [PATCH 38/41] Add PyPy3.3 v5.5-alpha

---
 .../share/python-build/pypy3.3-5.5-alpha      | 57 +++++++++++++++++++
 .../share/python-build/pypy3.3-5.5-alpha-src  |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 plugins/python-build/share/python-build/pypy3.3-5.5-alpha
 create mode 100644 plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src

diff --git a/plugins/python-build/share/python-build/pypy3.3-5.5-alpha b/plugins/python-build/share/python-build/pypy3.3-5.5-alpha
new file mode 100644
index 00000000..4ce5faad
--- /dev/null
+++ b/plugins/python-build/share/python-build/pypy3.3-5.5-alpha
@@ -0,0 +1,57 @@
+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
+    { 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
+  ;;
+"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
+    { 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
+  ;;
+"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
diff --git a/plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src b/plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src
new file mode 100644
index 00000000..6f792106
--- /dev/null
+++ b/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

From e04f2720b49226652900e6681ac60102b10d1609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 11 Oct 2016 17:13:04 +0300
Subject: [PATCH 39/41] Make Ubuntu notes stand out better; add linebreak after
 zsh ones

Line break accomplished by two trailing spaces on the zsh lines.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2408fcba..e9631d06 100644
--- a/README.md
+++ b/README.md
@@ -187,7 +187,7 @@ easy to fork and contribute any changes back upstream.
         $ 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`.
+    **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.  
     **Ubuntu note**: Modify your `~/.bashrc` file instead of `~/.bash_profile`.
 
 3. **Add `pyenv init` to your shell** to enable shims and autocompletion.
@@ -196,7 +196,7 @@ easy to fork and contribute any changes back upstream.
 
         $ echo 'eval "$(pyenv init -)"' >> ~/.bash_profile
 
-    **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.
+    **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.  
     **Ubuntu note**: Modify your `~/.bashrc` file instead of `~/.bash_profile`.
     
     **General warning**: There are some systems where the `BASH_ENV` variable is configured

From 22ab0f8b2fe0e5ece2b573988bc6015510822bc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 11 Oct 2016 22:34:29 +0300
Subject: [PATCH 40/41] Like Ubuntu, Fedora users should modify ~/.bashrc too

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e9631d06..2320d563 100644
--- a/README.md
+++ b/README.md
@@ -188,7 +188,7 @@ easy to fork and contribute any changes back upstream.
         $ 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`.
+    **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
@@ -197,7 +197,7 @@ easy to fork and contribute any changes back upstream.
         $ 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`.
+    **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

From 6e658f30a9467cedd4e3679bf50339e5c3c6de89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 14 Oct 2016 08:38:06 +0300
Subject: [PATCH 41/41] Add PyPy3.3 v5.5-alpha portable binaries

---
 .../share/python-build/pypy3.3-5.5-alpha       | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/plugins/python-build/share/python-build/pypy3.3-5.5-alpha b/plugins/python-build/share/python-build/pypy3.3-5.5-alpha
index 4ce5faad..c82ab70b 100644
--- a/plugins/python-build/share/python-build/pypy3.3-5.5-alpha
+++ b/plugins/python-build/share/python-build/pypy3.3-5.5-alpha
@@ -1,15 +1,9 @@
 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
+    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
-    { 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
+    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" )
@@ -33,13 +27,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   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
-    { 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
+    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" )