Skip to content

Inline setup_external_compile into setupext. #11573

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jul 5, 2018
Merged

Inline setup_external_compile into setupext. #11573

merged 1 commit into from
Jul 5, 2018

Conversation

anntzer
Copy link
Contributor

@anntzer anntzer commented Jul 4, 2018

PR Summary

Last chunk of breaking #11570 into smaller pieces.

PR Checklist

  • Has Pytest style unit tests
  • Code is PEP 8 compliant
  • New features are documented, with examples if plot related
  • Documentation is sphinx and numpydoc compliant
  • Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
  • Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way

timhoffm
timhoffm reviewed Jul 4, 2018
View reviewed changes
setupext.py Outdated
subprocess.check_call([os.path.abspath(cmdfile)],
if platform.architecture()[0] == '64bit':
WinXX = xXX = 'x64'
else:
Copy link
Member

Choose a reason for hiding this comment

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

Maybe just use .. = .. if platform.architecture()[0] else .. twice.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

setupext.py Outdated
WinXX = 'Win32'
xXX = 'x86'
vcvarsall = msvc.find_vcvarsall(10.0)
if vcvarsall == None:
Copy link
Member

Choose a reason for hiding this comment

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

is None

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

setupext.py Outdated
raise RuntimeError('Microsoft VS 2010 required')
cmdfile = Path("build/build_freetype.cmd")
cmdfile.write_text(
FREETYPE_BUILD_CMD.format(vc20xx=vc, WinXX=WinXX, xXX=xXX))
Copy link
Member

Choose a reason for hiding this comment

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

vcvarsall missing in format

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@anntzer anntzer force-pushed the killsetupexternalcompile branch from b4c85ec to b71fd6a Compare July 4, 2018 20:27
@QuLogic QuLogic added this to the v3.0 milestone Jul 5, 2018
@QuLogic QuLogic merged commit 5448787 into matplotlib:master Jul 5, 2018
@anntzer anntzer deleted the killsetupexternalcompile branch July 5, 2018 05:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@QuLogic QuLogic QuLogic approved these changes

@timhoffm timhoffm timhoffm approved these changes

Assignees
No one assigned
Labels
Build OS: Microsoft
Projects
None yet
Milestone
v3.0.0
Development

Successfully merging this pull request may close these issues.
3 participants
@anntzer @QuLogic @timhoffm