From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 9 May 2020 14:55:19 +0000 (-0400)
Subject: Unpin pydocstyle, minimum for flake8-docstrings 1.3.1
X-Git-Tag: rel_1_4_0b1~204^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a55a1a41e1cc834d31fcd81cdc98ec086a23ee8d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Unpin pydocstyle, minimum for flake8-docstrings 1.3.1

Per https://gitlab.com/pycqa/flake8-docstrings/-/issues/36#note_199635329
flake8-docstrings has repaired the pydocstyle issue as of
1.3.1, so unpin pydocstyle.

Change-Id: I117a5df58ff6c5a4087c433ab817ad305df6a17b
---

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index de29c68c6b..00a097cf3d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -18,9 +18,11 @@ repos:
         additional_dependencies:
           - flake8-import-order
           - flake8-builtins
-          - flake8-docstrings
+          - flake8-docstrings>=1.3.1
           - flake8-rst-docstrings
-          - pydocstyle<4.0.0
+          # flake8-rst-docstrings depdendency, leaving it here
+          # in case it requires a version pin
+          - pydocstyle
           - pygments
 
 
diff --git a/tox.ini b/tox.ini
index 83b81a0da1..ead699a706 100644
--- a/tox.ini
+++ b/tox.ini
@@ -84,10 +84,11 @@ deps=
       flake8
       flake8-import-order
       flake8-builtins
-      flake8-docstrings
+      flake8-docstrings>=1.3.1
       flake8-rst-docstrings
-      pydocstyle<4.0.0
-      # used by flake8-rst-docstrings
+      # flake8-rst-docstrings depdendency, leaving it here
+      # in case it requires a version pin
+      pydocstyle
       pygments
       black==19.10b0
 commands =