Skip to content

Simplify azure setup. #15462

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

Merged
merged 1 commit into from
Nov 7, 2019
Merged

Conversation

anntzer
Copy link
Contributor

@anntzer anntzer commented Oct 21, 2019

One can keep everything in a single file by dispatching based on the OS,
rather than splitting the build over two different files.

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 anntzer added the Build label Oct 21, 2019
@anntzer anntzer force-pushed the single-file-azure branch 4 times, most recently from 5796ec2 to 271ed8b Compare October 22, 2019 14:57
@NelleV
Copy link
Member

NelleV commented Oct 31, 2019

There's a conflict. Can you merge or rebase?

@anntzer
Copy link
Contributor Author

anntzer commented Oct 31, 2019

rebased

@anntzer anntzer force-pushed the single-file-azure branch 2 times, most recently from 822978e to e4862e3 Compare October 31, 2019 14:18
Copy link
Member

@QuLogic QuLogic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is okay, but I can't get Azure to restart the last failing job.

@anntzer
Copy link
Contributor Author

anntzer commented Nov 7, 2019

rebased to retrigger ci

One can keep everything in a single file by dispatching based on the OS,
rather than splitting the build over two different files.
@timhoffm timhoffm added this to the v3.3.0 milestone Nov 7, 2019
@timhoffm timhoffm merged commit eebe611 into matplotlib:master Nov 7, 2019
@anntzer anntzer deleted the single-file-azure branch November 7, 2019 22:01
@timhoffm
Copy link
Member

@meeseeksdev backport to v3.2.x

@lumberbot-app
Copy link

lumberbot-app bot commented Jan 25, 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.2.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 eebe6111d28d33fedcb835074f5f7b0a828267f0
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #15462: Simplify azure setup.'
  1. Push to a named branch :
git push YOURFORK v3.2.x:auto-backport-of-pr-15462-on-v3.2.x
  1. Create a PR against branch v3.2.x, I would have named this PR:

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

timhoffm added a commit to timhoffm/matplotlib that referenced this pull request Jan 25, 2020
timhoffm added a commit to timhoffm/matplotlib that referenced this pull request Jan 25, 2020
timhoffm added a commit that referenced this pull request Jan 25, 2020
…v3.2.x

Backport PR #15462 on v3.2.x: Simplify azure setup.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants