Skip to content

Commit 04a49ba

Browse files
authored
Merge pull request #722 from common-workflow-language/fix_pydocstyle
fix checking with pydocstyle
2 parents 5859d21 + 19135ba commit 04a49ba

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

Makefile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#
1616
1717

18-
# make pep8 to check for basic Python code compliance
18+
# make pycodestyle to check for basic Python code compliance
1919
# make autopep8 to fix most pep8 errors
2020
# make pylint to check Python code for enhanced compliance including naming
2121
# and documentation
@@ -26,7 +26,7 @@ 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 pydocstyle flake8 pytest isort mock
29+
DEVPKGS=pycodestyle diff_cover autopep8 pylint coverage pydocstyle flake8 pytest isort mock
3030
DEBDEVPKGS=pep8 python-autopep8 pylint python-coverage pydocstyle sloccount \
3131
python-flake8 python-mock shellcheck
3232
VERSION=1.0.$(shell date +%Y%m%d%H%M%S --utc --date=`git log --first-parent \
@@ -71,15 +71,16 @@ clean: FORCE
7171
sort_imports:
7272
isort ${MODULE}/*.py tests/*.py setup.py
7373

74-
## pep8 : check Python code style
75-
pep8: $(PYSOURCES)
76-
pep8 --exclude=_version.py --show-source --show-pep8 $^ || true
74+
pep8: pycodestyle
75+
## pycodestyle : check Python code style
76+
pycodestyle: $(PYSOURCES)
77+
pycodestyle --exclude=_version.py --show-source --show-pep8 $^ || true
7778

78-
pep8_report.txt: $(PYSOURCES)
79-
pep8 --exclude=_version.py $^ > pep8_report.txt || true
79+
pycodestyle_report.txt: $(PYSOURCES)
80+
pycodestyle --exclude=_version.py $^ > $@ || true
8081

81-
diff_pep8_report: pep8_report.txt
82-
diff-quality --violations=pep8 pep8_report.txt
82+
diff_pycodestyle_report: pycodestyle_report.txt
83+
diff-quality --violations=pycodestyle $^
8384

8485
pep257: pydocstyle
8586
## pydocstyle : check Python code style

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ deps =
5858
readme
5959

6060
[testenv:py27-pydocstyle]
61+
whitelist_externals = make
6162
commands = make diff_pydocstyle_report
6263
deps =
6364
pydocstyle

0 commit comments

Comments
 (0)