Skip to content

Pin macOS to 10.15 for wheels - #21303

Merged
QuLogic merged 1 commit into
matplotlib:masterfrom
QuLogic:pin-macos
Oct 7, 2021
Merged

QuLogic merged 1 commit into
matplotlib:masterfrom
QuLogic:pin-macos

Conversation

@QuLogic

@QuLogic QuLogic commented Oct 6, 2021

Copy link
Copy Markdown
Member

cibuildwheel does not support macOS 11 for PyPy.

@QuLogic QuLogic added the Build label Oct 6, 2021
@QuLogic QuLogic added this to the v3.4.4 milestone Oct 6, 2021
@QuLogic

QuLogic commented Oct 6, 2021

Copy link
Copy Markdown
Member Author

cibuildwheel does not support macOS 11 for PyPy.
@QuLogic

QuLogic commented Oct 7, 2021

Copy link
Copy Markdown
Member Author

Ah, nope, I just accidentally forgot to update a conditional.

@tacaswell

Copy link
Copy Markdown
Member

@QuLogic Is this ready to go in?

@tacaswell tacaswell left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@QuLogic can self-merge if this is ready.

@QuLogic

QuLogic commented Oct 7, 2021

Copy link
Copy Markdown
Member Author

@QuLogic
QuLogic merged commit 0edfe98 into matplotlib:master Oct 7, 2021
@QuLogic
QuLogic deleted the pin-macos branch October 7, 2021 03:11
meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull request Oct 7, 2021
@lumberbot-app

lumberbot-app Bot commented Oct 7, 2021

Copy link
Copy Markdown

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout v3.4.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 0edfe98f825cbc3f9918e3f615e4dc85478f1f06
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #21303: Pin macOS to 10.15 for wheels'
  1. Push to a named branch :
git push YOURFORK v3.4.x:auto-backport-of-pr-21303-on-v3.4.x
  1. Create a PR against branch v3.4.x, I would have named this PR:

"Backport PR #21303 on branch v3.4.x (Pin macOS to 10.15 for wheels)"

And apply the correct labels and milestones.

Congratulation you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove Still Needs Manual Backport label once the PR gets merged.

If these instruction are inaccurate, feel free to suggest an improvement.

QuLogic added a commit that referenced this pull request Oct 7, 2021
…303-on-v3.5.x

Backport PR #21303 on branch v3.5.x (Pin macOS to 10.15 for wheels)
tacaswell pushed a commit to tacaswell/matplotlib that referenced this pull request Oct 12, 2021
tacaswell pushed a commit that referenced this pull request Oct 20, 2021
Pin macOS to 10.15 for wheels
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.

2 participants