v1.1.3

Add CPython 3.6.2rc2 and remove 3.6.2rc1

.gitignore

@@ -7,3 +7,4 @@
 /src/Makefile
 /src/*.o
 /bats/
+/default-packages

CHANGELOG.md

@@ -1,5 +1,27 @@
 ## Version History
 
+## Unreleased
+
+## v1.1.3
+
+* python-build: Add CPython 3.6.2 (#951)
+
+## v1.1.2
+
+* pyenv: Fix incorrect `pyenv --version` output in v1.1.1 (#947)
+
+## v1.1.1
+
+* python-build: Update links to Portable Pypy 5.8-1 bugfix release, affects pypy2.7-5.8.0 and pypy3.5-5.8.0 definitions (#939)
+
+## v1.1.0
+
+* python-build: Add PyPy 5.7.1 (#888)
+* pyenv: Merge rbenv master (#927)
+* python-build: Add PyPy 5.8.0 (#932)
+* python-build: Anaconda[23] 4.4.0
+* python-build: Add micropython-dev
+
 ## 1.0.10
 
 * python-build: Add Anaconda2/Anaconda3 4.3.1 (#876)
@@ -153,12 +175,12 @@
 
 * pyenv: Merge recent changes from rbenv as of 2015-12-14 (#504)
 * python-build: Add a `OPENSSL_NO_SSL3` patch for CPython 2.6, 2.7, 3.0, 3.1, 3.2 and 3.3 series (#507, #511)
-* python-build: Stopped using mirror at yyuu.github.io for CPython since http://www.python.org is on fast.ly
+* python-build: Stopped using mirror at pyenv.github.io for CPython since http://www.python.org is on fast.ly
 
 ### 20151210
 
 * pyenv: Add a default hook for Anaconda to look for original `$PATH` (#491)
-* pyenv: Skip virtualenv aliases on `pyenv versions --skip-aliases` (yyuu/pyenv-virtualenv#126)
+* pyenv: Skip virtualenv aliases on `pyenv versions --skip-aliases` (pyenv/pyenv-virtualenv#126)
 * python-build: Add CPython 2.7.11, 3.5.1 (#494, #498)
 * python-build: Update OpenSSL to 1.0.1q (#496)
 * python-build: Adding SSL patch to build 2.7.3 on Debian (#495)
@@ -270,7 +292,7 @@
 
 #### 20141211
 
-* pyenv: Add built-in `pip-rehash` feature. You don't need to install [pyenv-pip-rehash](https://github.com/yyuu/pyenv-pip-rehash) anymore.
+* pyenv: Add built-in `pip-rehash` feature. You don't need to install [pyenv-pip-rehash](https://github.com/pyenv/pyenv-pip-rehash) anymore.
 * python-build: Add new CPython release; 2.7.9 (#284)
 * python-build: Add new PyPy releases; pypy3-2.4.0, pypy3-2.4.0-src (#277)
 * python-build: Add build definitions of PyPy nightly build
@@ -382,7 +404,7 @@
 * python-build: Do not exit with errors even if some of modules are absent (#131)
 * 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: Display value from `pypy_architecture` and `anaconda_architecture` on errors (pyenv/pyenv-virtualenv#18)
 * python-build: Remove old development version; 2.6-dev
 * python-build: Update default setuptools version (3.3 -> 3.4.1)
 
@@ -436,7 +458,7 @@
 * python-build: Activate friendly CPython during build if the one is not activated (8fa6b4a1847851919ad7857c6c42ed809a4d277b)
 * python-build: Fix broken install.sh
 * python-build: Import recent changes from ruby-build v20131225.1
-* version-ext-compat: Removed from default plugin. Please use [pyenv-version-ext](https://github.com/yyuu/pyenv-version-ext) instead.
+* version-ext-compat: Removed from default plugin. Please use [pyenv-version-ext](https://github.com/pyenv/pyenv-version-ext) instead.
 
 #### 0.4.0-20131217
 

COMMANDS.md

@@ -1,7 +1,7 @@
 # Command Reference
 
 Like `git`, the `pyenv` command delegates to subcommands based on its
-first argument. 
+first argument.
 
 The most common subcommands are:
 
@@ -185,7 +185,7 @@ or, if you prefer 3.3.3 over 2.7.6,
 
 ## `pyenv install`
 
-Install a Python version (using [`python-build`](https://github.com/yyuu/pyenv/tree/master/plugins/python-build)).
+Install a Python version (using [`python-build`](https://github.com/pyenv/pyenv/tree/master/plugins/python-build)).
 
     Usage: pyenv install [-f] [-kvp] <version>
            pyenv install [-f] [-kvp] <definition-file>

README.md

@@ -207,10 +207,10 @@ easy to fork and contribute any changes back upstream.
     ```
     **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.  
     **Ubuntu and Fedora note**: Modify your `~/.bashrc` file instead of `~/.bash_profile`.
-    
+
     **General warning**: There are some systems where the `BASH_ENV` variable is configured
     to point to `.bashrc`. On such systems you should almost certainly put the abovementioned line
-    `eval "$(pyenv init -)` into `.bash_profile`, and **not** into `.bashrc`. Otherwise you
+    `eval "$(pyenv init -)"` into `.bash_profile`, and **not** into `.bashrc`. Otherwise you
     may observe strange behaviour, such as `pyenv` getting into an infinite loop.
     See [#264](https://github.com/pyenv/pyenv/issues/264) for details.
 
@@ -226,7 +226,7 @@ easy to fork and contribute any changes back upstream.
     ```
    **NOTE:** If you need to pass configure option to build, please use
    ```CONFIGURE_OPTS``` environment variable.
-   
+
    **NOTE:** If you want to use proxy to download, please use `http_proxy` and `https_proxy`
    environment variable.
 
@@ -281,8 +281,6 @@ uninstall from the system.
 
         brew uninstall pyenv
 
-## Command Reference
-
 ### Homebrew on Mac OS X
 
 You can also install pyenv using the [Homebrew](http://brew.sh)
@@ -357,7 +355,7 @@ You can affect how pyenv operates with the following settings:
 
 name | default | description
 -----|---------|------------
-`PYENV_VERSION` | | Specifies the Python version to be used.<br>Also see [`pyenv shell`](#pyenv-shell)
+`PYENV_VERSION` | | Specifies the Python version to be used.<br>Also see [`pyenv shell`](https://github.com/pyenv/pyenv/blob/master/COMMANDS.md#pyenv-shell)
 `PYENV_ROOT` | `~/.pyenv` | Defines the directory under which Python versions and shims reside.<br>Also see `pyenv root`
 `PYENV_DEBUG` | | Outputs debug information.<br>Also as: `pyenv --debug <subcommand>`
 `PYENV_HOOK_PATH` | [_see wiki_][hooks] | Colon-separated list of paths searched for pyenv hooks.

libexec/pyenv---version

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

libexec/pyenv-init

@@ -86,8 +86,8 @@ mkdir -p "${PYENV_ROOT}/"{shims,versions}
 
 case "$shell" in
 fish )
-  echo "setenv PATH '${PYENV_ROOT}/shims' \$PATH"
-  echo "setenv PYENV_SHELL $shell"
+  echo "set -gx PATH '${PYENV_ROOT}/shims' \$PATH"
+  echo "set -gx PYENV_SHELL $shell"
 ;;
 * )
   echo 'export PATH="'${PYENV_ROOT}'/shims:${PATH}"'
@@ -97,10 +97,7 @@ esac
 
 completion="${root}/completions/pyenv.${shell}"
 if [ -r "$completion" ]; then
-  case "$shell" in
-  fish ) echo ". '$completion'" ;;
-  *    ) echo "source '$completion'" ;;
-  esac
+  echo "source '$completion'"
 fi
 
 if [ -z "$no_rehash" ]; then
@@ -117,7 +114,7 @@ function pyenv
 
   switch "\$command"
   case ${commands[*]}
-    . (pyenv "sh-\$command" \$argv|psub)
+    source (pyenv "sh-\$command" \$argv|psub)
   case '*'
     command pyenv "\$command" \$argv
   end

libexec/pyenv-sh-shell

@@ -2,7 +2,8 @@
 #
 # Summary: Set or show the shell-specific Python version
 #
-# Usage: pyenv shell <version>
+# Usage: pyenv shell <version>...
+#        pyenv shell -
 #        pyenv shell --unset
 #
 # Sets a shell-specific Python version by setting the `PYENV_VERSION'
@@ -12,6 +13,11 @@
 # <version> should be a string matching a Python version known to pyenv.
 # The special version string `system' will use your default system Python.
 # Run `pyenv versions' for a list of available Python versions.
+#
+# When `-` is passed instead of the version string, the previously set
+# version will be restored. With `--unset`, the `PYENV_VERSION`
+# environment variable gets unset, restoring the environment to the
+# state before the first `pyenv shell` call.
 
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -31,7 +37,7 @@ if [ -z "$versions" ]; then
     echo "pyenv: no shell-specific version configured" >&2
     exit 1
   else
-    echo "echo \"\$PYENV_VERSION\""
+    echo 'echo "$PYENV_VERSION"'
     exit
   fi
 fi
@@ -39,28 +45,76 @@ fi
 if [ "$versions" = "--unset" ]; then
   case "$shell" in
   fish )
+    echo 'set -gu PYENV_VERSION_OLD "$PYENV_VERSION"'
     echo "set -e PYENV_VERSION"
     ;;
   * )
+    echo 'PYENV_VERSION_OLD="$PYENV_VERSION"'
     echo "unset PYENV_VERSION"
     ;;
   esac
   exit
 fi
 
+if [ "$versions" = "-" ]; then
+  case "$shell" in
+  fish )
+    cat <<EOS
+if set -q PYENV_VERSION_OLD
+  if [ -n "\$PYENV_VERSION_OLD" ]
+    set PYENV_VERSION_OLD_ "\$PYENV_VERSION"
+    set -gx PYENV_VERSION "\$PYENV_VERSION_OLD"
+    set -gu PYENV_VERSION_OLD "\$PYENV_VERSION_OLD_"
+    set -e PYENV_VERSION_OLD_
+  else
+    set -gu PYENV_VERSION_OLD "\$PYENV_VERSION"
+    set -e PYENV_VERSION
+  end
+else
+  echo "pyenv: PYENV_VERSION_OLD is not set" >&2
+  false
+end
+EOS
+    ;;
+  * )
+    cat <<EOS
+if [ -n "\${PYENV_VERSION_OLD+x}" ]; then
+  if [ -n "\$PYENV_VERSION_OLD" ]; then
+    PYENV_VERSION_OLD_="\$PYENV_VERSION"
+    export PYENV_VERSION="\$PYENV_VERSION_OLD"
+    PYENV_VERSION_OLD="\$PYENV_VERSION_OLD_"
+    unset PYENV_VERSION_OLD_
+  else
+    PYENV_VERSION_OLD="\$PYENV_VERSION"
+    unset PYENV_VERSION
+  fi
+else
+  echo "pyenv: PYENV_VERSION_OLD is not set" >&2
+  false
+fi
+EOS
+    ;;
+  esac
+  exit
+fi
+
 # Make sure the specified version is installed.
 if pyenv-prefix "${versions[@]}" >/dev/null; then
   OLDIFS="$IFS"
   IFS=: version="${versions[*]}"
   IFS="$OLDIFS"
-  case "$shell" in
-  fish )
-    echo "setenv PYENV_VERSION \"${version}\""
-    ;;
-  * )
-    echo "export PYENV_VERSION=\"${version}\""
-    ;;
-  esac
+  if [ "$version" != "$PYENV_VERSION" ]; then
+    case "$shell" in
+    fish )
+      echo 'set -gu PYENV_VERSION_OLD "$PYENV_VERSION"'
+      echo "set -gx PYENV_VERSION \"$version\""
+      ;;
+    * )
+      echo 'PYENV_VERSION_OLD="$PYENV_VERSION"'
+      echo "export PYENV_VERSION=\"${version}\""
+      ;;
+    esac
+  fi
 else
   echo "false"
   exit 1

libexec/pyenv-version-file

@@ -9,7 +9,7 @@ target_dir="$1"
 find_local_version_file() {
   local root="$1"
   while ! [[ "$root" =~ ^//[^/]*$ ]]; do
-    if [ -e "${root}/.python-version" ]; then
+    if [ -f "${root}/.python-version" ]; then
       echo "${root}/.python-version"
       return 0
     fi

libexec/pyenv-which

@@ -18,7 +18,7 @@ fi
 remove_from_path() {
   local path_to_remove="$1"
   local path_before
-  local result=":$PATH:"
+  local result=":${PATH//\~/$HOME}:"
   while [ "$path_before" != "$result" ]; do
     path_before="$result"
     result="${result//:$path_to_remove:/:}"

plugins/python-build/README.md

@@ -152,13 +152,13 @@ $ cat fix1.patch fix2.patch | pyenv install --patch 2.7.10
 You can build CPython with `--enable-shared` to install a version with
 shared object.
 
-If `--enabled-shared` was found in `PYTHON_CONFIGURE_OPTS` or `CONFIGURE_OPTS`,
+If `--enable-shared` was found in `PYTHON_CONFIGURE_OPTS` or `CONFIGURE_OPTS`,
 `python-build` will automatically set `RPATH` to the pyenv's prefix directory.
 This means you don't have to set `LD_LIBRARY_PATH` or `DYLD_LIBRARY_PATH` for
 the version(s) installed with `--enable-shared`.
 
 ```sh
-$ env PYTHON_CONFIGURE_OPTS="--enable-shared` pyenv install 2.7.9
+$ env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install 2.7.9
 ```
 
 ### Checksum verification

plugins/python-build/bin/python-build

@@ -938,6 +938,21 @@ build_package_ironpython_builder() {
   ( cd "Stage/Release/IronPython-"* && build_package_ironpython )
 }
 
+build_package_micropython() {
+  if [ "${MAKEOPTS+defined}" ]; then
+    MAKE_OPTS="$MAKEOPTS"
+  elif [ -z "${MAKE_OPTS+defined}" ]; then
+    MAKE_OPTS="-j $(num_cpu_cores)"
+  fi
+  { cd unix
+    "$MAKE" $MAKE_OPTS axtls
+    "$MAKE" $MAKE_OPTS CFLAGS_EXTRA="-DMICROPY_PY_SYS_PATH_DEFAULT='\"${PREFIX_PATH}/lib/micropython\"'"
+    "$MAKE" install $MAKE_INSTALL_OPTS PREFIX="${PREFIX_PATH}"
+    ln -fs micropython "${PREFIX_PATH}/bin/python"
+    mkdir -p "${PREFIX_PATH}/lib/micropython"
+  }>&4 2>&1
+}
+
 pypy_architecture() {
   case "$(uname -s)" in
   "Darwin" ) echo "osx64" ;;
@@ -1027,7 +1042,7 @@ anaconda_architecture() {
 
 build_package_anaconda() {
   local package_name="$1"
-  { bash "${package_name}.sh" -b -p "${PREFIX_PATH}"
+  { bash "${package_name}.sh" -f -b -p "${PREFIX_PATH}"
   } >&4 2>&1
 }
 

plugins/python-build/share/python-build/3.0.1

@@ -3,7 +3,7 @@ install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.
 install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-3.0.1" "https://www.python.org/ftp/python/3.0.1/Python-3.0.1.tgz#7d5f2feae9035f1d3d9e6bb7f092dbf374d6bb4b25abd0d2d11f13bba1cb04de" ldflags_dirs standard verify_py30
 if [[ "Darwin" == "$(uname -s)" ]]; then
-  # https://github.com/yyuu/pyenv/issues/456
+  # https://github.com/pyenv/pyenv/issues/456
   { echo
     colorize 1 "WARNING"
     echo ": pyenv cannot install setuptools-1.4.2 to CPython 3.0.1 on OS X."

plugins/python-build/share/python-build/3.6.2

@@ -0,0 +1,8 @@
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
+install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+if has_tar_xz_support; then
+  install_package "Python-3.6.2" "https://www.python.org/ftp/python/3.6.2/Python-3.6.2.tar.xz#9229773be41ed144370f47f0f626a1579931f5a390f1e8e3853174d52edd64a9" ldflags_dirs standard verify_py36 ensurepip
+else
+  install_package "Python-3.6.2" "https://www.python.org/ftp/python/3.6.2/Python-3.6.2.tgz#7919489310a5f17f7acbab64d731e46dca0702874840dadce8bd4b2b3b8e7a82" ldflags_dirs standard verify_py36 ensurepip
+fi

plugins/python-build/share/python-build/anaconda2-4.4.0

@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Anaconda2-4.4.0-Linux-x86" "https://repo.continuum.io/archive/Anaconda2-4.4.0-Linux-x86.sh#452aa91ac83d3b6a68b79cea3042170ec591d468d6966307ff9af18fdbce9fbf" "anaconda" verify_py27
+  ;;
+"Linux-x86_64" )
+  install_script "Anaconda2-4.4.0-Linux-x86_64" "https://repo.continuum.io/archive/Anaconda2-4.4.0-Linux-x86_64.sh#2d30b91ed4d215b6b4a15162a3389e9057b15445a0c02da71bd7bd272e7b824e" "anaconda" verify_py27
+  ;;
+"MacOSX-x86_64" )
+  install_script "Anaconda2-4.4.0-MacOSX-x86_64" "https://repo.continuum.io/archive/Anaconda2-4.4.0-MacOSX-x86_64.sh#ab95aef1110c2a385fd39a17e5f11dfbaabce25c1a5944598de164d7a2772969" "anaconda" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of Anaconda2 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

plugins/python-build/share/python-build/anaconda3-4.4.0

@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Anaconda3-4.4.0-Linux-x86" "https://repo.continuum.io/archive/Anaconda3-4.4.0-Linux-x86.sh#b0e492206d43067314b25963bc7d1f012096ca0323b7629f4ebcd071b03905b5" "anaconda" verify_py36
+  ;;
+"Linux-x86_64" )
+  install_script "Anaconda3-4.4.0-Linux-x86_64" "https://repo.continuum.io/archive/Anaconda3-4.4.0-Linux-x86_64.sh#3301b37e402f3ff3df216fe0458f1e6a4ccbb7e67b4d626eae9651de5ea3ab63" "anaconda" verify_py36
+  ;;
+"MacOSX-x86_64" )
+  install_script "Anaconda3-4.4.0-MacOSX-x86_64" "https://repo.continuum.io/archive/Anaconda3-4.4.0-MacOSX-x86_64.sh#10fe58f09ae524df2548d17b8bb1e75db17da597a6ec10d695ce01387a2d7422" "anaconda" verify_py36
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of Anaconda3 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

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

@@ -2,5 +2,5 @@ require_java
 install_hg "jython-2.5-dev" "https://hg.python.org/jython" "2.5" jython_builder
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
-# * https://github.com/yyuu/pyenv/issues/15
+# * https://github.com/pyenv/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python

plugins/python-build/share/python-build/jython-2.5.0

@@ -1,9 +1,9 @@
 require_java
 install_jar "jython-2.5.0" "https://downloads.sourceforge.net/project/jython/jython/2.5.0/jython_installer-2.5.0.jar#e3d8209ef9eb143df8101a5da6b3482cf457084e3a6247031fd510d71c13ab98" jython
 # distribute (>= 0.33) does not support Jython prior to 2.5.2
-# * https://github.com/yyuu/pyenv/issues/15
+# * https://github.com/pyenv/pyenv/issues/15
 # * https://bitbucket.org/tarek/distribute/issue/367/importing-setuptoolssandbox-fails-on
 install_package "distribute-0.6.32" "https://pypi.python.org/packages/source/d/distribute/distribute-0.6.32.tar.gz#8970cd1e148b5d1fea9430584aea66c45ea22d80e0933393ec49ebc388f718df" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
-# * https://github.com/yyuu/pyenv/issues/15
+# * https://github.com/pyenv/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python

plugins/python-build/share/python-build/jython-2.5.1

@@ -1,9 +1,9 @@
 require_java
 install_jar "jython-2.5.1" "https://downloads.sourceforge.net/project/jython/jython/2.5.1/jython_installer-2.5.1.jar#229dfd1ed9728aa7e00c71f111d08fa777a4edcd03383779c74216765098f9c5" jython
 # distribute (>= 0.33) does not support Jython prior to 2.5.2
-# * https://github.com/yyuu/pyenv/issues/15
+# * https://github.com/pyenv/pyenv/issues/15
 # * https://bitbucket.org/tarek/distribute/issue/367/importing-setuptoolssandbox-fails-on
 install_package "distribute-0.6.32" "https://pypi.python.org/packages/source/d/distribute/distribute-0.6.32.tar.gz#8970cd1e148b5d1fea9430584aea66c45ea22d80e0933393ec49ebc388f718df" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
-# * https://github.com/yyuu/pyenv/issues/15
+# * https://github.com/pyenv/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python

plugins/python-build/share/python-build/jython-2.5.2

@@ -2,5 +2,5 @@ require_java
 install_jar "jython-2.5.2" "https://downloads.sourceforge.net/project/jython/jython/2.5.2/jython_installer-2.5.2.jar#1b7168b961e31ddd89012a36cde611c340dadfd8b60b81c4248b026730ee2f29" jython
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
-# * https://github.com/yyuu/pyenv/issues/15
+# * https://github.com/pyenv/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python

plugins/python-build/share/python-build/jython-2.5.3

@@ -2,5 +2,5 @@ require_java
 install_jar "jython-2.5.3" "https://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.5.3/jython-installer-2.5.3.jar#05405966cdfa57abc8e705dd6aab92b8240097ce709fb916c8a0dbcaa491f99e" jython
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
-# * https://github.com/yyuu/pyenv/issues/15
+# * https://github.com/pyenv/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python

plugins/python-build/share/python-build/jython-2.5.4-rc1

@@ -2,5 +2,5 @@ require_java
 install_jar "jython-2.5.4-rc1" "https://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.5.4-rc1/jython-installer-2.5.4-rc1.jar#2fa6821ef506804ca77f87631a21878c11d743f8a7fa9ed26e55dfd7696204d1" jython
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
-# * https://github.com/yyuu/pyenv/issues/15
+# * https://github.com/pyenv/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python

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

@@ -2,5 +2,5 @@ require_java
 unrequire_python27
 install_hg "jython-dev" "https://hg.python.org/jython" "default" jython_builder ez_setup
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
-# * https://github.com/yyuu/pyenv/issues/15
+# * https://github.com/pyenv/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python

plugins/python-build/share/python-build/micropython-dev

@@ -0,0 +1,2 @@
+#require_gcc
+install_git micropython-dev https://github.com/micropython/micropython master micropython

plugins/python-build/share/python-build/miniconda3-4.2.12

@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Miniconda3-4.2.12-Linux-x86" "https://repo.continuum.io/miniconda/Miniconda3-4.2.12-Linux-x86.sh#64dae61d366ada1d5c6baf345a466c95b68eb6df574ee454fc234a7a99943702" "miniconda" verify_py35
+  ;;
+"Linux-x86_64" )
+  install_script "Miniconda3-4.2.12-Linux-x86_64" "https://repo.continuum.io/miniconda/Miniconda3-4.2.12-Linux-x86_64.sh#c59b3dd3cad550ac7596e0d599b91e75d88826db132e4146030ef471bb434e9a" "miniconda" verify_py35
+  ;;
+"MacOSX-x86_64" )
+  install_script "Miniconda3-4.2.12-MacOSX-x86_64" "https://repo.continuum.io/miniconda/Miniconda3-4.2.12-MacOSX-x86_64.sh#da15fd52352dcefc944a32cd54c8ec3cfc68cfbbadcb86dbea72fe681c7a7a70" "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

plugins/python-build/share/python-build/miniconda3-4.3.11

@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Miniconda3-4.3.11-Linux-x86" "https://repo.continuum.io/miniconda/Miniconda3-4.3.11-Linux-x86.sh#ebda072999dd24bbede7cf3d99fb781187aa9148f71826edadbac0a55ce278cb" "miniconda" verify_py35
+  ;;
+"Linux-x86_64" )
+  install_script "Miniconda3-4.3.11-Linux-x86_64" "https://repo.continuum.io/miniconda/Miniconda3-4.3.11-Linux-x86_64.sh#b9fe70ce7b6fa8df05abfb56995959b897d0365299f5046063bc236843474fb8" "miniconda" verify_py35
+  ;;
+"MacOSX-x86_64" )
+  install_script "Miniconda3-4.3.11-MacOSX-x86_64" "https://repo.continuum.io/miniconda/Miniconda3-4.3.11-MacOSX-x86_64.sh#81f127e36249064d0f87b5d5dfa4d6094c6d5998f36a7bc80cb5028b4e32b7a2" "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

plugins/python-build/share/python-build/pypy-5.7.1

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

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

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

plugins/python-build/share/python-build/pypy2-5.7.1

@@ -0,0 +1,42 @@
+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.7.1-linux32" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux32.tar.bz2#f125a227f8c814ba1698168a639ea6ca59bb69c280529639eed29076d8429a73" "pypy" verify_py27 ensurepip
+  fi
+  ;;
+"linux-armel" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy2-v5.7.1-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux-armel.tar.bz2#591a4a73cc945a1125848f3615a28559692db8febf677d7087eaef40cb119a8d" "pypy" verify_py27 ensurepip
+  ;;
+"linux-armhf" )
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
+    install_package "pypy2-v5.7.1-linux-armhf-raspbian" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux-armhf-raspbian.tar.bz2#67544f8c4b284db71cf1af74edef290722f97f82476cbdaff2015fdab244c6ee" "pypy" verify_py27 ensurepip
+  else
+    require_distro "Ubuntu 13.04" || true
+    install_package "pypy2-v5.7.1-linux-armhf-raring" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux-armhf-raring.tar.bz2#c1b1a0968b22c58672f7492dc7900bc85e3bd02c791f219f31401a00ef387207" "pypy" verify_py27 ensurepip
+  fi
+  ;;
+"linux64" )
+  if require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" 1>/dev/null 2>&1; then
+    install_package "pypy2-v5.7.1-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux64.tar.bz2#c4fa3da42156bed4a9d912433b618a141e0c5161d7cc8c328786736ea5d1c2da" "pypy" verify_py27 ensurepip
+  else
+    install_package "pypy-5.7.1-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.7.1-linux_x86_64-portable.tar.bz2#8a6a194963eb58d582413c4bcdef6119f9f9f117a05032d1fb13192d934510c6" "pypy" verify_py27 ensurepip
+  fi
+  ;;
+"osx64" )
+  install_package "pypy2-v5.7.1-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-osx64.tar.bz2#4e99ba356432861534917a9477ace0ccee617bd631512759a530f8383e153a3d" "pypy" verify_py27 ensurepip
+  ;;
+"win32" )
+  # FIXME: never tested on Windows
+  install_zip "pypy2-v5.7.1-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-win32.zip#a3ba7c946635236836f8536d8767a0f456b3b9a86876cb5c3173a04522bf451b" "pypy" verify_py27 ensurepip
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo "try 'pypy2-5.7.0-src' to build from source."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

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

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

plugins/python-build/share/python-build/pypy2.7-5.8.0

@@ -0,0 +1,42 @@
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  if require_distro "Ubuntu 14.04" 1>/dev/null 2>&1; then
+    install_package "pypy2-v5.8.0-linux32" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-linux32.tar.bz2#a0b125a5781f7e5ddfc3baca46503b14f4ee6a0e234e8d72bfcf3afdf4120bef" "pypy" verify_py27 ensurepip
+  fi
+  ;;
+"linux-armel" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy2-v5.8.0-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-linux-armel.tar.bz2#28b7fd0cc7418ffc66c71520728e87941be40ebf4b82675c57e25598a2a702b0" "pypy" verify_py27 ensurepip
+  ;;
+"linux-armhf" )
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
+    install_package "pypy2-v5.8.0-linux-armhf-raspbian" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-linux-armhf-raspbian.tar.bz2#da58279a0e3706889fc0df06087cea08f8cfd22322139fe9bae73ef9b2d119b7" "pypy" verify_py27 ensurepip
+  else
+    require_distro "Ubuntu 13.04" || true
+    install_package "pypy2-v5.8.0-linux-armhf-raring" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-linux-armhf-raring.tar.bz2#ddceca9c5c9a456d4bf1beab177660adffbbdf255a922244e1cc05f20318be46" "pypy" verify_py27 ensurepip
+  fi
+  ;;
+"linux64" )
+  if require_distro "Ubuntu 14.04" 1>/dev/null 2>&1; then
+    install_package "pypy2-v5.8.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-linux64.tar.bz2#6274292d0e954a2609b15978cde6efa30942ba20aa5d2acbbf1c70c0a54e9b1e" "pypy" verify_py27 ensurepip
+  else
+    install_package "pypy-5.8-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.8-1-linux_x86_64-portable.tar.bz2#52556230af5769c656173ae8a1bdcb2e16aef46e3993ed89f3aec3d220aec862" "pypy" verify_py27 ensurepip
+  fi
+  ;;
+"osx64" )
+  install_package "pypy2-v5.8.0-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-osx64.tar.bz2#04b61d1cf13aaca6d0420e854c820b8bd049dc88be16c02542abe8ca26eb075c" "pypy" verify_py27 ensurepip
+  ;;
+"win32" )
+  # FIXME: never tested on Windows
+  install_zip "pypy2-v5.8.0-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-win32.zip#43d6217653e5bdc09e3ff8cb56fb52c4eb019429063d80107be4e88eef79ea8d" "pypy" verify_py27 ensurepip
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo "try 'pypy2.7-5.8.0-src' to build from source."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

plugins/python-build/share/python-build/pypy2.7-5.8.0-src

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

plugins/python-build/share/python-build/pypy2.7-portable-5.8.0

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

plugins/python-build/share/python-build/pypy3.5-5.7.1-beta

@@ -0,0 +1,18 @@
+case "$(pypy_architecture 2>/dev/null || true)" in
+"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.7.1-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.1-linux64.tar.bz2#2abaa54d88c9b70b64c37083e7e430a1d3a8f78f8de92e484a988b7aca1e50a7" "pypy" verify_py35 ensurepip
+  else
+    install_package "pypy3.5-5.7.1-beta-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3.5-5.7.1-beta-linux_x86_64-portable.tar.bz2#3d1b02f6ef50d4e9069885e0b3f19f26491c7f4f9c5ccc8aa118e38fd6a23997" "pypy" verify_py35 ensurepip
+  fi
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo "try 'pypy3.5-5.7-beta-src' to build from source."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

plugins/python-build/share/python-build/pypy3.5-5.7.1-beta-src

@@ -0,0 +1,2 @@
+require_gcc
+install_package "pypy3-v5.7.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.1-src.tar.bz2#40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0" "pypy_builder" verify_py35 ensurepip

plugins/python-build/share/python-build/pypy3.5-5.8.0

@@ -0,0 +1,18 @@
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux64" )
+  if require_distro "Ubuntu 14.04" 1>/dev/null 2>&1; then
+    install_package "pypy3-v5.8.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.8.0-linux64.tar.bz2#57d871a7f1135719c138cee4e3533c3275d682a76a40ff668e95150c65923035" "pypy" verify_py35 ensurepip
+  else
+    install_package "pypy3.5-5.8-beta-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3.5-5.8-1-beta-linux_x86_64-portable.tar.bz2#cab20a6d315a1bb05aa953ebc37d8deaa34dcbe298cb5938e373c42c05542b99" "pypy" verify_py35 ensurepip
+  fi
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo "try 'pypy3.5-5.8.0-src' to build from source."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

plugins/python-build/share/python-build/pypy3.5-5.8.0-src

@@ -0,0 +1,2 @@
+require_gcc
+install_package "pypy3-v5.8.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.8.0-src.tar.bz2#9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223" "pypy_builder" verify_py35 ensurepip

plugins/python-build/share/python-build/pypy3.5-portable-5.8.0

@@ -0,0 +1,13 @@
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux64" )
+  install_package "pypy3.5-5.8-beta-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3.5-5.8-1-beta-linux_x86_64-portable.tar.bz2#cab20a6d315a1bb05aa953ebc37d8deaa34dcbe298cb5938e373c42c05542b99" "pypy" verify_py35 ensurepip
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": Portable PyPy3 is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

pyenv.d/exec/pip-rehash/pip

@@ -21,9 +21,11 @@ STATUS=0
 
 # Run `pyenv-rehash` after a successful installation.
 if [ "$STATUS" == "0" ]; then
-  case "$1" in
-  "install" | "uninstall" ) pyenv-rehash;;
-  esac
+  for piparg in "$@"; do
+    case ${piparg} in
+    "install" | "uninstall" ) pyenv-rehash ; break;;
+    esac
+  done
 fi
 
 exit "$STATUS"

pyenv.d/rehash/conda.bash

@@ -20,7 +20,7 @@ done
 eval "conda_shim(){ case \"\$1\" in ${shims[@]} *)return 1;;esac;}"
 
 # override `make_shims` to avoid conflict between pyenv-virtualenv's `envs.bash`
-# https://github.com/yyuu/pyenv-virtualenv/blob/v20160716/etc/pyenv.d/rehash/envs.bash
+# https://github.com/pyenv/pyenv-virtualenv/blob/v20160716/etc/pyenv.d/rehash/envs.bash
 make_shims() {
   local file shim
   for file do

src/configure

@@ -21,6 +21,9 @@ case "$(uname -s)" in
 Darwin* )
   host_os="darwin$(uname -r)"
   ;;
+FreeBSD* )
+  host_os="freebsd$(uname -r)"
+  ;;
 OpenBSD* )
   host_os="openbsd$(uname -r)"
   ;;

test/--version.bats

@@ -19,7 +19,7 @@ git_commit() {
   assert [ ! -e "$PYENV_ROOT" ]
   run pyenv---version
   assert_success
-  [[ $output == "pyenv "?.?.? ]]
+  [[ $output == "pyenv "?.?.* ]]
 }
 
 @test "doesn't read version from non-pyenv repo" {
@@ -30,7 +30,7 @@ git_commit() {
 
   run pyenv---version
   assert_success
-  [[ $output == "pyenv "?.?.? ]]
+  [[ $output == "pyenv "?.?.* ]]
 }
 
 @test "reads version from git repo" {
@@ -51,5 +51,5 @@ git_commit() {
   git_commit
 
   run pyenv---version
-  [[ $output == "pyenv "?.?.? ]]
+  [[ $output == "pyenv "?.?.* ]]
 }

test/init.bats

@@ -47,7 +47,7 @@ OUT
   root="$(cd $BATS_TEST_DIRNAME/.. && pwd)"
   run pyenv-init - fish
   assert_success
-  assert_line ". '${root}/test/../libexec/../completions/pyenv.fish'"
+  assert_line "source '${root}/test/../libexec/../completions/pyenv.fish'"
 }
 
 @test "fish instructions" {
@@ -73,7 +73,7 @@ OUT
   export PATH="${BATS_TEST_DIRNAME}/../libexec:/usr/bin:/bin:/usr/local/bin"
   run pyenv-init - fish
   assert_success
-  assert_line 0 "setenv PATH '${PYENV_ROOT}/shims' \$PATH"
+  assert_line 0 "set -gx PATH '${PYENV_ROOT}/shims' \$PATH"
 }
 
 @test "can add shims to PATH more than once" {
@@ -87,7 +87,7 @@ OUT
   export PATH="${PYENV_ROOT}/shims:$PATH"
   run pyenv-init - fish
   assert_success
-  assert_line 0 "setenv PATH '${PYENV_ROOT}/shims' \$PATH"
+  assert_line 0 "set -gx PATH '${PYENV_ROOT}/shims' \$PATH"
 }
 
 @test "outputs sh-compatible syntax" {

test/shell.bats

@@ -20,14 +20,34 @@ load test_helper
   assert_success 'echo "$PYENV_VERSION"'
 }
 
+@test "shell revert" {
+  PYENV_SHELL=bash run pyenv-sh-shell -
+  assert_success
+  assert_line 0 'if [ -n "${PYENV_VERSION_OLD+x}" ]; then'
+}
+
+@test "shell revert (fish)" {
+  PYENV_SHELL=fish run pyenv-sh-shell -
+  assert_success
+  assert_line 0 'if set -q PYENV_VERSION_OLD'
+}
+
 @test "shell unset" {
   PYENV_SHELL=bash run pyenv-sh-shell --unset
-  assert_success "unset PYENV_VERSION"
+  assert_success
+  assert_output <<OUT
+PYENV_VERSION_OLD="\$PYENV_VERSION"
+unset PYENV_VERSION
+OUT
 }
 
 @test "shell unset (fish)" {
   PYENV_SHELL=fish run pyenv-sh-shell --unset
-  assert_success "set -e PYENV_VERSION"
+  assert_success
+  assert_output <<OUT
+set -gu PYENV_VERSION_OLD "\$PYENV_VERSION"
+set -e PYENV_VERSION
+OUT
 }
 
 @test "shell change invalid version" {
@@ -42,11 +62,19 @@ SH
 @test "shell change version" {
   mkdir -p "${PYENV_ROOT}/versions/1.2.3"
   PYENV_SHELL=bash run pyenv-sh-shell 1.2.3
-  assert_success 'export PYENV_VERSION="1.2.3"'
+  assert_success
+  assert_output <<OUT
+PYENV_VERSION_OLD="\$PYENV_VERSION"
+export PYENV_VERSION="1.2.3"
+OUT
 }
 
 @test "shell change version (fish)" {
   mkdir -p "${PYENV_ROOT}/versions/1.2.3"
   PYENV_SHELL=fish run pyenv-sh-shell 1.2.3
-  assert_success 'setenv PYENV_VERSION "1.2.3"'
+  assert_success
+  assert_output <<OUT
+set -gu PYENV_VERSION_OLD "\$PYENV_VERSION"
+set -gx PYENV_VERSION "1.2.3"
+OUT
 }