From 1aa15969a69bf23e6d4b998a6b628b3def72d765 Mon Sep 17 00:00:00 2001 From: Thomas Schmelzer Date: Wed, 4 Feb 2026 19:00:54 +0400 Subject: [PATCH 1/5] Add MARIMO_FOLDER to deptry configuration variables Conditionally append MARIMO_FOLDER to DEPTRY_FOLDERS and add --ignore DEP004 to DEPTRY_IGNORE when the directory exists. Co-Authored-By: Claude Opus 4.5 --- .rhiza/make.d/03-marimo.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.rhiza/make.d/03-marimo.mk b/.rhiza/make.d/03-marimo.mk index 25975735..6bce2f07 100644 --- a/.rhiza/make.d/03-marimo.mk +++ b/.rhiza/make.d/03-marimo.mk @@ -1,6 +1,12 @@ ## Makefile.marimo - Marimo notebook targets # This file is included by the main Makefile +# Add MARIMO_FOLDER to deptry configuration if it exists +ifneq ($(wildcard $(MARIMO_FOLDER)),) +DEPTRY_FOLDERS += $(MARIMO_FOLDER) +DEPTRY_IGNORE += --ignore DEP004 +endif + # Declare phony targets (they don't produce files) .PHONY: marimo-validate marimo marimushka From a3625a41884f4e05b127b8ac79c2727c345c626a Mon Sep 17 00:00:00 2001 From: Thomas Schmelzer Date: Wed, 4 Feb 2026 19:05:02 +0400 Subject: [PATCH 2/5] Add SOURCE_FOLDER to deptry configuration variables Create src.mk to conditionally append SOURCE_FOLDER to DEPTRY_FOLDERS when the directory exists. Co-Authored-By: Claude Opus 4.5 --- .rhiza/make.d/src.mk | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .rhiza/make.d/src.mk diff --git a/.rhiza/make.d/src.mk b/.rhiza/make.d/src.mk new file mode 100644 index 00000000..08fbf211 --- /dev/null +++ b/.rhiza/make.d/src.mk @@ -0,0 +1,7 @@ +## Makefile.src - Source folder configuration +# This file is included by the main Makefile + +# Add SOURCE_FOLDER to deptry configuration if it exists +ifneq ($(wildcard $(SOURCE_FOLDER)),) +DEPTRY_FOLDERS += $(SOURCE_FOLDER) +endif From e3d271f47c4ee0f94f07eca2f5449b07449160c5 Mon Sep 17 00:00:00 2001 From: Thomas Schmelzer Date: Wed, 4 Feb 2026 19:07:56 +0400 Subject: [PATCH 3/5] Add deptry target to src.mk Run deptry on all folders in DEPTRY_FOLDERS with DEPTRY_IGNORE flags. Co-Authored-By: Claude Opus 4.5 --- .rhiza/make.d/src.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.rhiza/make.d/src.mk b/.rhiza/make.d/src.mk index 08fbf211..93f9e752 100644 --- a/.rhiza/make.d/src.mk +++ b/.rhiza/make.d/src.mk @@ -5,3 +5,11 @@ ifneq ($(wildcard $(SOURCE_FOLDER)),) DEPTRY_FOLDERS += $(SOURCE_FOLDER) endif + +##@ Quality and Formatting +deptry: install-uv ## Run deptry + @printf "${BLUE}[INFO] DEPTRY_FOLDERS: ${DEPTRY_FOLDERS}${RESET}\n" + @if [ -n "$(strip ${DEPTRY_FOLDERS})" ]; then \ + printf "${BLUE}[INFO] Running: $(UVX_BIN) -p ${PYTHON_VERSION} deptry ${DEPTRY_FOLDERS} ${DEPTRY_IGNORE}${RESET}\n"; \ + $(UVX_BIN) -p ${PYTHON_VERSION} deptry ${DEPTRY_FOLDERS} ${DEPTRY_IGNORE}; \ + fi From f6d177d9709f3fb3571c9aa8499e31e70e8570cc Mon Sep 17 00:00:00 2001 From: Thomas Schmelzer Date: Wed, 4 Feb 2026 19:09:56 +0400 Subject: [PATCH 4/5] Remove deptry target from rhiza.mk The deptry target is now defined in src.mk with configurable DEPTRY_FOLDERS and DEPTRY_IGNORE variables. Co-Authored-By: Claude Opus 4.5 --- .rhiza/rhiza.mk | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.rhiza/rhiza.mk b/.rhiza/rhiza.mk index 12485d88..415b130e 100644 --- a/.rhiza/rhiza.mk +++ b/.rhiza/rhiza.mk @@ -230,19 +230,6 @@ clean: ## Clean project artifacts and stale local branches @git branch -vv | awk '/: gone]/{print $$1}' | xargs -r git branch -D ##@ Quality and Formatting -deptry: install-uv ## Run deptry - @if [ -d ${SOURCE_FOLDER} ]; then \ - $(UVX_BIN) -p ${PYTHON_VERSION} deptry ${SOURCE_FOLDER}; \ - fi - - @if [ -d ${MARIMO_FOLDER} ]; then \ - if [ -d ${SOURCE_FOLDER} ]; then \ - $(UVX_BIN) -p ${PYTHON_VERSION} deptry ${MARIMO_FOLDER} ${SOURCE_FOLDER} --ignore DEP004; \ - else \ - $(UVX_BIN) -p ${PYTHON_VERSION} deptry ${MARIMO_FOLDER} --ignore DEP004; \ - fi \ - fi - fmt: install-uv ## check the pre-commit hooks and the linting @${UVX_BIN} -p ${PYTHON_VERSION} pre-commit run --all-files From 0eae2163d535df9d6c0f91d39b8d0514f5d72df2 Mon Sep 17 00:00:00 2001 From: Thomas Schmelzer Date: Wed, 4 Feb 2026 20:02:03 +0400 Subject: [PATCH 5/5] Add src.mk to SPLIT_MAKEFILES in test fixture The deptry target was moved to src.mk but the test fixture wasn't updated to include this file, causing three test failures. Co-Authored-By: Claude Opus 4.5 --- tests/test_rhiza/test_makefile.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_rhiza/test_makefile.py b/tests/test_rhiza/test_makefile.py index e782ca45..0c408242 100644 --- a/tests/test_rhiza/test_makefile.py +++ b/tests/test_rhiza/test_makefile.py @@ -32,6 +32,7 @@ ".rhiza/make.d/03-marimo.mk", ".rhiza/make.d/04-presentation.mk", ".rhiza/make.d/05-github.mk", + ".rhiza/make.d/src.mk", ]