@@ -72,19 +72,15 @@ dev: install-dep
72
72
# # dist : create a module package for distribution
73
73
dist : dist/${MODULE}-$(VERSION ) .tar.gz
74
74
75
- check-python3 :
76
- # Check that the default python version is python 3
77
- python --version 2>&1 | grep "Python 3"
78
-
79
- dist/${MODULE}-$(VERSION ) .tar.gz : check-python3 $(SOURCES )
80
- python -m build
75
+ dist/${MODULE}-$(VERSION ) .tar.gz : $(SOURCES )
76
+ python3 -m build
81
77
82
78
# # docs : make the docs
83
79
docs : FORCE
84
80
cd docs && $(MAKE ) html
85
81
86
82
# # clean : clean up all temporary / machine-generated files
87
- clean : check-python3 FORCE
83
+ clean : FORCE
88
84
rm -f ${MODULE} /* .pyc tests/* .pyc * .so ${MODULE} /* .so cwltool/cwlprov/* .so
89
85
rm -Rf ${MODULE} /__pycache__/
90
86
rm -Rf build
@@ -163,12 +159,12 @@ diff-cover.html: coverage.xml
163
159
diff-cover --compare-branch=main $^ --html-report $@
164
160
165
161
# # test : run the cwltool test suite
166
- test : check-python3 $(PYSOURCES )
167
- python -m pytest -rs ${PYTEST_EXTRA}
162
+ test : $(PYSOURCES )
163
+ python3 -m pytest -rs ${PYTEST_EXTRA}
168
164
169
165
# # testcov : run the cwltool test suite and collect coverage
170
- testcov : check-python3 $(PYSOURCES )
171
- python -m pytest -rs --cov --cov-config=.coveragerc --cov-report= ${PYTEST_EXTRA}
166
+ testcov : $(PYSOURCES )
167
+ python3 -m pytest -rs --cov --cov-config=.coveragerc --cov-report= ${PYTEST_EXTRA}
172
168
173
169
sloccount.sc : $(PYSOURCES ) Makefile
174
170
sloccount --duplicates --wide --details $^ > $@
@@ -197,7 +193,7 @@ pyupgrade: $(PYSOURCES)
197
193
pyupgrade --exit-zero-even-if-changed --py38-plus $^
198
194
auto-walrus $^
199
195
200
- release-test : check-python3 FORCE
196
+ release-test : FORCE
201
197
git diff-index --quiet HEAD -- || ( echo You have uncommitted changes, please commit them and try again; false )
202
198
./release-test.sh
203
199
@@ -206,7 +202,7 @@ release:
206
202
./release-test.sh && \
207
203
. testenv2/bin/activate && \
208
204
pip install build && \
209
- python -m build testenv2/src/${MODULE} && \
205
+ python3 -m build testenv2/src/${MODULE} && \
210
206
pip install twine && \
211
207
twine upload testenv2/src/${MODULE} /dist/* && \
212
208
git tag ${VERSION} && git push --tags
0 commit comments