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

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

2. Cherry pick the first parent branch of the this PR on top of the older branch:

$ git cherry-pick -m1 1a0a0bfa0c29314291ab6b0fadb7a3e80ec058c8

3. You will likely have some merge/cherry-pick conflict here, fix them and commit:

$ git commit -am 'Backport PR #14710: Pin pydocstyle<4.0'

4. Push to a named branch :

git push YOURFORK v2.2.x:auto-backport-of-pr-14710-on-v2.2.x

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

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

2. Cherry pick the first parent branch of the this PR on top of the older branch:

$ git cherry-pick -m1 1a0a0bfa0c29314291ab6b0fadb7a3e80ec058c8

3. You will likely have some merge/cherry-pick conflict here, fix them and commit:

$ git commit -am 'Backport PR #14710: Pin pydocstyle<4.0'

4. Push to a named branch :

git push YOURFORK v3.1.x:auto-backport-of-pr-14710-on-v3.1.x

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

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.

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.