dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-22 13:58:00 +00:00
Code Issues Releases Wiki Activity

python: remove zstyle setting in favor of third party environment variable

Browse Source 
Refs #1519, #1520
This commit is contained in:
Kaleb Elwert 2017-12-14 17:23:40 -08:00
parent 4c31107e3b
commit 83085e5231
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/python/README.md
View File

@ -114,14 +114,6 @@ zstyle ':prezto:module:python:virtualenv' auto-switch 'yes'
zstyle ':prezto:module:python:virtualenv' initialize 'no' zstyle ':prezto:module:python:virtualenv' initialize 'no'
``` ```
On some systems, the `python` binary doesn't exist so in order to get
virtualenvwrapper to work, the path needs to specified. We do our best to detect
this, but sometimes it needs manual intervention.
```sh
zstyle ':prezto:module:python:virtualenvwrapper' python-path /opt/python3/bin/python3
```
Aliases Aliases
------- -------

14
modules/python/init.zsh
View File

@ -115,15 +115,11 @@ if (( $+VIRTUALENVWRAPPER_VIRTUALENV || $+commands[virtualenv] )) && \
# Fallback to 'virtualenvwrapper' without 'pyenv' wrapper if available # Fallback to 'virtualenvwrapper' without 'pyenv' wrapper if available
# in '$path' or in an alternative location on a Debian based system. # in '$path' or in an alternative location on a Debian based system.
# #
# If the python-path was manually specified, use that. Otherwise, if # If homebrew is installed and the python location wasn't overridden via
# homebrew is installed and it wasn't overridden via environment variable # environment variable we fall back to python3 then python2 in that order.
# we fall back to python3 then python2 in that order. This is needed to # This is needed to fix an issue with virtualenvwrapper as homebrew no
# fix an issue with virtualenvwrapper as homebrew no longer shadows the # longer shadows the system python.
# system python. if [[ -z "$VIRTUALENVWRAPPER_PYTHON" ]] && (( $+commands[brew] )); then
zstyle -s ':prezto:module:python:virtualenvwrapper' python-path '_venv_python'
if [[ -n "$_venv_python" ]]; then
export VIRTUALENVWRAPPER_PYTHON=$_venv_python
elif [[ -z "$VIRTUALENVWRAPPER_PYTHON" ]] && (( $+commands[brew] )); then
if (( $+commands[python3] )); then if (( $+commands[python3] )); then
export VIRTUALENVWRAPPER_PYTHON=$commands[python3] export VIRTUALENVWRAPPER_PYTHON=$commands[python3]
elif (( $+commands[python2] )); then elif (( $+commands[python2] )); then