Skip to content

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jun 5, 2019
Merged

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

merged 1 commit into from
Jun 5, 2019

Conversation

anntzer
Copy link
Contributor

@anntzer anntzer commented May 30, 2019

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 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

@anntzer
Inline $MPLLOCALFREETYPE/$PYTEST_ADDOPTS/$NPROC in .travis.yml.
d44b871 
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.
@dstansby dstansby added this to the v3.2.0 milestone Jun 5, 2019
@dstansby dstansby merged commit 0e2fa71 into matplotlib:master Jun 5, 2019
@anntzer anntzer deleted the travis branch June 5, 2019 11:57
@Kojoley
Copy link
Member

Kojoley commented Jan 7, 2020

@meeseeksdev backport to v3.1.x

@lumberbot-app
Copy link

lumberbot-app bot commented Jan 7, 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.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 to suggest an improvement.

@Kojoley
Copy link
Member

Kojoley commented Jan 7, 2020

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

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

@timhoffm timhoffm timhoffm approved these changes

Assignees
No one assigned
Labels
topic: testing
Projects
None yet
Milestone
v3.2.0
Development

Successfully merging this pull request may close these issues.
5 participants
@anntzer @Kojoley @timhoffm @QuLogic @dstansby