v1.1.1

Merge pull request #230 from pyenv/gen-pydoc-executable
Generate `pydoc` executable after creating new virtualenv
2025-11-08 11:33:55 -05:00 · 2017-08-24 00:30:36 +00:00 · 2017-08-23 20:17:57 +09:00 · 2017-08-23 11:14:42 +00:00 · 2017-08-22 23:04:39 +00:00 · 2017-08-22 23:00:41 +00:00
13 changed files with 100 additions and 60 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 ## Version History

+#### 1.1.1
+
+* Set `CONDA_PREFIX` to make is useable in conda activate/deactivate scripts (#224)
+* Generate `pydoc` executable after creating new virtualenv (#197, #230)
+
+#### 1.1.0
+
+* fish: use "set -gx" instead of "setenv" (#215, #216, #217, #218)
+
 #### 1.0.0

 * Use similar versioning scheme as pyenv; YYYYMMDD -> X.Y.Z
--- a/README.md
+++ b/README.md
@@ -2,14 +2,14 @@

 [![Join the chat at https://gitter.im/yyuu/pyenv-virtualenv](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/yyuu/pyenv-virtualenv?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

-[![Build Status](https://travis-ci.org/yyuu/pyenv-virtualenv.svg?branch=master)](https://travis-ci.org/yyuu/pyenv-virtualenv)
+[![Build Status](https://travis-ci.org/pyenv/pyenv-virtualenv.svg?branch=master)](https://travis-ci.org/pyenv/pyenv-virtualenv)

-pyenv-virtualenv is a [pyenv](https://github.com/yyuu/pyenv) plugin
+pyenv-virtualenv is a [pyenv](https://github.com/pyenv/pyenv) plugin
 that provides features to manage virtualenvs and conda environments
 for Python on UNIX-like systems.

 (NOTICE: If you are an existing user of [virtualenvwrapper](http://pypi.python.org/pypi/virtualenvwrapper)
-and you love it, [pyenv-virtualenvwrapper](https://github.com/yyuu/pyenv-virtualenvwrapper) may help you
+and you love it, [pyenv-virtualenvwrapper](https://github.com/pyenv/pyenv-virtualenvwrapper) may help you
 (additionally) to manage your virtualenvs.)

 ## Installation
@@ -17,7 +17,7 @@ and you love it, [pyenv-virtualenvwrapper](https://github.com/yyuu/pyenv-virtual
 ### Installing as a pyenv plugin

 This will install the latest development version of pyenv-virtualenv into
-the `~/.pyenv/plugins/pyenv-virtualenv` directory.
+the `$(pyenv root)/plugins/pyenv-virtualenv` directory.

 **Important note:**  If you installed pyenv into a non-standard directory, make
 sure that you clone this repo into the 'plugins' directory of wherever you
@@ -31,7 +31,7 @@ From inside that directory you can:
 1. **Check out pyenv-virtualenv into plugin directory**

    ```sh
-    $ git clone https://github.com/yyuu/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
+    $ git clone https://github.com/pyenv/pyenv-virtualenv.git $(pyenv root)/plugins/pyenv-virtualenv
    ```

 2. (OPTIONAL) **Add `pyenv virtualenv-init` to your shell** to enable auto-activation of virtualenvs. This is entirely optional but pretty useful. See "Activate virtualenv" below.
@@ -90,7 +90,7 @@ of the virtualenv directory. For example,
 $ pyenv virtualenv 2.7.10 my-virtual-env-2.7.10
 ```

-will create a virtualenv based on Python 2.7.10 under `~/.pyenv/versions` in a
+will create a virtualenv based on Python 2.7.10 under `$(pyenv root)/versions` in a
 folder called `my-virtual-env-2.7.10`.


@@ -129,7 +129,7 @@ There are two entries for each virtualenv, and the shorter one is just a symlink
 Some external tools (e.g. [jedi](https://github.com/davidhalter/jedi)) might
 require you to `activate` the virtualenv and `conda` environments.

-If `eval "$(pyenv virtualenv-init -)"` is configured in your shell, `pyenv-virtualenv` will automatically activate/deactivate virtualenvs on entering/leaving directories which contain a `.python-version` file that lists a valid virtual environment. `.python-version` files denote local Python versions and can be created and deleted with the [`pyenv local`](https://github.com/yyuu/pyenv/blob/master/COMMANDS.md#pyenv-local) command.
+If `eval "$(pyenv virtualenv-init -)"` is configured in your shell, `pyenv-virtualenv` will automatically activate/deactivate virtualenvs on entering/leaving directories which contain a `.python-version` file that contains the name of a valid virtual environment as shown in the output of `pyenv virtualenvs` (e.g., `venv34` or `3.4.3/envs/venv34` in example above) . `.python-version` files are used by pyenv to denote local Python versions and can be created and deleted with the [`pyenv local`](https://github.com/pyenv/pyenv/blob/master/COMMANDS.md#pyenv-local) command.

 You can also activate and deactivate a pyenv virtualenv manually:

@@ -141,7 +141,7 @@ pyenv deactivate

 ### Delete existing virtualenv

-Removing the directories in `~/.pyenv/versions` and `~/.pyenv/versions/{version}/envs` will delete the virtualenv, or you can run:
+Removing the directories in `$(pyenv root)/versions` and `$(pyenv root)/versions/{version}/envs` will delete the virtualenv, or you can run:

 ```sh
 pyenv uninstall my-virtual-env
--- a/bin/pyenv-sh-activate
+++ b/bin/pyenv-sh-activate
@@ -146,8 +146,8 @@ if [ -z "$no_shell" ]; then
  case "$shell" in
  fish )
    cat <<EOS
-setenv PYENV_VERSION "${versions[*]}";
-setenv PYENV_ACTIVATE_SHELL 1;
+set -gx PYENV_VERSION "${versions[*]}";
+set -gx PYENV_ACTIVATE_SHELL 1;
 EOS
    ;;
  * )
@@ -164,8 +164,8 @@ fi
 case "${shell}" in
 fish )
  cat <<EOS
-setenv PYENV_VIRTUAL_ENV "${prefix}";
-setenv VIRTUAL_ENV "${prefix}";
+set -gx PYENV_VIRTUAL_ENV "${prefix}";
+set -gx VIRTUAL_ENV "${prefix}";
 EOS
  ;;
 * )
@@ -185,7 +185,7 @@ if [ -x "${prefix}/bin/conda" ]; then
  fi
  case "${shell}" in
  fish )
-    echo "setenv CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";"
+    echo "set -gx CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";"
    ;;
  * )
    echo "export CONDA_DEFAULT_ENV=\"${CONDA_DEFAULT_ENV}\";"
@@ -197,7 +197,7 @@ if [ -n "${PYTHONHOME}" ]; then
  case "${shell}" in
  fish )
    cat <<EOS
-setenv _OLD_VIRTUAL_PYTHONHOME "${PYTHONHOME}";
+set -gx _OLD_VIRTUAL_PYTHONHOME "${PYTHONHOME}";
 set -e PYTHONHOME;
 EOS
    ;;
@@ -240,6 +240,8 @@ if [ -x "${prefix}/bin/conda" ]; then
    : # conda doesn't support fish
    ;;
  * )
+    CONDA_PREFIX="$prefix"
+    echo "export CONDA_PREFIX=\"${CONDA_PREFIX}\";"
    for script in "${prefix}/etc/conda/activate.d"/*.sh; do
      echo ". \"${script}\";"
    done
--- a/bin/pyenv-sh-deactivate
+++ b/bin/pyenv-sh-deactivate
@@ -69,6 +69,7 @@ if [ -x "${prefix}/bin/conda" ]; then
    for script in "${prefix}/etc/conda/deactivate.d"/*.sh; do
      echo ". \"${script}\";"
    done
+    echo "unset CONDA_PREFIX"
    ;;
  esac
  shopt -u nullglob
@@ -125,7 +126,7 @@ case "${shell}" in
 fish )
  cat <<EOS
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
  set -e _OLD_VIRTUAL_PATH;
 end;
 EOS
@@ -144,7 +145,7 @@ case "${shell}" in
 fish )
  cat <<EOS
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
  set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 EOS
--- a/bin/pyenv-virtualenv
+++ b/bin/pyenv-virtualenv
@@ -9,7 +9,7 @@
 #   -f/--force       Install even if the version appears to be installed already
 #

-PYENV_VIRTUALENV_VERSION="1.0.0"
+PYENV_VIRTUALENV_VERSION="1.1.1"

 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -375,7 +375,7 @@ if [ -n "$UPGRADE" ]; then
  fi
 fi

-if [ -z "${VIRTUALEN_VERSION}" ]; then
+if [ -z "${VIRTUALENV_VERSION}" ]; then
  case "${PYENV_VERSION}" in
  "3.0"* )
    NO_ENSUREPIP=1
@@ -533,6 +533,17 @@ if [ -d "${VIRTUALENV_PATH}" ] && [ -n "${COMPAT_VIRTUALENV_PATH}" ]; then
  ln -fs "${VIRTUALENV_PATH}" "${COMPAT_VIRTUALENV_PATH}"
 fi

+if [ ! -e "${VIRTUALENV_PATH}/bin/pydoc" ]; then
+  mkdir -p "${VIRTUALENV_PATH}/bin"
+  cat <<EOS > "${VIRTUALENV_PATH}/bin/pydoc"
+#!${VIRTUALENV_PATH}/bin/python
+import pydoc
+if __name__ == '__main__':
+      pydoc.cli()
+EOS
+  chmod +x "${VIRTUALENV_PATH}/bin/pydoc"
+fi
+
 if [ -z "${NO_ENSUREPIP}" ]; then
  ## Install setuptools and pip.
  PYENV_VERSION="${VIRTUALENV_NAME}" build_package_ensurepip
--- a/bin/pyenv-virtualenv-init
+++ b/bin/pyenv-virtualenv-init
@@ -86,8 +86,8 @@ fi
 case "$shell" in
 fish )
  cat <<EOS
-setenv PATH '${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims' \$PATH;
-setenv PYENV_VIRTUALENV_INIT 1;
+set -gx PATH '${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims' \$PATH;
+set -gx PYENV_VIRTUALENV_INIT 1;
 EOS
  ;;
 * )
--- a/test/activate.bats
+++ b/test/activate.bats
@@ -138,8 +138,8 @@ EOS
  assert_success
  assert_output <<EOS
 deactivated
-setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
-setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
 pyenv-virtualenv: prompt changing not working for fish.
 EOS

@@ -162,10 +162,10 @@ EOS
  assert_success
  assert_output <<EOS
 deactivated
-setenv PYENV_VERSION "venv";
-setenv PYENV_ACTIVATE_SHELL 1;
-setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
-setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+set -gx PYENV_VERSION "venv";
+set -gx PYENV_ACTIVATE_SHELL 1;
+set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
 pyenv-virtualenv: prompt changing not working for fish.
 EOS

@@ -239,10 +239,10 @@ EOS
  assert_success
  assert_output <<EOS
 deactivated
-setenv PYENV_VERSION "venv27";
-setenv PYENV_ACTIVATE_SHELL 1;
-setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
-setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+set -gx PYENV_VERSION "venv27";
+set -gx PYENV_ACTIVATE_SHELL 1;
+set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
 pyenv-virtualenv: prompt changing not working for fish.
 EOS

@@ -263,10 +263,10 @@ EOS
  assert_success
  assert_output <<EOS
 deactivated
-setenv PYENV_VERSION "venv27";
-setenv PYENV_ACTIVATE_SHELL 1;
-setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
-setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+set -gx PYENV_VERSION "venv27";
+set -gx PYENV_ACTIVATE_SHELL 1;
+set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
 pyenv-virtualenv: prompt changing not working for fish.
 EOS

@@ -381,7 +381,7 @@ EOS
  stub pyenv-virtualenv-prefix "2.7.10 : false"
  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""

-  run pyenv-sh-activate "venv27" "2.7.10"
+  PYENV_SHELL="bash" run pyenv-sh-activate "venv27" "2.7.10"

  assert_success
  assert_output <<EOS
--- a/test/conda-activate.bats
+++ b/test/conda-activate.bats
@@ -39,6 +39,7 @@ export CONDA_DEFAULT_ENV="root";
 pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
 export _OLD_VIRTUAL_PS1="\${PS1}";
 export PS1="(anaconda-2.3.0) \${PS1}";
+export CONDA_PREFIX="${TMP}/pyenv/versions/anaconda-2.3.0";
 EOS

  unstub pyenv-version-name
@@ -62,9 +63,9 @@ EOS
  assert_success
  assert_output <<EOS
 deactivated
-setenv PYENV_VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
-setenv VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
-setenv CONDA_DEFAULT_ENV "root";
+set -gx PYENV_VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
+set -gx VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
+set -gx CONDA_DEFAULT_ENV "root";
 pyenv-virtualenv: prompt changing not working for fish.
 EOS

@@ -97,6 +98,7 @@ export CONDA_DEFAULT_ENV="root";
 pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
 export _OLD_VIRTUAL_PS1="\${PS1}";
 export PS1="(miniconda-3.9.1) \${PS1}";
+export CONDA_PREFIX="${TMP}/pyenv/versions/miniconda-3.9.1";
 EOS

  unstub pyenv-virtualenv-prefix
@@ -126,6 +128,7 @@ export CONDA_DEFAULT_ENV="foo";
 pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
 export _OLD_VIRTUAL_PS1="\${PS1}";
 export PS1="(anaconda-2.3.0/envs/foo) \${PS1}";
+export CONDA_PREFIX="${TMP}/pyenv/versions/anaconda-2.3.0/envs/foo";
 . "${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo/etc/conda/activate.d/activate.sh";
 EOS

@@ -158,6 +161,7 @@ export CONDA_DEFAULT_ENV="bar";
 pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
 export _OLD_VIRTUAL_PS1="\${PS1}";
 export PS1="(miniconda-3.9.1/envs/bar) \${PS1}";
+export CONDA_PREFIX="${TMP}/pyenv/versions/miniconda-3.9.1/envs/bar";
 . "${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar/etc/conda/activate.d/activate.sh";
 EOS

--- a/test/conda-deactivate.bats
+++ b/test/conda-deactivate.bats
@@ -30,6 +30,7 @@ setup() {

  assert_success
  assert_output <<EOS
+unset CONDA_PREFIX
 unset PYENV_VIRTUAL_ENV;
 unset VIRTUAL_ENV;
 unset CONDA_DEFAULT_ENV;
@@ -69,11 +70,11 @@ set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 set -e CONDA_DEFAULT_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
  set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
  set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
@@ -97,6 +98,7 @@ EOS
  assert_success
  assert_output <<EOS
 . "${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo/etc/conda/deactivate.d/deactivate.sh";
+unset CONDA_PREFIX
 unset PYENV_VIRTUAL_ENV;
 unset VIRTUAL_ENV;
 unset CONDA_DEFAULT_ENV;
--- a/test/deactivate.bats
+++ b/test/deactivate.bats
@@ -247,11 +247,11 @@ EOS
 set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
  set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
  set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
@@ -273,11 +273,11 @@ EOS
 set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
  set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
  set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
@@ -301,11 +301,11 @@ set -e PYENV_ACTIVATE_SHELL;
 set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
  set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
  set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
@@ -329,11 +329,11 @@ set -e PYENV_ACTIVATE_SHELL;
 set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
  set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
  set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
@@ -355,11 +355,11 @@ EOS
 set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
  set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
  set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
--- a/test/init.bats
+++ b/test/init.bats
@@ -72,8 +72,8 @@ EOS
  run pyenv-virtualenv-init - fish
  assert_success
  assert_output <<EOS
-setenv PATH '${TMP}/pyenv/plugins/pyenv-virtualenv/shims' \$PATH;
-setenv PYENV_VIRTUALENV_INIT 1;
+set -gx PATH '${TMP}/pyenv/plugins/pyenv-virtualenv/shims' \$PATH;
+set -gx PYENV_VIRTUALENV_INIT 1;
 function _pyenv_virtualenv_hook --on-event fish_prompt;
  set -l ret \$status
  if [ -n "\$VIRTUAL_ENV" ]
--- a/test/pyvenv.bats
+++ b/test/pyvenv.bats
@@ -32,11 +32,12 @@ unstub_pyenv() {

  run pyenv-virtualenv venv

-  assert_success
  assert_output <<OUT
 PYENV_VERSION=3.5.1 python -m venv ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pydoc" ]
+  assert_success

  unstub_pyenv
  unstub pyenv-virtualenv-prefix
@@ -57,11 +58,12 @@ OUT

  run pyenv-virtualenv venv

-  assert_success
  assert_output <<OUT
 PYENV_VERSION=3.5.1 virtualenv ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pydoc" ]
+  assert_success

  unstub_pyenv
  unstub pyenv-virtualenv-prefix
@@ -69,7 +71,7 @@ OUT
  teardown_m_venv "3.5.1"
 }

-@test "install virtualenv if venv is not avaialble" {
+@test "install virtualenv if venv is not available" {
  export PYENV_VERSION="3.2.1"
  setup_version "3.2.1"
  stub_pyenv "${PYENV_VERSION}"
@@ -81,12 +83,13 @@ OUT

  run pyenv-virtualenv venv

-  assert_success
  assert_output <<OUT
 PYENV_VERSION=3.2.1 pip install virtualenv==13.1.2
 PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/3.2.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.2.1/envs/venv/bin/pydoc" ]
+  assert_success

  unstub_pyenv
  unstub pyenv-virtualenv-prefix
@@ -112,6 +115,7 @@ PYENV_VERSION=3.5.1 pip install virtualenv
 PYENV_VERSION=3.5.1 virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pydoc" ]
  assert_success

  unstub_pyenv
@@ -138,6 +142,7 @@ PYENV_VERSION=3.5.1 pip install virtualenv
 PYENV_VERSION=3.5.1 virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pydoc" ]
  assert_success

  unstub_pyenv
@@ -158,12 +163,13 @@ OUT

  PIP_REQUIRE_VENV="true" run pyenv-virtualenv venv

-  assert_success
  assert_output <<OUT
 PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 pip install virtualenv==13.1.2
 PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/3.2.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.2.1/envs/venv/bin/pydoc" ]
+  assert_success

  unstub_pyenv
  unstub pyenv-virtualenv-prefix
--- a/test/virtualenv.bats
+++ b/test/virtualenv.bats
@@ -34,12 +34,13 @@ unstub_pyenv() {

  run pyenv-virtualenv "2.7.11" "venv"

-  assert_success
  assert_output <<OUT
 PYENV_VERSION=2.7.11 virtualenv ${PYENV_ROOT}/versions/2.7.11/envs/venv
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]
+  assert_success

  unstub_pyenv
  unstub pyenv-virtualenv-prefix
@@ -60,12 +61,13 @@ OUT

  run pyenv-virtualenv venv

-  assert_success
  assert_output <<OUT
 PYENV_VERSION=2.7.11 virtualenv ${PYENV_ROOT}/versions/2.7.11/envs/venv
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]
+  assert_success

  unstub_pyenv
  unstub pyenv-version-name
@@ -92,6 +94,7 @@ PYENV_VERSION=2.7.11 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/v
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]
  assert_success

  unstub_pyenv
@@ -119,6 +122,7 @@ PYENV_VERSION=2.7.11 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/v
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]
  assert_success

  unstub_pyenv
@@ -176,12 +180,13 @@ OUT

  run pyenv-virtualenv "2.7.11" "2.7.11/envs/foo"

-  assert_success
  assert_output <<OUT
 PYENV_VERSION=2.7.11 virtualenv ${PYENV_ROOT}/versions/2.7.11/envs/foo
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/foo/bin/pydoc" ]
+  assert_success

  unstub_pyenv
  unstub pyenv-virtualenv-prefix
Author	SHA1	Message	Date
Yamashita, Yuu	4c8da67f02	v1.1.1	2017-08-24 00:30:36 +00:00
Yamashita, Yuu	c2ba4952ff	Merge pull request #230 from pyenv/gen-pydoc-executable Generate `pydoc` executable after creating new virtualenv	2017-08-23 20:17:57 +09:00
Yamashita, Yuu	927914b25f	Make sure pydoc executable exists after creating virtualenv	2017-08-23 11:14:42 +00:00
Yamashita, Yuu	e339fde2f3	Create virtualenv's bin directory explicitly to avoid CI failures	2017-08-22 23:04:39 +00:00
Yamashita, Yuu	e83a1f12c2	Generate `pydoc` executable after creating new virtualenv (fixes #197 , pyenv/pyenv#963 )	2017-08-22 23:00:41 +00:00
Yamashita, Yuu	2727087757	Merge pull request #224 from cpaulik/support-conda-prefix Set CONDA_PREFIX to make is useable in conda activate/deactivate scripts	2017-07-21 10:01:08 +09:00
Christoph Paulik	f64c8ed0dd	Set CONDA_PREFIX to make is useable in conda activate/deactivate scripts.	2017-07-20 15:53:55 +02:00
Yamashita, Yuu	e4d2c367cc	v1.1.0	2017-07-03 00:39:50 +00:00
Yamashita, Yuu	c67762742a	Merge pull request #220 from jcrben/patch-1 Be more explicit about `.python-version` file	2017-06-21 16:43:44 +09:00
Ben Creasy	1593b0e6b0	Be more explicit about `.python-version` file When I came back to this after a few months - despite setting it up properly previously - I was a bit confused since I'm so used to setting an actual Python version in `.python-version` files. Explain exactly how the file should look.	2017-06-20 23:44:53 -07:00
Drummond Ogilvie	862be21a32	fish: use "set -gx" instead of "setenv" (#218 ) Use `set -gx` instead of `setenv` for fish shell. Fix test "activate if the first virtualenv is a virtualenv": it was asserting the output was of bash form, but not specifying that in the test — it now does. Fixes https://github.com/pyenv/pyenv-virtualenv/issues/216.	2017-06-08 21:52:57 +02:00
Yamashita, Yuu	252d6763f9	Update build status link target	2017-03-06 04:43:41 +00:00
Yamashita, Yuu	832244fe13	Update project URL to https://github.com/pyenv/pyenv-virtualenv	2017-03-06 04:16:48 +00:00
Yamashita, Yuu	61a5c7f807	Merge pull request #201 from yamotonalds/fix-typo Fix typo	2017-02-18 09:21:12 -08:00
yamotonalds	304dff741f	Fix typo	2017-02-18 22:06:05 +09:00
Yamashita, Yuu	53dd8bcf46	Merge pull request #198 from massongit/develop Fix the installation command of README.md	2017-01-31 12:51:01 +09:00
massongit	f9b1814b82	Fix the installation command of README.md	2017-01-31 12:38:21 +09:00