From bdf3217a63eb17b4fb4314f01bc42ac6305c9f7a Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Fri, 21 Jun 2024 18:10:01 -0500 Subject: [PATCH] Avoid rebuilding packages when running check targets --- Makefile_pgwui.mk | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Makefile_pgwui.mk b/Makefile_pgwui.mk index 52d7348..97c646e 100644 --- a/Makefile_pgwui.mk +++ b/Makefile_pgwui.mk @@ -67,7 +67,7 @@ publish: check-manifest upload push ## run_tests Run regression tests .PHONY: run_tests -run_tests: devel/testenv +run_tests: devel/testenv dist if [ -x $(PYENV_BIN)/pyenv ] ; then \ (set -e ; \ export PYENV_ROOT=$(PYENV_INSTALLATION) ; \ @@ -182,6 +182,7 @@ update_testenv: devel/testenv # Development related targets +DEVEL_DEPS := setup.py pyproject.toml MANIFEST.in # Run linters .PHONY: run-linters @@ -190,12 +191,13 @@ run-linters: devel/pytest [ -e .yamllint.yaml ] && devel/pytest/bin/yamllint --strict . # Re-create development environment when build environment changes -devel: setup.py pyproject.toml MANIFEST.in +devel: $(DEVEL_DEPS) rm -rf devel ${TOX_STUFF} mkdir -p devel # virtualenv for package building -devel/buildenv: devel +devel/buildenv: $(DEVEL_DEPS) + mkdir -p devel [ -d devel/buildenv ] \ || ( ${VIRTUALENV} devel/buildenv ; \ devel/buildenv/bin/pip install --upgrade pip ; \ @@ -204,7 +206,8 @@ devel/buildenv: devel ) # virtualenv for development -devel/testenv: devel +devel/testenv: $(DEVEL_DEPS) + mkdir -p devel [ -d devel/testenv ] \ || ( ${VIRTUALENV} devel/testenv ; \ devel/testenv/bin/pip install --upgrade pip ; \ @@ -214,7 +217,8 @@ devel/testenv: devel ) # virtualenv for pytest and other code tests -devel/pytest: devel dist +devel/pytest: $(DEVEL_DEPS) + mkdir -p devel if [ ! -d devel/pytest ] ; then \ ( ${VIRTUALENV} devel/pytest ; \ devel/pytest/bin/pip install --upgrade pip ; \ @@ -234,7 +238,8 @@ devel/pytest: devel dist fi # virtualenv for pudb -devel/pudb: devel dist +devel/pudb: $(DEVEL_DEPS) + mkdir -p devel if [ ! -d devel/pudb ] ; then \ ( ${VIRTUALENV} devel/pudb ; \ devel/pudb/bin/pip install --upgrade pip ; \ -- 2.34.1