Merge pull request #3995 from jmchilton/flake8fixes

Remove pydocstyle pins - there was an update to flake8-docstrings.

.ci/flake8_wrapper_docstrings.sh

@@ -7,7 +7,7 @@ set -e
 # D3XX - Quoting issues.
 # D401 - First line should be in imperative mood 
 # D403 - First word of the first line should be properly capitalized
-args="--ignore=D --select=D100,D201,D202,D206,D207,D208,D209,D211,D3,D401,D403"
+args="--ignore=D --select=D100,D201,D202,D206,D207,D208,D209,D211,D3,D403"
 
 # If the first argument is --include, lint the modules expected to pass. If
 # the first argument is --exclude, lint all modules the full Galaxy linter lints

setup.cfg

@@ -7,7 +7,7 @@
 # 501 is line length
 # W503 is line breaks before binary operators, which has been reversed in PEP 8.
 # D** are docstring linting - which we mostly ignore except D302. (Hopefully we will solve more over time).
-ignore = E128,E201,E202,E203,E501,E402,W503,D100,D101,D102,D103,D104,D105,D200,D201,D202,D204,D205,D206,D207,D208,D209,D210,D211,D300,D301,D400,D401,D402,D403
+ignore = E128,E201,E202,E203,E501,E402,W503,D100,D101,D102,D103,D104,D105,D200,D201,D202,D204,D205,D206,D207,D208,D209,D210,D211,D300,D301,D400,D401,D402,D403,D412,D413
 exclude = lib/galaxy/util/jstree.py
 # For flake8-import-order
 # https://github.com/PyCQA/flake8-import-order/blob/master/tests/test_cases/complete_smarkets.py

tox.ini

@@ -7,9 +7,7 @@ commands = bash .ci/flake8_wrapper.sh
 whitelist_externals = bash
 deps =
     flake8
-    flake8-docstrings
-    # The next dep can be removed when https://gitlab.com/pycqa/flake8-docstrings/issues/19 is fixed
-    pydocstyle<2
+    flake8-docstrings>=1.1.0
 
 [testenv:py33-lint]
 commands = bash .ci/flake8_py3_wrapper.sh
@@ -81,16 +79,13 @@ whitelist_externals = bash
 skip_install = True
 deps =
     flake8
-    flake8-docstrings
-    # The next dep can be removed when https://gitlab.com/pycqa/flake8-docstrings/issues/19 is fixed
-    pydocstyle<2
+    flake8-docstrings>=1.1.0
+
 
 [testenv:py27-lint-docstring-include-list]
 commands = bash .ci/flake8_wrapper_docstrings.sh --include
 whitelist_externals = bash
 skip_install = True
 deps =
     flake8
-    flake8-docstrings
-    # The next dep can be removed when https://gitlab.com/pycqa/flake8-docstrings/issues/19 is fixed
-    pydocstyle<2
+    flake8-docstrings>=1.1.0