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

Inline $MPLLOCALFREETYPE/$PYTEST_ADDOPTS/$NPROC in .travis.yml.#14380

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
dstansby merged 1 commit intomatplotlib:masterfromanntzer:travis
Jun 5, 2019

Conversation

anntzer
Copy link
Contributor

They're each used in only a single place so inlining them makes their
usage simpler to follow.

Also various small cleanups to .travis.yml.

PR Summary

PR Checklist

  • Has Pytest style unit tests
  • Code isFlake 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

They're each used in only a single place so inlining them makes theirusage simpler to follow.Also various small cleanups to .travis.yml.
@dstansbydstansby added this to thev3.2.0 milestoneJun 5, 2019
@dstansbydstansby merged commit0e2fa71 intomatplotlib:masterJun 5, 2019
@anntzeranntzer deleted the travis branchJune 5, 2019 11:57
@Kojoley
Copy link
Member

@meeseeksdev backport to v3.1.x

@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.1.x$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 0e2fa711c6cd2798177d0028268135dcfc8c3318
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #14380: Inline $MPLLOCALFREETYPE/$PYTEST_ADDOPTS/$NPROC in .travis.yml.'
  1. Push to a named branch :
git push YOURFORK v3.1.x:auto-backport-of-pr-14380-on-v3.1.x
  1. Create a PR against branch v3.1.x, I would have named this PR:

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

@Kojoley
Copy link
Member

Never mind, I wanted to backport this to cleanly backport#16112, but this does not land cleanly too.

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

@timhoffmtimhoffmtimhoffm approved these changes

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

Successfully merging this pull request may close these issues.

5 participants
@anntzer@Kojoley@timhoffm@QuLogic@dstansby
[8]ページ先頭
©2009-2025 Movatter.jp