diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2020-04-24 20:54:33 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2020-04-24 20:54:33 -0600 |
| commit | c197ad40f1dca62fd1e0e555e7bfc84e39f31223 (patch) | |
| tree | 5c1e753e0ff2cb9d0e08a699f17352225b9ef9f1 /plugins/python | |
| parent | 0b67340fd2fe9330d8487491e1983ad1a111fb2b (diff) | |
| parent | 2560f04982dfc2693221c7c0f47d1a71df09a794 (diff) | |
| download | zsh-c197ad40f1dca62fd1e0e555e7bfc84e39f31223.tar.gz zsh-c197ad40f1dca62fd1e0e555e7bfc84e39f31223.tar.bz2 zsh-c197ad40f1dca62fd1e0e555e7bfc84e39f31223.zip | |
Merge branch 'master' of https://github.com/ohmyzsh/ohmyzsh
Diffstat (limited to 'plugins/python')
| -rw-r--r-- | plugins/python/README.md | 3 | ||||
| -rw-r--r-- | plugins/python/python.plugin.zsh | 29 |
2 files changed, 31 insertions, 1 deletions
diff --git a/plugins/python/README.md b/plugins/python/README.md index e391bcfd4..0180218a2 100644 --- a/plugins/python/README.md +++ b/plugins/python/README.md @@ -11,7 +11,8 @@ plugins=(... python) | Command | Description | |------------------|---------------------------------------------------------------------------------| +| `ipython` | Runs the appropriate `ipython` version according to the activated virtualenv | | `pyfind` | Finds .py files recursively in the current directory | | `pyclean [dirs]` | Deletes byte-code and cache files from a list of directories or the current one | | `pygrep <text>` | Looks for `text` in .py files | -| `ipython` | Runs the appropriate `ipython` version according to the activated virtualenv | +| `pyuserpaths` | Add --user site-packages to PYTHONPATH, for all installed python versions. | diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh index 62855fca2..3e4db1e7d 100644 --- a/plugins/python/python.plugin.zsh +++ b/plugins/python/python.plugin.zsh @@ -11,6 +11,35 @@ function pyclean() { find ${ZSH_PYCLEAN_PLACES} -depth -type d -name ".pytest_cache" -exec rm -r "{}" + } +# Add the user installed site-packages paths to PYTHONPATH, only if the +# directory exists. Also preserve the current PYTHONPATH value. +# Feel free to autorun this when .zshrc loads. +function pyuserpaths() { + local targets=("python2" "python3") # bins + + # Get existing interpreters. + local interps=() + for target in $targets; do + [ `command -v $target` ] && interps+=($target) + done + + # Check for a non-standard install directory. + local user_base="${HOME}/.local" + [ $PYTHONUSERBASE ] && user_base=$PYTHONUSERBASE + + # Add version specific paths, if: + # it exists in the filesystem; + # it isn't in PYTHONPATH already. + for interp in $interps; do + # Get minor release version. + local ver=`$interp -V 2>&1` + ver=`echo ${ver:7} | cut -d '.' -f 1,2` # The patch version is variable length, truncate it. + + local site_pkgs="${user_base}/lib/python${ver}/site-packages" + [[ -d $site_pkgs && ! $PYTHONPATH =~ $site_pkgs ]] && export PYTHONPATH=${site_pkgs}:$PYTHONPATH + done +} + # Grep among .py files alias pygrep='grep -r --include="*.py"' |