Skip to content
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

TST: skip if known-bad version of imagemagick #18730

Merged
merged 1 commit into from
Oct 14, 2020

Conversation

tacaswell
Copy link
Member

PR Summary

xref ImageMagick/ImageMagick#2720

This should un-break OSX on azure and travis, prevent breakage on other CI as the imagemagick update makes its way through packaging.

@tacaswell tacaswell added this to the v3.3.3 milestone Oct 14, 2020
@jklymak jklymak merged commit d1a9b21 into matplotlib:master Oct 14, 2020
@lumberbot-app
Copy link

lumberbot-app bot commented Oct 14, 2020

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.3.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 d1a9b21ba389d4328263e9a5415d630330605cdf
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #18730: TST: skip if known-bad version of imagemagick'
  1. Push to a named branch :
git push YOURFORK v3.3.x:auto-backport-of-pr-18730-on-v3.3.x
  1. Create a PR against branch v3.3.x, I would have named this PR:

"Backport PR #18730 on branch v3.3.x"

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!

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

@tacaswell tacaswell deleted the tst_skip_bad_imagemagick branch October 14, 2020 20:02
@tacaswell tacaswell modified the milestones: v3.3.3, v3.4.0 Oct 14, 2020
@tacaswell
Copy link
Member Author

This test is not on the 3.3.x branch (came in via 9cee283 #18501) so no need to backport.

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.

None yet

4 participants