Skip to content

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

Conversation

Kojoley
Copy link
Member

@Kojoley Kojoley commented Oct 21, 2017

No description provided.

Previously `CONDA_DEFAULT_ENV`used to determine the env location
but sometimes the value was just an env name. It was fixed too.
@Kojoley Kojoley added the Build label Oct 21, 2017
@Kojoley Kojoley added this to the v2.2 milestone Oct 21, 2017
setupext.py Outdated
@@ -151,7 +151,8 @@ def has_include_file(include_dirs, filename):
directories in `include_dirs`.
"""
if sys.platform == 'win32':
include_dirs += os.environ.get('INCLUDE', '.').split(';')
include_dirs = list(include_dirs)
include_dirs += os.environ.get('INCLUDE', '.').split(os.pathsep)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably worth clarifying in a comment? I would have missed the point of the change if not for the commit message...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm also concerned about the change from split(';') to split(os.pathsep). Those are not the same, but there's nothing indicating the rationale behind them.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dopplershift os.pathsep == ; on windows https://docs.python.org/2/library/os.html#os.pathsep

Visual C++ 2015 x64 Native Build Tools Command Prompt
C:\Program Files (x86)\Microsoft Visual C++ Build Tools>set INCLUDE
INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\10\include\10.0.15063.0\ucrt;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\include\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.15063.0\shared;C:\Program Files(x86)\Windows Kits\10\include\10.0.15063.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.15063.0\winrt;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops. 🐑 Thanks for clarifying.

The passed argument would be modified by function while it not designed to.
@anntzer
Copy link
Contributor

anntzer commented Nov 1, 2017

thanks

@anntzer anntzer merged commit c465993 into matplotlib:master Nov 1, 2017
@Kojoley Kojoley deleted the bld-fix-some-bugs branch November 1, 2017 18:53
@QuLogic QuLogic modified the milestones: needs sorting, v2.2.0 Feb 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants