Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

BLD: Fix some bugs in setupext.py #9510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 1, 2017
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
BLD: Fix conda env libs/includes lookup
Previously `CONDA_DEFAULT_ENV`used to determine the env location
but sometimes the value was just an env name. It was fixed too.
  • Loading branch information
Kojoley committed Oct 21, 2017
commit ddcfd82cb0ff0405ba5c3681540ac9d77fdc3749
10 changes: 7 additions & 3 deletions 10 setupext.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,14 @@ def get_base_dirs():
return os.environ.get('MPLBASEDIRLIST').split(os.pathsep)

win_bases = ['win32_static', ]
# on conda windows, we also add the <installdir>\Library of the local interpreter,
# on conda windows, we also add the <conda_env_dir>\Library,
# as conda installs libs/includes there
if os.getenv('CONDA_DEFAULT_ENV'):
win_bases.append(os.path.join(os.getenv('CONDA_DEFAULT_ENV'), "Library"))
# env var names mess: https://github.com/conda/conda/issues/2312
conda_env_path = os.getenv('CONDA_PREFIX') # conda >= 4.1
if not conda_env_path:
conda_env_path = os.getenv('CONDA_DEFAULT_ENV') # conda < 4.1
if conda_env_path and os.path.isdir(conda_env_path):
win_bases.append(os.path.join(conda_env_path, "Library"))

basedir_map = {
'win32': win_bases,
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.