8000 DOC: pin numpydoc to less than 0.9 by tacaswell · Pull Request #14004 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

DOC: pin numpydoc to less than 0.9 #14004

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
Apr 22, 2019
Merged

DOC: pin numpydoc to less than 0.9 #14004

merged 1 commit into from
Apr 22, 2019

Conversation

tacaswell
Copy link
Member

Some of our docstring manipulation does not play well with it.

This is a stop-gap for a real fix, see #14003

@tacaswell
DOC: pin numpydoc to less than 0.9
235d989 
Some of our docstring manipulation does not play well with it.
@tacaswell tacaswell added this to the v3.0-doc milestone Apr 22, 2019
@jklymak jklymak merged commit b1070fd into matplotlib:master Apr 22, 2019
@lumberbot-app
Copy link
lumberbot-app bot commented Apr 22, 2019

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 b1070fdd07c34b3f1582e0be0cdfb40c35567154
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #14004: DOC: pin numpydoc to less than 0.9'
  1. Push to a named branch :
git push YOURFORK v3.0.x:auto-backport-of-pr-14004-on-v3.0.x
  1. Create a PR against branch v3.0.x, I would have named this PR:

"Backport PR #14004 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.

@lumberbot-app
Copy link
lumberbot-app bot commented Apr 22, 2019

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.3-doc
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 b1070fdd07c34b3f1582e0be0cdfb40c35567154
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #14004: DOC: pin numpydoc to less than 0.9'
  1. Push to a named branch :
git push YOURFORK v3.0.3-doc:auto-backport-of-pr-14004-on-v3.0.3-doc
  1. Create a PR against branch v3.0.3-doc, I would have named this PR:

"Backport PR #14004 on branch v3.0.3-doc"

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.

meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull request Apr 22, 2019
@jklymak
Backport PR matplotlib#14004: DOC: pin numpydoc to less than 0.9
c8b8a2c
@meeseeksmachine meeseeksmachine mentioned this pull request Apr 22, 2019
Merged
@tacaswell tacaswell deleted the doc_pin_numpydoc branch April 22, 2019 14:32
timhoffm added a commit that referenced this pull request Apr 22, 2019
@timhoffm
Merge pull request #14005 from meeseeksmachine/auto-backport-of-pr-14…
bfe28f8 
…004-on-v3.1.x

Backport PR #14004 on branch v3.1.x (DOC: pin numpydoc to less than 0.9)
@dstansby dstansby modified the milestones: v3.0-doc, v3.1.0 Jun 7, 2019
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

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v3.1.0
Development

Successfully merging this pull request may close these issues.
3 participants
@tacaswell @jklymak @dstansby
0