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

Rework checks for old macosx #18669

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 4 commits into from
Oct 8, 2020
Merged

Conversation

QuLogic
Copy link
Member

@QuLogic QuLogic commented Oct 6, 2020

PR Summary

This tweaks the checks to use some slightly more modern macros, and updates the documentation URL. It also changes the compatibility #defines to be enabled when using an older SDK minimum, instead of when not allowing a new maximum. This seems to not trigger any deprecations, yet allows us to not raise minimum requirements.

cc @efiring @dstansby @jkseppan

PR Checklist

  • Has pytest style unit tests (and pytest passes).
  • Is Flake 8 compliant (run flake8 on changed files to check).
  • [n/a] New features are documented, with examples if plot related.
  • [n/a] Documentation is sphinx and numpydoc compliant (the docs should build without error).
  • Conforms to Matplotlib style conventions (install flake8-docstrings and pydocstyle<4 and run flake8 --docstring-convention=all).
  • [n/a] New features have an entry in doc/users/next_whats_new/ (follow instructions in README.rst there).
  • [n/a] API changes documented in doc/api/next_api_changes/ (follow instructions in README.rst there).

@QuLogic QuLogic added this to the v3.4.0 milestone Oct 6, 2020
@QuLogic
Copy link
Member Author

QuLogic commented Oct 6, 2020

This works on MacStadium, and would fix wheel CI builds.

Copy link
Member

@dstansby dstansby left a comment

Choose a reason for hiding this comment

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

Works well for me and changes look good, thanks a lot.

Copy link
Member

@dstansby dstansby left a comment

Choose a reason for hiding this comment

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

Hmm, looks like the travis build is failing on building the maxos extension.

@QuLogic
Copy link
Member Author

QuLogic commented Oct 6, 2020

Is it? What's the error? All I see is a truncated log in the middle of building FreeType.

This makes it so we can still compile against old SDKs.

Fixes matplotlib#18510.
Python requires the SDK to be at least 10.6.
The constant is 101000, not 10100, but fortunately, this worked anyway
since 10.9's constant is 1090, and nothing else was defined in between.
@QuLogic
Copy link
Member Author

QuLogic commented Oct 8, 2020

I figured it out; older SDKs don't define newer __MAC_OS_#_# for versions > itself, so Apple's advice to use the numbers still stands. I mostly reverted bba75cc, which should fix it.

@jklymak
Copy link
Member

jklymak commented Oct 8, 2020

@dopplershift if you still are OK w/ this, go ahead and merge....

@dopplershift dopplershift merged commit ef9b1e9 into matplotlib:master Oct 8, 2020
@QuLogic QuLogic deleted the min-macosx branch October 8, 2020 22:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants
Morty Proxy This is a proxified and sanitized view of the page, visit original site.