Skip to content

Commit

Permalink
Merge branch 'release_17.01' into release_17.05
Browse files Browse the repository at this point in the history
  • Loading branch information
martenson committed Oct 10, 2017
2 parents 81ece25 + f64b7fc commit 1635f46
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions tox.ini
Expand Up @@ -8,6 +8,7 @@ whitelist_externals = bash
deps =
flake8==3.3.0
flake8-docstrings==1.1.0
pydocstyle==2.0.0

[testenv:py33-lint]
commands = bash .ci/flake8_py3_wrapper.sh
Expand Down Expand Up @@ -80,6 +81,7 @@ skip_install = True
deps =
flake8==3.3.0
flake8-docstrings==1.1.0
pydocstyle==2.0.0


[testenv:py27-lint-docstring-include-list]
Expand All @@ -89,3 +91,4 @@ skip_install = True
deps =
flake8==3.3.0
flake8-docstrings==1.1.0
pydocstyle==2.0.0

0 comments on commit 1635f46

Please sign in to comment.