janware/jw-pkg
Watch
1
Code Pull requests Activity Actions

py-xxx.mk: Clean more python tool caches
All checks were successful
CI / Packaging - Kali Linux (pull_request) Successful in 4m6s
Details
CI / Packaging - OpenSUSE Tumbleweed (pull_request) Successful in 4m6s
Details
CI / Packaging test (pull_request) Successful in 0s
Details
CI / Packaging - Kali Linux (push) Successful in 4m2s
Details
CI / Packaging - OpenSUSE Tumbleweed (push) Successful in 3m54s
Details
CI / Packaging test (push) Successful in 0s
Details

Browse source 
.mypy_cache, .ruff_cache and .pytest_cache are not consistently
cleaned in all subdirectories. Fix that.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-07-09 07:47:25 +02:00
commit 36af4a590f
Signed by: Jan Lindemann
GPG key ID: 3750640C9E25DD61
5 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
make/py-defs.mk
View file

@ -73,7 +73,6 @@ endif
ifneq ($(PY_DEFS_MK_INCLUDED),true) ifneq ($(PY_DEFS_MK_INCLUDED),true)
all: all:
clean: pyc.clean
echo-py: echo-py:
@echo 'PYTHON = $(PYTHON)' @echo 'PYTHON = $(PYTHON)'
@ -86,8 +85,6 @@ echo-py:
@echo 'PY_INSTALL_MOD = $(PY_INSTALL_MOD)' @echo 'PY_INSTALL_MOD = $(PY_INSTALL_MOD)'
@echo 'PY_INSTALL_SUB_MOD = $(PY_INSTALL_SUB_MOD)' @echo 'PY_INSTALL_SUB_MOD = $(PY_INSTALL_SUB_MOD)'
pyc.clean:
$(RM) -rf $(wildcard *.pyc) __pycache__
libpath: py-libpath libpath: py-libpath
py-libpath: py-libpath:
@echo 'export PYTHONPATH = $(PYTHONPATH)' @echo 'export PYTHONPATH = $(PYTHONPATH)'

6
make/py-path.mk
View file

@ -5,3 +5,9 @@ ifeq ($(origin JW_PKG_PYTHON_PATH),undefined)
endif endif
export PYTHONPATH := $(subst $(space),:,$(JW_PKG_PYTHON_PATH)) export PYTHONPATH := $(subst $(space),:,$(JW_PKG_PYTHON_PATH))
export MYPYPATH := $(PYTHONPATH) export MYPYPATH := $(PYTHONPATH)
all:
clean: py-tools.clean
py-tools.clean:
$(RM) -rf $(wildcard *.pyc) __pycache__ .mypy_cache .ruff_cache .pytest_cache

6
make/py-run.mk
View file

@ -20,6 +20,6 @@ run.sh:
echo -e "#!/bin/bash\n\nexport PYTHONPATH=$(PYTHONPATH)\nset -x\nexec $(PYTHON) $(EXE)" '"$$@"' > $@.tmp echo -e "#!/bin/bash\n\nexport PYTHONPATH=$(PYTHONPATH)\nset -x\nexec $(PYTHON) $(EXE)" '"$$@"' > $@.tmp
chmod 755 $@.tmp chmod 755 $@.tmp
mv $@.tmp $@ mv $@.tmp $@
clean-run-sh: clean.py-run:
rm -f run.sh rm -rf run.sh
clean: clean-run-sh clean: clean.py-run

6
make/py-test.mk
View file

@ -18,6 +18,6 @@ $(PY_CONFTEST):
$(PY_CONFTEST_CMD) > $@.tmp $(PY_CONFTEST_CMD) > $@.tmp
mv $@.tmp $@ mv $@.tmp $@
clean: clean.generated clean: clean.py-test
clean.generated: clean.py-test:
rm -f $(PY_GENERATED) rm -rf $(PY_GENERATED) .pytest-cache

3
make/py-topdir.mk
View file

@ -72,9 +72,10 @@ ifneq ($(PY_CHECK_RUFF),)
$(PY_CHECK_RUFF) check --select TC,FA --fix --unsafe-fixes $(PY_CHECK_ROOTS) $(PY_CHECK_RUFF) check --select TC,FA --fix --unsafe-fixes $(PY_CHECK_ROOTS)
endif endif
clean: clean.topdir
clean.topdir: clean.py-check clean.topdir: clean.py-check
clean.py-check: clean.py-check:
rm -rf .mypy_cache rm -rf .mypy_cache .ruff_cache .pytest_cache
pyproject.toml: pyproject.toml:
$(PYTHON) $(JWB_SCRIPT_DIR)/jw-pkg.py -p $(PROJECTS_DIR) -t $(TOPDIR) --topdir-format unaltered projects create-file --format tmpl \ $(PYTHON) $(JWB_SCRIPT_DIR)/jw-pkg.py -p $(PROJECTS_DIR) -t $(TOPDIR) --topdir-format unaltered projects create-file --format tmpl \