Skip to content

CI: add additional qt5 deb package on travis#13412

Merged
dstansby merged 1 commit into
matplotlib:masterfrom
tacaswell:qt512_fix
Feb 11, 2019
Merged

CI: add additional qt5 deb package on travis#13412
dstansby merged 1 commit into
matplotlib:masterfrom
tacaswell:qt512_fix

Conversation

@tacaswell

@tacaswell tacaswell commented Feb 11, 2019 •
edited by QuLogic
Loading

Copy link
Copy Markdown
Member
  • Has Pytest style unit tests
  • Code is Flake 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

@tacaswell tacaswell mentioned this pull request Feb 11, 2019
Closed
6 tasks
jklymak
jklymak approved these changes Feb 11, 2019
View reviewed changes

@jklymak jklymak 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.

Seems to work!

@dstansby dstansby added this to the v3.1.0 milestone Feb 11, 2019
dstansby
dstansby approved these changes Feb 11, 2019
View reviewed changes

@dstansby dstansby 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.

Not sure if this ha to be backported, so I've just left it in 3.1.0

@dstansby dstansby merged commit 121102b into matplotlib:master Feb 11, 2019
@tacaswell tacaswell deleted the qt512_fix branch February 11, 2019 21:45
@QuLogic

QuLogic commented Feb 12, 2019

Copy link
Copy Markdown
Member

@meeseeksdev backport to v3.0.x

See #13416.

@lumberbot-app

lumberbot-app Bot commented Feb 12, 2019

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.0.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 121102b972d40aa069a7d71ba02e5b447407de39
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #13412: CI: add additional qt5 deb package on travis'
  1. Push to a named branch :
git push YOURFORK v3.0.x:auto-backport-of-pr-13412-on-v3.0.x
  1. Create a PR against branch v3.0.x, I would have named this PR:

"Backport PR #13412 on branch v3.0.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.

@QuLogic QuLogic modified the milestones: v3.1.0, v3.0.3 Feb 12, 2019
@hmaarrfk hmaarrfk mentioned this pull request Feb 12, 2019
Merged
9 tasks
@tacaswell

tacaswell commented Feb 12, 2019

Copy link
Copy Markdown
Member Author

For the record I did this based on a comment @smheidrich at #13404 (comment) that I completely failed to credit 😞

QuLogic added a commit that referenced this pull request Feb 12, 2019
@QuLogic
Merge pull request #13418 from QuLogic/backport-13412
69c2a9d 
Backport PR #13412 and #13337 on branch v3.0.x
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jklymak jklymak jklymak approved these changes

@dstansby dstansby dstansby approved these changes

Assignees

No one assigned

Labels

topic: testing

Projects

None yet

Milestone

v3.0.3

Development

Successfully merging this pull request may close these issues.

4 participants

@tacaswell @QuLogic @jklymak @dstansby