Skip to content

Commit fd0ef46

Browse files
committed
pep257->pydocstyle, add to tox
1 parent 650a503 commit fd0ef46

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

Makefile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ MODULE=cwltool
2626
# `SHELL=bash` doesn't work for some, so don't use BASH-isms like
2727
# `[[` conditional expressions.
2828
PYSOURCES=$(wildcard ${MODULE}/**.py tests/*.py) setup.py
29-
DEVPKGS=pep8 diff_cover autopep8 pylint coverage pep257 flake8 pytest isort mock
30-
DEBDEVPKGS=pep8 python-autopep8 pylint python-coverage pep257 sloccount python-flake8 python-mock
29+
DEVPKGS=pep8 diff_cover autopep8 pylint coverage pydocstyle flake8 pytest isort mock
30+
DEBDEVPKGS=pep8 python-autopep8 pylint python-coverage pydocstyle sloccount python-flake8 python-mock
3131
VERSION=1.0.$(shell date +%Y%m%d%H%M%S --date=`git log --first-parent \
3232
--max-count=1 --format=format:%cI`)
3333
mkfile_dir := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
@@ -80,15 +80,16 @@ pep8_report.txt: $(PYSOURCES)
8080
diff_pep8_report: pep8_report.txt
8181
diff-quality --violations=pep8 pep8_report.txt
8282

83-
## pep257 : check Python code style
84-
pep257: $(PYSOURCES)
85-
pep257 --ignore=D100,D101,D102,D103 $^ || true
83+
pep257: pydocstyle
84+
## pydocstyle : check Python code style
85+
pydocstyle: $(PYSOURCES)
86+
pydocstyle --ignore=D100,D101,D102,D103 $^ || true
8687

87-
pep257_report.txt: $(PYSOURCES)
88-
pep257 setup.py $^ > pep257_report.txt 2>&1 || true
88+
pydocstyle_report.txt: $(PYSOURCES)
89+
pydocstyle setup.py $^ > pydocstyle_report.txt 2>&1 || true
8990

90-
diff_pep257_report: pep257_report.txt
91-
diff-quality --violations=pep8 pep257_report.txt
91+
diff_pydocstyle_report: pydocstyle_report.txt
92+
diff-quality --violations=pep8 $^
9293

9394
## autopep8 : fix most Python code indentation and formatting
9495
autopep8: $(PYSOURCES)

tox.ini

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py27-lint, py27-unit, py27-pipconflictchecker, py36-lint, py35-lint, py34-lint, py33-lint, py35-mypy2, py27-lint-readme
2+
envlist = py27-lint, py27-unit, py27-pipconflictchecker, py36-lint, py35-lint, py34-lint, py33-lint, py35-mypy2, py27-lint-readme, py27-pydocstyle
33
skipsdist = True
44

55
[travis]
@@ -41,3 +41,9 @@ commands = python setup.py test
4141
commands = python setup.py check -r -s
4242
deps =
4343
readme
44+
45+
[testenv:py27-pydocstyle]
46+
commands = make diff_pydocstyle_report
47+
deps =
48+
pydocstyle
49+
diff-cover

0 commit comments

Comments
 (0)