summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2020-08-02 00:17:02 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2020-08-02 00:17:02 +0000
commit5186bea969a0663f535a5a2daa7667a124b5b29f (patch)
tree34fb616cbdfb307ca51c097c02cc1df735abff2d
parent1dae2aba0b03f32006595ca6f3916072eb22e17c (diff)
parenta55a1a41e1cc834d31fcd81cdc98ec086a23ee8d (diff)
downloadsqlalchemy-5186bea969a0663f535a5a2daa7667a124b5b29f.tar.gz
Merge "Unpin pydocstyle, minimum for flake8-docstrings 1.3.1"
-rw-r--r--.pre-commit-config.yaml6
-rw-r--r--tox.ini7
2 files changed, 8 insertions, 5 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index de29c68c6..00a097cf3 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 83b81a0da..ead699a70 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 =