Fixed use of black in Makefile.
This commit is contained in:
parent
551c570098
commit
6eaca82696
|
@ -4,4 +4,5 @@
|
||||||
.venv
|
.venv
|
||||||
.version
|
.version
|
||||||
wallet.json
|
wallet.json
|
||||||
private.py
|
id.json
|
||||||
|
private.py
|
||||||
|
|
21
Makefile
21
Makefile
|
@ -9,26 +9,31 @@ upgrade: ## Upgrade all the build and lint dependencies
|
||||||
poetry upgrade --no-interaction
|
poetry upgrade --no-interaction
|
||||||
|
|
||||||
test: ## Run all the tests
|
test: ## Run all the tests
|
||||||
SOLENV_NAME= SOLENV_ADDRESS= CLUSTER_NAME= CLUSTER_URL= KEYPAIR= poetry run pytest -rP tests
|
SOLENV_NAME= SOLENV_ADDRESS= CLUSTER_NAME= CLUSTER_URL= KEYPAIR= PYTEST_ADDOPTS="-p no:cacheprovider" poetry run pytest -rP tests
|
||||||
|
|
||||||
#cover: test ## Run all the tests and opens the coverage report
|
#cover: test ## Run all the tests and opens the coverage report
|
||||||
# TODO: Coverage
|
# TODO: Coverage
|
||||||
|
|
||||||
|
black:
|
||||||
|
poetry run black --check mango tests bin/*
|
||||||
|
|
||||||
|
flake8:
|
||||||
|
poetry run flake8 --extend-ignore E402,E501,E722,W291,W391 . bin/*
|
||||||
|
|
||||||
mypy:
|
mypy:
|
||||||
|
bash -c "trap 'trap - SIGINT SIGTERM ERR; rm -rf .tmplintdir .mypy_cache; exit 1' SIGINT SIGTERM ERR; $(MAKE) mypy-internal"
|
||||||
|
|
||||||
|
# This target is separated out as an internal so the above line can trap errors and perform
|
||||||
|
# the cleanup while still returning an error code to the shell so callers know it failed.
|
||||||
|
mypy-internal:
|
||||||
rm -rf .tmplintdir .mypy_cache
|
rm -rf .tmplintdir .mypy_cache
|
||||||
mkdir .tmplintdir
|
mkdir .tmplintdir
|
||||||
for file in bin/* ; do \
|
for file in bin/* ; do \
|
||||||
cp $${file} .tmplintdir/$${file##*/}.py ; \
|
cp $${file} .tmplintdir/$${file##*/}.py ; \
|
||||||
done
|
done
|
||||||
-poetry run mypy --strict --install-types --non-interactive mango tests .tmplintdir
|
poetry run mypy --strict --install-types --non-interactive mango tests .tmplintdir
|
||||||
rm -rf .tmplintdir .mypy_cache
|
rm -rf .tmplintdir .mypy_cache
|
||||||
|
|
||||||
flake8:
|
|
||||||
poetry run flake8 --extend-ignore E402,E501,E722,W291,W391 . bin/*
|
|
||||||
|
|
||||||
black:
|
|
||||||
black --check mango tests bin/*
|
|
||||||
|
|
||||||
lint: black flake8 mypy
|
lint: black flake8 mypy
|
||||||
|
|
||||||
ci: test lint ## Run all the tests and code checks
|
ci: test lint ## Run all the tests and code checks
|
||||||
|
|
Loading…
Reference in New Issue