Skip to content

Commit

Permalink
python: remove zstyle setting in favor of third party environment var…
Browse files Browse the repository at this point in the history
  • Loading branch information
belak authored and Ayrton Araujo committed May 24, 2018
1 parent 4a2bed1 commit 8b19404
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 17 deletions.
8 changes: 0 additions & 8 deletions modules/python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,6 @@ zstyle ':prezto:module:python:virtualenv' auto-switch 'yes'
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
-------

Expand Down
14 changes: 5 additions & 9 deletions modules/python/init.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,11 @@ if (( $+VIRTUALENVWRAPPER_VIRTUALENV || $+commands[virtualenv] )) && \
# Fallback to 'virtualenvwrapper' without 'pyenv' wrapper if available
# in '$path' or in an alternative location on a Debian based system.
#
# If the python-path was manually specified, use that. Otherwise, if
# homebrew is installed and it wasn't overridden via environment variable
# we fall back to python3 then python2 in that order. This is needed to
# fix an issue with virtualenvwrapper as homebrew no longer shadows the
# system python.
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 homebrew is installed and the python location wasn't overridden via
# environment variable we fall back to python3 then python2 in that order.
# This is needed to fix an issue with virtualenvwrapper as homebrew no
# longer shadows the system python.
if [[ -z "$VIRTUALENVWRAPPER_PYTHON" ]] && (( $+commands[brew] )); then
if (( $+commands[python3] )); then
export VIRTUALENVWRAPPER_PYTHON=$commands[python3]
elif (( $+commands[python2] )); then
Expand Down

0 comments on commit 8b19404

Please sign in to comment.