Commit graph

269 commits

Author SHA1 Message Date
Yamashita, Yuu 9414a6bb30 Stop showing version not installed in precmd (#49) 2015-12-18 02:32:01 +00:00
Yamashita, Yuu 2d73d058bd Fix wrong library path for virtualenv on PyPy/Jython (fixes #134) 2015-12-15 00:24:02 +00:00
Yamashita, Yuu 1e88df88a9 Rewrite virtualenv-prefix without executing python (#132) 2015-12-10 03:53:16 +00:00
Yamashita, Yuu 17d22e7a13 Add PYENV_VIRTUAL_ENV to check if the virtualenv has been activated via pyenv-virtualenv or not (#128) 2015-12-05 01:44:10 +00:00
Yamashita, Yuu 3fc832f4c7 Create virtualenv inside real_prefix 2015-12-04 00:43:10 +00:00
Yamashita, Yuu aae3bf2786 Add workaround for rywyo/anyenv 2015-12-04 00:43:03 +00:00
Yamashita, Yuu 035f5185b5 Skip ensurepip if --no-setuptools, --no-pip or --without-pip is given (fixes #127) 2015-12-04 00:07:01 +00:00
Yamashita, Yuu e230817496 Restored --no-error for compatibility with v20151103 and earlier 2015-12-02 23:59:41 +00:00
Yamashita, Yuu 6e91d75069 Stop showing message about pyenv virtualenv-init on activate (#122)
`pyenv virtualenv-init` is just an option. Always showing message about
it would be too much to do.
2015-12-02 23:49:07 +00:00
Yamashita, Yuu 6a2b77ed5b Fix tests 2015-11-27 12:36:59 +00:00
Yamashita, Yuu 789c349570 Allow specifying python version for conda via -p or --python 2015-11-27 04:41:00 +00:00
Yamashita, Yuu bad8dcf768 Use conda create to create virtualenv if the source version is a Anaconda/Miniconda 2015-11-27 04:32:34 +00:00
Yamashita, Yuu 116e133c90 Activate a virtualenv of current version if specified version is not a virtualenv
```sh
% pyenv versions
  system
* miniconda3-3.16.0 (set by PYENV_VERSION environment variable)
  miniconda3-3.16.0/envs/venv
% pyenv activate venv
pyenv-virtualenv: deactivate miniconda3-3.16.0
pyenv-virtualenv: activate miniconda3-3.16.0/envs/venv
```
2015-11-27 00:04:05 +00:00
Yamashita, Yuu 1edff311d5 exits as error if the virtual environment doesn't have python executable (#104)
conda's environment might not have `python` executable. If the prefix
doesn't contain `python` in it, `pyenv-which` might be ran into infinite
loop if some of `which` hooks invoke `pyenv-virtualenv-prefix`.
2015-11-26 10:34:32 +00:00
Yamashita, Yuu aae07d1318 Deactivation before activation should not return as non-zero (fixes #116) 2015-11-26 09:15:02 +00:00
Yamashita, Yuu aea9eda680 Merge pull request #123 from yyuu/remove-pyenv-deactivate
Remove `PYENV_DEACTIVATE`
2015-11-26 14:06:14 +09:00
Yamashita, Yuu 5e92253943 Fix broken --skip-aliases 2015-11-25 12:04:48 +00:00
Yamashita, Yuu 0bbb12a3bf Use glob to check if the virtualenv is inside pyenv's prefix or not 2015-11-24 00:04:18 +00:00
Yamashita, Yuu 4e9d697887 Suppress message about virtualenv-init if -quiet given (fixes #122) 2015-11-23 13:34:46 +00:00
Yamashita, Yuu 5f87786adf Remove PYENV_DEACTIVATE (fixes #121)
This means that pyenv-virtualenv will not allow manual deactivation of
virtualenv if pyenv-virtualenv-init is enabled. This must be acceptable
since the activation of virtualenv is just setting of environment
variables in current implementation.
2015-11-23 13:33:31 +00:00
Yamashita, Yuu f92a3a26c5 Add --skip-aliases to pyenv virtualenvs (fixes #120) 2015-11-23 12:06:22 +00:00
Yamashita, Yuu 59bc189bec Basically / should not be allowed as a part of name of virtualenv 2015-11-23 09:38:39 +00:00
Yamashita, Yuu caa5832b8a Allow manual activation of virtualenvs inside $(pyenv-root)/versions (#115) 2015-11-16 02:29:46 +00:00
Yamashita, Yuu 83bc6a49e4 Restore variables set by activate script of virtualenv properly (#150)
The `activate` script does't export the variables of `_OLD_VIRTUAL_*`,
most the deactivation code needed to be moved to `sh-deactivate`.
2015-11-12 13:45:33 +00:00
Yamashita, Yuu 47feedc934 exits as 0 if there is some virtualenv outside from pyenv is already activated (#114) 2015-11-12 13:29:25 +00:00
Yamashita, Yuu a73817eecc Use canonical name for VIRTUAL_ENV as a workaround for IPython (fixes #113) 2015-11-12 00:29:26 +00:00
Yamashita, Yuu 0b9b19232a Skip creating $(pyenv root)/versions/system/envs/ directory for virtualenv from system 2015-11-11 01:34:59 +09:00
Yamashita, Yuu bb623bd8bf Prevent removing symlinks bound to different version (#106) 2015-11-09 05:57:16 +00:00
Yamashita, Yuu ee18ffac9f Change prompt after activate (#52) 2015-11-09 01:57:17 +00:00
Yamashita, Yuu c1b9238cbe Reject creating a virtualenv named system (yyuu/pyenv#475) 2015-11-08 23:44:58 +00:00
Yamashita, Yuu 950a742be3 Add short options 2015-11-08 09:18:29 +00:00
Yamashita, Yuu bdd52a79cd Revert PYENV_DEACTIVATE for backward compatibility 2015-11-08 08:34:43 +00:00
Yamashita, Yuu f7d1aa7d94 Allow activating first version of virtualenv even if there are multiple versions in pyenv (#105) 2015-11-08 06:32:28 +00:00
Yamashita, Yuu 0fa5de07c9 fix broken tests 2015-11-06 18:26:23 +00:00
Yamashita, Yuu 017d20ad91 remove unnecessary logic from init script 2015-11-06 17:58:09 +00:00
Yamashita, Yuu 7f33ddd911 prompt should be managed by users, not by tools 2015-11-06 17:34:21 +00:00
Yamashita, Yuu 8731e9bf14 replaced --no-error by --quiet 2015-11-06 17:33:40 +00:00
Yamashita, Yuu bf7e9ba59a Show activating... messages by default 2015-11-06 17:27:50 +00:00
Yamashita, Yuu dfd1655069 add a script to hook source activate for Anaconda/Miniconda (#103) 2015-11-06 06:10:09 +00:00
Yamashita, Yuu e489163f92 Merge pull request #106 from yyuu/uninstall-rehash-envs
Support uninstall and rehash of virtual environments created in `envs`
2015-11-05 18:40:46 +09:00
Yamashita, Yuu 5c9909f4c1 Merge pull request #107 from yyuu/create-virtualenv-in-envs
Create virtualenv inside `envs` directory as similar as Anaconda
2015-11-05 18:40:25 +09:00
Yamashita, Yuu a233491f2b Remove obsolete TODO comment 2015-11-05 01:58:44 +00:00
Yamashita, Yuu c6a705b1d9 Setup CONDA_DEFAULT_ENV only if conda executable exists 2015-11-05 01:49:04 +00:00
Yamashita, Yuu 8038659299 Create virtualenv inside envs directory as similar as Anaconda 2015-11-04 14:56:01 +00:00
Yamashita, Yuu 0df362e8c8 Support deletion of virtualenv created in envs 2015-11-04 14:08:58 +00:00
Yamashita, Yuu 64ceee5c8e Stop using virtualenv's activate script (#69) 2015-11-04 13:50:17 +00:00
Yamashita, Yuu 2ae921c253 Treat all versions with activate script as a virtual environment 2015-11-04 13:07:46 +00:00
Yamashita, Yuu 72cf0e1b1b v20151103 2015-11-03 13:36:45 +00:00
Daniel Hahler f594876f31 init: zsh: prepend hook to precmd_functions
This makes sure that $VIRTUAL_ENV is handled already in other precmd
functions, especially your prompt.
2015-11-02 17:52:59 +01:00
Bartosz Janda f657fad926 Passing return value from executed command. 2015-10-15 20:37:00 +02:00
Yamashita, Yuu 6a6947659a v20151006 2015-10-06 14:06:58 +00:00
Yamashita, Yuu 249759aa04 add foolproof for -p argument.
find proper source version from pyenv if the given executable is only
basename or is a shim script.
2015-10-06 13:53:43 +00:00
Jeremy a242067435 Fix pyenv-virtualenv-init script for fish where command was in string and not being evaluated 2015-09-24 14:06:20 +02:00
Yamashita, Yuu e535faea4d Ignore user's site-packages on ensurepip/get-pip (#89)
https://www.python.org/dev/peps/pep-0370/
2015-07-20 19:05:52 +09:00
Yamashita, Yuu 90531a6a48 v20150719 2015-07-19 18:22:34 +09:00
Yamashita, Yuu b32d357353 Add tests for conda 2015-07-19 15:01:04 +09:00
Yamashita, Yuu cdbf7c9972 activate "root" environment of anaconda/miniconda if environment name is not given 2015-07-19 04:19:34 +09:00
Yamashita, Yuu 25395f0331 activate: look for a conda environment if given name is not a pyenv's prefix 2015-07-19 03:38:48 +09:00
Yamashita, Yuu be6701e7b6 Fix Error: too many arguments. on deactivating anaconda env 2015-07-19 01:04:23 +09:00
Yamashita, Yuu 65c74dbf2d activate/deactivate anaconda/miniconda envs 2015-07-19 00:08:09 +09:00
Yamashita, Yuu 6132f4228e *EXPERIMENTAL* a support for _envs_ created by anaconda/miniconda 2015-07-19 00:07:59 +09:00
Daniel Hahler 8ca45c0e0a init: fix shell detection when invoked from a script
- fixes `ps` command to lookup parent process
 - adds `assert_output_contains_not` test helper

Ref: https://github.com/yyuu/pyenv/issues/373
2015-06-26 20:47:08 +02:00
Yamashita Yuu 69fee6855d Show error message if the source version is not installed (#83) 2015-06-27 02:19:28 +09:00
Yamashita Yuu e261806f96 Skip installing setuptools explicitly with using ez_setup.py (yyuu/pyenv#381)
It will be done by `get-pip.py` and we don't have to do anything explicitly.
2015-05-27 00:06:16 +09:00
Yamashita Yuu 9a52f9fb5d v20150526
First release after my son's birth....
2015-05-27 00:01:13 +09:00
Yamashita, Yuu 0ca01826e8 Merge pull request #78 from blueyed/shell-no-note-if-init
activate: do not display note if initialized already
2015-05-17 12:23:37 +09:00
Yamashita, Yuu 4fa9c7b220 Merge pull request #75 from blueyed/fix-zsh-typeset-precmd_functions
Use `typeset -g` with `precmd_functions`
2015-05-17 12:12:12 +09:00
Daniel Hahler 2571a2b973 activate: display setup instructions only with PYENV_VIRTUALENV_INIT=0
This fixes displaying the note, in case "init" has been run manually
and/or the init is not in the expected place.

It removes the unnecessary calls to "grep".

pyenv-virtualenv-init will look at `$PYENV_SHELL` now, too.

Tests have been adjusted/fixed.
2015-05-10 17:47:46 +02:00
Daniel Hahler 95fa7a35ad shell: do not use basename, but bash 2015-05-10 17:36:03 +02:00
Yamashita, Yuu 47cd86a165 Merge pull request #74 from blueyed/help-version-is-optional
Usage: version is optional
2015-04-28 17:19:46 +09:00
Daniel Hahler 6bc0253d17 minor: fix comments 2015-04-28 10:17:02 +02:00
Daniel Hahler c184c01174 Usage: version is optional 2015-04-28 10:13:59 +02:00
Josh Hagins 5953ddaf64 Ignore failure of pyenv activate
When the current pyenv environment is not a virtualenv, this line
exits with a return code of 1. This is annoying for those of us
who report the last return code in our own PROMPT_COMMAND, so
ignore the output of `pyenv activate` if we're not currently using
a virtualenv.
2015-03-18 22:30:19 -04:00
Daniel Hahler 2ab9483116 Use typeset -g with precmd_functions
This makes it possible to use `eval "$(pyenv virtualenv-init -)"` from a
function.
2015-03-14 02:37:14 +01:00
Yamashita Yuu 32e5a73345 v20150119 2015-01-19 00:53:19 +09:00
Yamashita Yuu 0fc9441f09 Anaconda has activate script nevertheless it is not a virtual environment (#65) 2015-01-18 20:15:44 +09:00
Tony Wang e04a6f88fe fix wrong output in test in fish, refs 240a1de
"(any command)" is not supported in test in fish, we have to set a
variable and then use that
2015-01-06 11:10:43 +08:00
Tony Wang 240a1de6e5 fix warns for virtualenv-init corner case on fish
The situation is when in a directory containing python binary,
`pyenv prefix' will return empty (caused by `pyenv which' returning
"./python"). This change adds quotes for `test', otherwise `test' will
warn about missing argument.
2015-01-05 23:23:43 +08:00
Yamashita Yuu 191e806ba9 shell version set in activate should be unset in deactivate (#61) 2014-12-23 11:21:52 +09:00
Tony Wang f681df6f20 fix incorrect fish syntax in pyenv-virtualenv-init 2014-12-16 17:53:26 +08:00
Yamashita Yuu e774464ced ignore error from pyenv-version-name since it might fail if there is configuration error (yyuu/pyenv#291) 2014-12-14 14:15:18 +09:00
Yamashita Yuu ad644e83b5 v20141106 2014-11-06 09:47:54 -08:00
Yamashita Yuu 2060c43387 Stop buzzy errors from embeded shell functions 2014-10-27 10:36:10 +09:00
Yamashita Yuu a02eb0a396 Calling create_symlinks after ensurepip is unnecessary
Install script of setuptools-6.1/pip-1.5.6 will create those links if needed
2014-10-19 10:59:52 +09:00
Yamashita Yuu 1d36ef2f68 v20141012 2014-10-12 21:55:47 +09:00
Yamashita Yuu d6671249b7 Should not persist PYENV_DEACTIVATE after automatic deactivation (#47, #48) 2014-10-12 21:34:18 +09:00
Beau Barker 79bfc9d362 When changing from a virtualenv to "system", unset PYENV_DEACTIVATE. Previously the var remained set, which made it impossible to reactivate the previous virtualenv 2014-09-17 19:50:41 +10:00
Daniel Hahler 86046fd4e8 Do not allow whitespace in VIRTUALENV_NAME
While this could work in general, it fails in the end, because
whitespace is not allowed/supported in the shebang line with the
scripts in the created virtualenv.
2014-09-03 23:28:46 +02:00
Yamashita, Yuu 2cc21f112c Merge pull request #40 from s0undt3ch/master
Fix weird bash code issue which made bash complain about "then"
2014-08-14 10:03:35 +09:00
Pedro Algarvio 81736da905 Indent to 2 spaces. 2014-08-13 19:51:22 +01:00
Pedro Algarvio 3ebb00414f if [ pyenv deactivate --no-error --verbose ] is not bourne shell compatible 2014-08-13 03:40:02 +01:00
Yamashita Yuu c9bcef656c Use . instead of source to support POSIX sh 2014-08-13 10:54:18 +09:00
Pedro Algarvio 2662b5807c Fix weird bash code issue which made bash complain about "then" 2014-08-13 00:55:04 +01:00
Yamashita Yuu a3c86f013b Deactivate virtualenv even if it has been activated manually 2014-07-11 20:24:58 +09:00
Yamashita Yuu 7aa5d13633 v20140705 2014-07-05 17:26:53 +09:00
Yamashita Yuu aef2546319 Fix broken fish's if statement 2014-07-05 07:30:53 +09:00
Yamashita Yuu 6b4d6249a0 No need to use eval in fish init script 2014-07-05 07:27:12 +09:00
Yamashita Yuu 0de2cdbbc3 Should not persist PYENV_DEACTIVATE after failed attempt to deactivate and activate 2014-07-05 06:53:46 +09:00
Yamashita Yuu abfda4bac9 Fix issues with manual activation of virtual environments (#34) 2014-07-04 22:55:06 +09:00
Yamashita Yuu be18fd294e Fix virtualenv-prefix when the version is system 2014-07-04 22:44:08 +09:00