Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

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

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged

Conversation

tacaswell
Copy link
Member

PR Summary

xrefImageMagick/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.

@tacaswelltacaswell added this to thev3.3.3 milestoneOct 14, 2020
@jklymakjklymak merged commitd1a9b21 intomatplotlib:masterOct 14, 2020
@lumberbot-app
Copy link

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 tosuggest an improvement.

@tacaswelltacaswell deleted the tst_skip_bad_imagemagick branchOctober 14, 2020 20:02
@tacaswelltacaswell modified the milestones:v3.3.3,v3.4.0Oct 14, 2020
@tacaswell
Copy link
MemberAuthor

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

Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@jklymakjklymakjklymak approved these changes

@timhoffmtimhoffmtimhoffm approved these changes

Assignees
No one assigned
Projects
None yet
Milestone
v3.4.0
Development

Successfully merging this pull request may close these issues.

4 participants
@tacaswell@jklymak@timhoffm@QuLogic
[8]ページ先頭
©2009-2025 Movatter.jp