Skip to content
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

Pin pydocstyle<4.0 #14710

Merged
merged 1 commit into from Jul 8, 2019
Merged

Pin pydocstyle<4.0 #14710

merged 1 commit into from Jul 8, 2019

Conversation

timhoffm
Copy link
Member

@timhoffm timhoffm commented Jul 7, 2019

PR Summary

pydocstyle 4.0.0 was released yesterday and removed a function that is used in flake8-docstrings.
See https://gitlab.com/pycqa/flake8-docstrings/issues/36

This breaks our flake8 tests. Until the above issue is resolved, we should not use pydocstyle 4.0.

@timhoffm timhoffm mentioned this pull request Jul 7, 2019
6 tasks
@tacaswell
Copy link
Member

I am slowly coming around to using one of the auto-dependency version bots for non-user-facing dev tools (pytest, pycodestlyle, and friends).

@tacaswell tacaswell modified the milestones: v3.1.2, v2.2.5 Jul 7, 2019
Copy link
Contributor

@anntzer anntzer left a comment

Choose a reason for hiding this comment

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

Let's get this in to unbreak the build.

@anntzer anntzer merged commit 1a0a0bf into matplotlib:master Jul 8, 2019
@lumberbot-app
Copy link

lumberbot-app bot commented Jul 8, 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 v2.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 1a0a0bfa0c29314291ab6b0fadb7a3e80ec058c8
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #14710: Pin pydocstyle<4.0'
  1. Push to a named branch :
git push YOURFORK v2.2.x:auto-backport-of-pr-14710-on-v2.2.x
  1. Create a PR against branch v2.2.x, I would have named this PR:

"Backport PR #14710 on branch v2.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.

@lumberbot-app
Copy link

lumberbot-app bot commented Jul 8, 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.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 1a0a0bfa0c29314291ab6b0fadb7a3e80ec058c8
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #14710: Pin pydocstyle<4.0'
  1. Push to a named branch :
git push YOURFORK v3.1.x:auto-backport-of-pr-14710-on-v3.1.x
  1. Create a PR against branch v3.1.x, I would have named this PR:

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

@timhoffm timhoffm deleted the pin-pydocstyle branch July 8, 2019 19:12
@timhoffm
Copy link
Member Author

timhoffm commented Jul 8, 2019

Does not need backporting because the usage of pydocstyle itself was not backported #14063.

I don't think that it's necessary in the other branches because virtually all doc-string related changes will go into master and only then backported. So they are already checked with the master.

@anntzer
Copy link
Contributor

anntzer commented Aug 6, 2020

FTR pydocstyle finally merged my (old) PR which should fix (at least some of) the issues here (PyCQA/pydocstyle#472) so it may be worth looking at whether pydocstyle master works or whether more fixes are needed.

@timhoffm timhoffm mentioned this pull request Aug 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants