@@ -29,7 +29,7 @@ PYSOURCES=$(wildcard ${MODULE}/**.py tests/*.py) setup.py
2929DEVPKGS =-rdev-requirements.txt -rtest-requirements.txt -rmypy-requirements.txt
3030DEBDEVPKGS =pep8 python-autopep8 pylint python-coverage pydocstyle sloccount \
3131 python-flake8 python-mock shellcheck
32- VERSION =2.3 .$(shell TZ=UTC git log --first-parent --max-count=1 \
32+ VERSION =2.4 .$(shell TZ=UTC git log --first-parent --max-count=1 \
3333 --format=format:% cd --date=format-local:% Y% m% d% H% M% S)
3434
3535# # all : default task (install in dev mode)
@@ -105,10 +105,10 @@ codespell:
105105
106106# # format : check/fix all code indentation and formatting (runs black)
107107format : $(PYSOURCES ) mypy-stubs
108- black $^
108+ black --exclude cwltest/_version.py $^
109109
110110format-check : $(PYSOURCES ) mypy-stubs
111- black --diff --check $^
111+ black --diff --check --exclude cwltest/_version.py $^
112112
113113# # pylint : run static code analysis on Python code
114114pylint : $(PYSOURCES )
@@ -151,7 +151,7 @@ test: $(PYSOURCES)
151151
152152# # testcov : run the cwltest test suite and collect coverage
153153testcov : $(PYSOURCES )
154- python setup.py test --addopts " -- cov" ${PYTEST_EXTRA}
154+ pytest -- cov ${PYTEST_EXTRA}
155155
156156sloccount.sc : $(PYSOURCES ) Makefile
157157 sloccount --duplicates --wide --details $^ > $@
@@ -165,7 +165,7 @@ list-author-emails:
165165 @git log --format=' %aN,%aE' | sort -u | grep -v ' root'
166166
167167mypy3 : mypy
168- mypy : $(filter-out setup.py gittagger.py ,$(PYSOURCES ) )
168+ mypy : $(filter-out setup.py,$(PYSOURCES ) )
169169 MYPYPATH=$$ MYPYPATH:mypy-stubs mypy $^
170170
171171pyupgrade : $(filter-out schema_salad/metaschema.py,$(PYSOURCES ) )
@@ -176,16 +176,18 @@ release-test: FORCE
176176 git diff-index --quiet HEAD -- || ( echo You have uncommitted changes, please commit them and try again; false )
177177 ./release-test.sh
178178
179- release : release-test
179+ release :
180+ export SETUPTOOLS_SCM_PRETEND_VERSION=${VERSION} && \
181+ ./release-test.sh && \
180182 . testenv2/bin/activate && \
181183 pip install build && \
182184 python -m build testenv2/src/${PACKAGE} && \
183185 pip install twine && \
184186 twine upload testenv2/src/${PACKAGE} /dist/* && \
185187 git tag ${VERSION} && git push --tags
186188
187- flake8 : $( PYSOURCES )
188- flake8 $^
189+ flake8 : FORCE
190+ flake8 $( PYSOURCES )
189191
190192FORCE :
191193
0 commit comments