Skip to content

Commit d20f8bd

Browse files
committed
Makefile: synchronize with schema_salad
1 parent c1bebc2 commit d20f8bd

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

Makefile

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ endif
4343

4444
## all : default task
4545
all:
46-
./setup.py develop
46+
pip install -e .
4747

4848
## help : print this help message and exit
4949
help: Makefile
@@ -89,9 +89,11 @@ pep8: pycodestyle
8989
pycodestyle: $(PYSOURCES)
9090
pycodestyle --exclude=_version.py --show-source --show-pep8 $^ || true
9191

92+
pep8_report.txt: pycodestyle_report.txt
9293
pycodestyle_report.txt: $(PYSOURCES)
9394
pycodestyle --exclude=_version.py $^ > $@ || true
9495

96+
diff_pep8_report: diff_pycodestyle_report
9597
diff_pycodestyle_report: pycodestyle_report.txt
9698
diff-quality --violations=pycodestyle $^
9799

@@ -101,7 +103,7 @@ pydocstyle: $(PYSOURCES)
101103
pydocstyle --ignore=D100,D101,D102,D103 $^ || true
102104

103105
pydocstyle_report.txt: $(PYSOURCES)
104-
pydocstyle setup.py $^ > pydocstyle_report.txt 2>&1 || true
106+
pydocstyle setup.py $^ > $@ 2>&1 || true
105107

106108
diff_pydocstyle_report: pydocstyle_report.txt
107109
diff-quality --violations=pycodestyle $^
@@ -122,7 +124,7 @@ pylint: $(PYSOURCES)
122124

123125
pylint_report.txt: ${PYSOURCES}
124126
pylint --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" \
125-
$^ -j$(nproc)> pylint_report.txt || true
127+
$^ -j$(nproc)> $@ || true
126128

127129
diff_pylint_report: pylint_report.txt
128130
diff-quality --violations=pylint pylint_report.txt
@@ -139,6 +141,10 @@ coverage.html: htmlcov/index.html
139141

140142
htmlcov/index.html: .coverage
141143
coverage html
144+
@echo Test coverage of the Python code is now in htmlcov/index.html
145+
146+
coverage-report: .coverage
147+
coverage report
142148

143149
diff-cover: coverage.xml
144150
diff-cover $^
@@ -155,7 +161,7 @@ testcov: $(pysources)
155161
python setup.py test --addopts "--cov cwltool -n$(nproc) --dist=loadfile"
156162

157163
sloccount.sc: ${PYSOURCES} Makefile
158-
sloccount --duplicates --wide --details $^ > sloccount.sc
164+
sloccount --duplicates --wide --details $^ > $@
159165

160166
## sloccount : count lines of code
161167
sloccount: ${PYSOURCES} Makefile
@@ -165,7 +171,6 @@ list-author-emails:
165171
@echo 'name, E-Mail Address'
166172
@git log --format='%aN,%aE' | sort -u | grep -v 'root'
167173

168-
169174
mypy2: ${PYSOURCES}
170175
rm -Rf typeshed/2and3/ruamel/yaml
171176
ln -s $(shell python -c 'from __future__ import print_function; import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
@@ -187,9 +192,11 @@ mypy3: ${PYSOURCES}
187192
MYPYPATH=$$MYPYPATH:typeshed/3:typeshed/2and3 mypy --disallow-untyped-calls \
188193
--warn-redundant-casts \
189194
cwltool
190-
191-
release: FORCE
195+
release-test: FORCE
196+
git diff-index --quiet HEAD -- || ( echo You have uncommited changes, please commit them and try again; false )
192197
./release-test.sh
198+
199+
release: release-test
193200
. testenv2/bin/activate && \
194201
testenv2/src/${MODULE}/setup.py sdist bdist_wheel && \
195202
pip install twine && \

0 commit comments

Comments
 (0)