From b5cc554f37f2b695bb1ca1884fb56110d22ddf02 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Tue, 13 Apr 2021 17:14:48 -0700 Subject: makefile: change 'deps' to be simple --dev --deploy When I ran 'make deps' as-is, my pipenv mutated the Pipfile and started re-locking. This project isn't using 'black' any more, so don't need the --pre flag. --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5a684f9..bd57d45 100644 --- a/Makefile +++ b/Makefile @@ -11,9 +11,7 @@ help: ## Print info about all commands .PHONY: deps deps: ## Install dependencies from setup.py into pipenv - # We need to use --pre, because e.g. black is considered a pre-release - # version, https://github.com/microsoft/vscode-python/issues/5171 - pipenv install --pre '-e .[dev]' + pipenv install --dev --deploy .PHONY: fmt fmt: ## Apply import sorting and yapf source formatting on all files -- cgit v1.2.3 From 8fced92526fde1d13c2417d01d224de45582443b Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Tue, 13 Apr 2021 17:15:53 -0700 Subject: makefile: run common commands inside pipenv --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bd57d45..a6159f4 100644 --- a/Makefile +++ b/Makefile @@ -15,9 +15,9 @@ deps: ## Install dependencies from setup.py into pipenv .PHONY: fmt fmt: ## Apply import sorting and yapf source formatting on all files - isort --atomic fuzzycat/* - yapf -p -i -r fuzzycat/* - yapf -p -i -r tests + pipenv run isort --atomic fuzzycat/* + pipenv run yapf -p -i -r fuzzycat/* + pipenv run yapf -p -i -r tests .PHONY: dist dist: ## Create source distribution and wheel @@ -32,19 +32,19 @@ xar: ## Create a XAR standalone package (https://github.com/facebookincubator/xa .PHONY: cov cov: ## Run coverage report - pytest --cov=fuzzycat fuzzycat/*.py tests/ # --cov-report annotate:cov_annotate --cov-report html + pipenv run pytest --cov=fuzzycat fuzzycat/*.py tests/ # --cov-report annotate:cov_annotate --cov-report html .PHONY: test test: ## Run coverage report - pytest -o log_cli=true -s -vvv fuzzycat/*.py tests/*.py + pipenv run pytest -o log_cli=true -s -vvv fuzzycat/*.py tests/*.py .PHONY: lint lint: $(PY_FILES) ## Run pylint - pylint fuzzycat + pipenv run pylint fuzzycat .PHONY: mypy mypy: ## Run mypy checks - mypy --strict $$(find fuzzycat -name "*py") + pipenv run mypy --strict $$(find fuzzycat -name "*py") .PHONY: clean clean: ## Clean all artifacts -- cgit v1.2.3