rhiza 0.8.4__tar.gz → 0.8.5__tar.gz

{rhiza-0.8.4 → rhiza-0.8.5}/.github/workflows/rhiza_book.yml

@@ -50,7 +50,10 @@ jobs:
         run: |
           export UV_EXTRA_INDEX_URL="${{ secrets.uv-extra-index-url }}"
           # will just use .python-version?
-          uv sync --all-extras --frozen
+          uv sync --all-extras --all-groups --frozen
+
+      - name: Install dev dependencies
+        run: bash .rhiza/scripts/install-dev-deps.sh
 
       - name: "Make the book"
         run: |

{rhiza-0.8.4 → rhiza-0.8.5}/.github/workflows/rhiza_ci.yml

@@ -26,10 +26,15 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          version: "0.9.21"
+
       - id: versions
         run: |
           # Generate Python versions JSON from the script
-          JSON=$(python ./.rhiza/utils/version_matrix.py)
+          JSON=$(make -s version-matrix)
           echo "list=$JSON" >> "$GITHUB_OUTPUT"
 
       - name: Debug matrix
@@ -60,14 +65,10 @@ jobs:
         run: |
           export UV_EXTRA_INDEX_URL="${{ secrets.uv-extra-index-url }}"
           uv venv --python ${{ matrix.python-version }}
-          uv sync --all-extras --frozen
+          uv sync --all-extras --all-groups --frozen
 
-      - name: Install dependencies
-        run: |
-          if [ -f "tests/requirements.txt" ]; then
-            uv pip install -r tests/requirements.txt
-          fi
-          uv pip install pytest
+      - name: Install dev dependencies
+        run: bash .rhiza/scripts/install-dev-deps.sh
 
       - name: Run tests
         run: uv run pytest tests

{rhiza-0.8.4 → rhiza-0.8.5}/.github/workflows/rhiza_deptry.yml

@@ -33,11 +33,8 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Run deptry
-        run: |
-          set -euo pipefail
-          if [ -d "src" ]; then
-            SOURCE_FOLDER="src"
-          else
-            SOURCE_FOLDER="."
-          fi
-          uvx deptry "$SOURCE_FOLDER"
+        run: make deptry
+        # NOTE: make deptry is good style because it encapsulates the folders to check
+        # (e.g. src and book/marimo) and keeps CI in sync with local development.
+        # Since we use a 'uv' container, the Makefile is optimized to use the
+        # pre-installed 'uv' and 'uvx' from the system PATH.

{rhiza-0.8.4 → rhiza-0.8.5}/.github/workflows/rhiza_release.yml

@@ -118,7 +118,7 @@ jobs:
         run: |
           export UV_EXTRA_INDEX_URL="${{ secrets.uv-extra-index-url }}"
           # will just use .python-version?
-          uv sync --all-extras --frozen
+          uv sync --all-extras --all-groups --frozen
 
       - name: Verify version matches tag
         if: hashFiles('pyproject.toml') != ''
@@ -329,7 +329,7 @@ jobs:
         run: |
           export UV_EXTRA_INDEX_URL="${{ secrets.uv-extra-index-url }}"
           # will just use .python-version?
-          uv sync --all-extras --frozen
+          uv sync --all-extras --all-groups --frozen
 
       - name: Set up Python
         uses: actions/setup-python@v6

rhiza-0.8.5/.rhiza/.cfg.toml

@@ -0,0 +1,31 @@
+[tool.bumpversion]
+parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)(?:-(?P<release>[a-z]+)\\.(?P<pre_n>\\d+))?(?:\\+build\\.(?P<build_n>\\d+))?"
+serialize = ["{major}.{minor}.{patch}-{release}.{pre_n}+build.{build_n}", "{major}.{minor}.{patch}+build.{build_n}", "{major}.{minor}.{patch}-{release}.{pre_n}", "{major}.{minor}.{patch}"]
+search = "{current_version}"
+replace = "{new_version}"
+regex = false
+ignore_missing_version = false
+ignore_missing_files = false
+tag = false
+sign_tags = false
+tag_name = "v{new_version}"
+tag_message = "Bump version: {current_version} → {new_version}"
+allow_dirty = false
+commit = false
+message = "Chore: bump version {current_version} → {new_version}"
+commit_args = ""
+
+[tool.bumpversion.parts.release]
+optional_value = "prod"
+values = [
+    "dev",
+    "alpha",
+    "beta",
+    "rc",
+    "prod"
+]
+
+[[tool.bumpversion.files]]
+filename = "pyproject.toml"
+search = 'version = "{current_version}"'
+replace = 'version = "{new_version}"'

{rhiza-0.8.4 → rhiza-0.8.5}/.rhiza/history

@@ -5,13 +5,10 @@
 #
 # Files under template control:
 .editorconfig
-.github/dependabot.yml
 .github/workflows/rhiza_book.yml
 .github/workflows/rhiza_ci.yml
 .github/workflows/rhiza_codeql.yml
 .github/workflows/rhiza_deptry.yml
-.github/workflows/rhiza_devcontainer.yml
-.github/workflows/rhiza_docker.yml
 .github/workflows/rhiza_marimo.yml
 .github/workflows/rhiza_pre-commit.yml
 .github/workflows/rhiza_release.yml
@@ -21,16 +18,21 @@
 .pre-commit-config.yaml
 .rhiza/docs/CONFIG.md
 .rhiza/docs/TOKEN_SETUP.md
+.rhiza/requirements/README.md
+.rhiza/requirements/docs.txt
+.rhiza/requirements/marimo.txt
+.rhiza/requirements/tests.txt
+.rhiza/requirements/tools.txt
 .rhiza/scripts/book.sh
 .rhiza/scripts/bump.sh
 .rhiza/scripts/customisations/build-extras.sh
 .rhiza/scripts/customisations/post-release.sh
 .rhiza/scripts/generate-coverage-badge.sh
+.rhiza/scripts/install-dev-deps.sh
 .rhiza/scripts/marimushka.sh
 .rhiza/scripts/release.sh
 .rhiza/scripts/update-readme-help.sh
 .rhiza/utils/version_matrix.py
-.rhiza/utils/version_max.py
 CODE_OF_CONDUCT.md
 CONTRIBUTING.md
 Makefile
@@ -60,5 +62,6 @@ tests/test_rhiza/test_marimushka_script.py
 tests/test_rhiza/test_notebooks.py
 tests/test_rhiza/test_readme.py
 tests/test_rhiza/test_release_script.py
+tests/test_rhiza/test_requirements_folder.py
 tests/test_rhiza/test_structure.py
 tests/test_rhiza/test_updatereadme_script.py

rhiza-0.8.5/.rhiza/requirements/README.md

@@ -0,0 +1,27 @@
+# Requirements Folder
+
+This folder contains the development dependencies for the Rhiza project, organized by purpose.
+
+## Files
+
+- **tests.txt** - Testing dependencies (pytest, pytest-cov, pytest-html)
+- **marimo.txt** - Marimo notebook dependencies
+- **docs.txt** - Documentation generation dependencies (pdoc)
+- **tools.txt** - Development tools (pre-commit, python-dotenv)
+
+## Usage
+
+These requirements files are automatically installed by the `make install` command.
+
+To install specific requirement files manually:
+
+```bash
+uv pip install -r .rhiza/requirements/tests.txt
+uv pip install -r .rhiza/requirements/marimo.txt
+uv pip install -r .rhiza/requirements/docs.txt
+uv pip install -r .rhiza/requirements/tools.txt
+```
+
+## CI/CD
+
+GitHub Actions workflows automatically install these requirements as needed.

rhiza-0.8.5/.rhiza/requirements/docs.txt

@@ -0,0 +1,2 @@
+# Documentation dependencies for rhiza
+pdoc>=16.0.0

rhiza-0.8.5/.rhiza/requirements/marimo.txt

@@ -0,0 +1,2 @@
+# Marimo dependencies for rhiza
+marimo>=0.18.0

rhiza-0.8.5/.rhiza/requirements/tests.txt

@@ -0,0 +1,4 @@
+# Test dependencies for rhiza
+pytest==9.0.2
+pytest-cov>=7.0.0
+pytest-html>=4.1.1

rhiza-0.8.5/.rhiza/requirements/tools.txt

@@ -0,0 +1,3 @@
+# Development tool dependencies for rhiza
+pre-commit==4.5.1
+python-dotenv==1.2.1

rhiza-0.8.5/.rhiza/scripts/install-dev-deps.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# Install dev dependencies from .rhiza/requirements/*.txt files
+# This script is used by GitHub Actions workflows to install development dependencies
+
+set -euo pipefail
+
+REQUIREMENTS_DIR=".rhiza/requirements"
+
+if [ ! -d "$REQUIREMENTS_DIR" ]; then
+    echo "Warning: Requirements directory $REQUIREMENTS_DIR not found, skipping dev dependencies install" >&2
+    exit 0
+fi
+
+echo "Installing dev dependencies from $REQUIREMENTS_DIR"
+
+shopt -s nullglob
+for req_file in "$REQUIREMENTS_DIR"/*.txt; do
+    if [ -f "$req_file" ]; then
+        echo "Installing requirements from $req_file"
+        uv pip install -r "$req_file"
+    fi
+done
+shopt -u nullglob
+
+echo "Dev dependencies installed successfully"

rhiza-0.8.5/.rhiza/utils/version_matrix.py

@@ -0,0 +1,117 @@
+#!/usr/bin/env python3
+"""Emit the list of supported Python versions from pyproject.toml.
+
+This helper is used in GitHub Actions to compute the test matrix.
+"""
+
+import json
+import re
+import tomllib
+from pathlib import Path
+
+PYPROJECT = Path(__file__).resolve().parents[2] / "pyproject.toml"
+CANDIDATES = ["3.11", "3.12", "3.13", "3.14"]  # extend as needed
+
+
+def parse_version(v: str) -> tuple[int, ...]:
+    """Parse a version string into a tuple of integers.
+
+    This is intentionally simple and only supports numeric components.
+    If a component contains non-numeric suffixes (e.g. '3.11.0rc1'),
+    the leading numeric portion will be used (e.g. '0rc1' -> 0). If a
+    component has no leading digits at all, a ValueError is raised.
+    """
+    parts: list[int] = []
+    for part in v.split("."):
+        match = re.match(r"\d+", part)
+        if not match:
+            msg = f"Invalid version component {part!r} in version {v!r}; expected a numeric prefix."
+            raise ValueError(msg)
+        parts.append(int(match.group(0)))
+    return tuple(parts)
+
+
+def _check_operator(version_tuple: tuple[int, ...], op: str, spec_v_tuple: tuple[int, ...]) -> bool:
+    """Check if a version tuple satisfies an operator constraint."""
+    operators = {
+        ">=": lambda v, s: v >= s,
+        "<=": lambda v, s: v <= s,
+        ">": lambda v, s: v > s,
+        "<": lambda v, s: v < s,
+        "==": lambda v, s: v == s,
+        "!=": lambda v, s: v != s,
+    }
+    return operators[op](version_tuple, spec_v_tuple)
+
+
+def satisfies(version: str, specifier: str) -> bool:
+    """Check if a version satisfies a comma-separated list of specifiers.
+
+    This is a simplified version of packaging.specifiers.SpecifierSet.
+    Supported operators: >=, <=, >, <, ==, !=
+    """
+    version_tuple = parse_version(version)
+
+    # Split by comma for multiple constraints
+    for spec in specifier.split(","):
+        spec = spec.strip()
+        # Match operator and version part
+        match = re.match(r"(>=|<=|>|<|==|!=)\s*([\d.]+)", spec)
+        if not match:
+            # If no operator, assume ==
+            if re.match(r"[\d.]+", spec):
+                if version_tuple != parse_version(spec):
+                    return False
+                continue
+            raise ValueError(f"Invalid specifier: {spec}")
+
+        op, spec_v = match.groups()
+        spec_v_tuple = parse_version(spec_v)
+
+        if not _check_operator(version_tuple, op, spec_v_tuple):
+            return False
+
+    return True
+
+
+def supported_versions() -> list[str]:
+    """Return all supported Python versions declared in pyproject.toml.
+
+    Reads project.requires-python, evaluates candidate versions against the
+    specifier, and returns the subset that satisfy the constraint, in ascending order.
+
+    Returns:
+        list[str]: The supported versions (e.g., ["3.11", "3.12"]).
+    """
+    # Load pyproject.toml using the tomllib standard library (Python 3.11+)
+    with PYPROJECT.open("rb") as f:
+        data = tomllib.load(f)
+
+    # Extract the requires-python field from project metadata
+    # This specifies the Python version constraint (e.g., ">=3.11")
+    spec_str = data.get("project", {}).get("requires-python")
+    if not spec_str:
+        msg = "pyproject.toml: missing 'project.requires-python'"
+        raise KeyError(msg)
+
+    # Filter candidate versions to find which ones satisfy the constraint
+    versions: list[str] = []
+    for v in CANDIDATES:
+        if satisfies(v, spec_str):
+            versions.append(v)
+
+    if not versions:
+        msg = f"pyproject.toml: no supported Python versions match '{spec_str}'"
+        raise ValueError(msg)
+
+    return versions
+
+
+if __name__ == "__main__":
+    # Check if pyproject.toml exists in the expected location
+    # If it exists, use it to determine supported versions
+    # Otherwise, fall back to returning all candidates (for edge cases)
+    if PYPROJECT.exists():
+        print(json.dumps(supported_versions()))
+    else:
+        print(json.dumps(CANDIDATES))

{rhiza-0.8.4 → rhiza-0.8.5}/Makefile

@@ -34,8 +34,8 @@ RESET := \033[0m
 	update-readme
 
 UV_INSTALL_DIR ?= ./bin
-UV_BIN := ${UV_INSTALL_DIR}/uv
-UVX_BIN := ${UV_INSTALL_DIR}/uvx
+UV_BIN ?= $(shell command -v uv 2>/dev/null || echo ${UV_INSTALL_DIR}/uv)
+UVX_BIN ?= $(shell command -v uvx 2>/dev/null || echo ${UV_INSTALL_DIR}/uvx)
 VENV ?= .venv
 
 export UV_NO_MODIFY_PATH := 1
@@ -54,11 +54,13 @@ install-uv: ## ensure uv/uvx is installed
 	# Ensure the ${UV_INSTALL_DIR} folder exists
 	@mkdir -p ${UV_INSTALL_DIR}
 
-	# Install uv/uvx only if they are not already present
-	@if [ -x "${UV_INSTALL_DIR}/uv" ] && [ -x "${UV_INSTALL_DIR}/uvx" ]; then \
+	# Install uv/uvx only if they are not already present in PATH or in the install dir
+	@if command -v uv >/dev/null 2>&1 && command -v uvx >/dev/null 2>&1; then \
+	  :; \
+	elif [ -x "${UV_INSTALL_DIR}/uv" ] && [ -x "${UV_INSTALL_DIR}/uvx" ]; then \
 	  printf "${BLUE}[INFO] uv and uvx already installed in ${UV_INSTALL_DIR}, skipping.${RESET}\n"; \
 	else \
-	  printf "${BLUE}[INFO] Installing uv and uvx...${RESET}\n"; \
+	  printf "${BLUE}[INFO] Installing uv and uvx into ${UV_INSTALL_DIR}...${RESET}\n"; \
 	  if ! curl -LsSf https://astral.sh/uv/install.sh | UV_INSTALL_DIR="${UV_INSTALL_DIR}" sh >/dev/null 2>&1; then \
 	    printf "${RED}[ERROR] Failed to install uv${RESET}\n"; \
 	    exit 1; \
@@ -84,16 +86,11 @@ install: install-uv install-extras ## install
 	  printf "${BLUE}[INFO] Using existing virtual environment at ${VENV}, skipping creation${RESET}\n"; \
 	fi
 
-	# Check if there is requirements.txt file in the tests folder
-	@if [ -f "tests/requirements.txt" ]; then \
-	  ${UV_BIN} pip install -r tests/requirements.txt || { printf "${RED}[ERROR] Failed to install test requirements${RESET}\n"; exit 1; }; \
-	fi
-
 	# Install the dependencies from pyproject.toml (if it exists)
 	@if [ -f "pyproject.toml" ]; then \
 	  if [ -f "uv.lock" ]; then \
 	    printf "${BLUE}[INFO] Installing dependencies from lock file${RESET}\n"; \
-	    ${UV_BIN} sync --all-extras --frozen || { printf "${RED}[ERROR] Failed to install dependencies${RESET}\n"; exit 1; }; \
+	    ${UV_BIN} sync --all-extras --all-groups --frozen || { printf "${RED}[ERROR] Failed to install dependencies${RESET}\n"; exit 1; }; \
 	  else \
 	    printf "${YELLOW}[WARN] uv.lock not found. Generating lock file and installing dependencies...${RESET}\n"; \
 	    ${UV_BIN} sync --all-extras || { printf "${RED}[ERROR] Failed to install dependencies${RESET}\n"; exit 1; }; \
@@ -102,6 +99,22 @@ install: install-uv install-extras ## install
 	  printf "${YELLOW}[WARN] No pyproject.toml found, skipping install${RESET}\n"; \
 	fi
 
+	# Install dev dependencies from .rhiza/requirements/*.txt files
+	@if [ -d ".rhiza/requirements" ] && ls .rhiza/requirements/*.txt >/dev/null 2>&1; then \
+	  for req_file in .rhiza/requirements/*.txt; do \
+	    if [ -f "$$req_file" ]; then \
+	      printf "${BLUE}[INFO] Installing requirements from $$req_file${RESET}\n"; \
+	      ${UV_BIN} pip install -r "$$req_file" || { printf "${RED}[ERROR] Failed to install requirements from $$req_file${RESET}\n"; exit 1; }; \
+	    fi; \
+	  done; \
+	fi
+
+	# Check if there is requirements.txt file in the tests folder (legacy support)
+	@if [ -f "tests/requirements.txt" ]; then \
+	  printf "${BLUE}[INFO] Installing requirements from tests/requirements.txt${RESET}\n"; \
+	  ${UV_BIN} pip install -r tests/requirements.txt || { printf "${RED}[ERROR] Failed to install test requirements${RESET}\n"; exit 1; }; \
+	fi
+
 sync: ## sync with template repository as defined in .github/template.yml
 	@if git remote get-url origin 2>/dev/null | grep -iq 'jebel-quant/rhiza'; then \
 		printf "${BLUE}[INFO] Skipping sync in rhiza repository (no template.yml by design)${RESET}\n"; \
@@ -150,10 +163,16 @@ marimo: install ## fire up Marimo server
 
 ##@ Quality and Formatting
 deptry: install-uv ## Run deptry
-	@if [ -d src ]; then \
-		$(UVX_BIN) deptry src; \
-	else \
-		$(UVX_BIN) deptry .; \
+	@if [ -d ${SOURCE_FOLDER} ]; then \
+		$(UVX_BIN) deptry ${SOURCE_FOLDER}; \
+	fi
+
+	@if [ -d ${MARIMO_FOLDER} ]; then \
+		if [ -d ${SOURCE_FOLDER} ]; then \
+			$(UVX_BIN) deptry ${MARIMO_FOLDER} ${SOURCE_FOLDER} --ignore DEP004; \
+		else \
+		  	$(UVX_BIN) deptry ${MARIMO_FOLDER} --ignore DEP004; \
+		fi \
 	fi
 
 fmt: install-uv ## check the pre-commit hooks and the linting
@@ -197,6 +216,9 @@ customisations: ## list available customisation scripts
 update-readme: ## update README.md with current Makefile help output
 	@/bin/sh "${SCRIPTS_FOLDER}/update-readme-help.sh"
 
+version-matrix: install-uv ## Emit the list of supported Python versions from pyproject.toml
+	@${UV_BIN} run .rhiza/utils/version_matrix.py
+
 # debugger tools
 custom-%: ## run a custom script (usage: make custom-scriptname)
 	@SCRIPT="${CUSTOM_SCRIPTS_FOLDER}/$*.sh"; \

{rhiza-0.8.4 → rhiza-0.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rhiza
-Version: 0.8.4
+Version: 0.8.5
 Summary: Reusable configuration templates for modern Python projects
 Project-URL: Homepage, https://github.com/jebel-quant/rhiza-cli
 Project-URL: Repository, https://github.com/jebel-quant/rhiza-cli
@@ -23,16 +23,6 @@ Requires-Dist: jinja2>=3.1.0
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: pyyaml==6.0.3
 Requires-Dist: typer>=0.20.0
-Provides-Extra: dev
-Requires-Dist: marimo==0.18.4; extra == 'dev'
-Requires-Dist: pdoc>=16.0.0; extra == 'dev'
-Requires-Dist: pre-commit==4.5.1; extra == 'dev'
-Requires-Dist: pytest-cov>=7.0.0; extra == 'dev'
-Requires-Dist: pytest-html>=4.1.1; extra == 'dev'
-Requires-Dist: pytest==9.0.2; extra == 'dev'
-Requires-Dist: python-dotenv==1.2.1; extra == 'dev'
-Provides-Extra: tools
-Requires-Dist: rhiza-tools; extra == 'tools'
 Description-Content-Type: text/markdown
 
 <div align="center">

{rhiza-0.8.4 → rhiza-0.8.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rhiza"
-version = "0.8.4"
+version = "0.8.5"
 description = "Reusable configuration templates for modern Python projects"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -38,27 +38,20 @@ Repository = "https://github.com/jebel-quant/rhiza-cli"
 Issues = "https://github.com/jebel-quant/rhiza/issues-cli"
 
 
-[project.optional-dependencies]
+[dependency-groups]
+tools = ["rhiza-tools>=0.1.2"]
+
 dev = [
-    "pytest-cov>=7.0.0",
-    "pytest-html>=4.1.1",
-    "pytest==9.0.2",
-    "pre-commit==4.5.1",
-    "marimo==0.18.4",
-    "pdoc>=16.0.0",
-    "python-dotenv==1.2.1"
+    "numpy>=2.4",
+    "marimo>=0.18.0",
+    "pandas>=2.3",
+    "plotly>=6.5",
 ]
-tools = ["rhiza-tools"]
-
 
 [tool.hatch.build.targets.wheel]
 # Use src-layout: package code is under src/config
 packages = ["src/rhiza"]
 
-[tool.deptry]
-# see https://deptry.com/usage/#pep-621-dev-dependency-groups
-pep621_dev_dependency_groups = ["dev"]
-
 [tool.deptry.package_module_name_map]
 PyYAML = "yaml"
 

{rhiza-0.8.4 → rhiza-0.8.5}/tests/Makefile.tests

@@ -9,11 +9,11 @@ TESTS_FOLDER := tests
 
 ##@ Development and Testing
 test: install ## run all tests
-	@if [ -d ${SOURCE_FOLDER} ] && [ -d ${TESTS_FOLDER} ]; then \
+	@if [ -d ${TESTS_FOLDER} ]; then \
 	  mkdir -p _tests/html-coverage _tests/html-report; \
 	  ${VENV}/bin/python -m pytest ${TESTS_FOLDER} --ignore=${TESTS_FOLDER}/benchmarks --cov=${SOURCE_FOLDER} --cov-report=term --cov-report=html:_tests/html-coverage --cov-report=json:_tests/coverage.json --html=_tests/html-report/report.html; \
 	else \
-	  printf "${YELLOW}[WARN] Source folder ${SOURCE_FOLDER} or tests folder ${TESTS_FOLDER} not found, skipping tests${RESET}\n"; \
+	  printf "${YELLOW}[WARN] Test folder ${TESTS_FOLDER} not found, skipping tests${RESET}\n"; \
 	fi
 
 benchmark: install ## run performance benchmarks

{rhiza-0.8.4 → rhiza-0.8.5}/tests/test_rhiza/test_makefile.py

@@ -34,12 +34,6 @@ def strip_ansi(text: str) -> str:
     return ansi_escape.sub("", text)
 
 
-@pytest.fixture
-def expected_uv_install_dir() -> str:
-    """Get the expected UV_INSTALL_DIR from environment or default to ./bin."""
-    return os.environ.get("UV_INSTALL_DIR", "./bin")
-
-
 @pytest.fixture(autouse=True)
 def setup_tmp_makefile(logger, root, tmp_path: Path):
     """Copy the Makefile and split Makefiles into a temp directory and chdir there.
@@ -136,23 +130,14 @@ class TestMakefile:
         assert "Targets:" in out
         assert "Bootstrap" in out or "Meta" in out  # section headers
 
-    def test_fmt_target_dry_run(self, logger, expected_uv_install_dir):
+    def test_fmt_target_dry_run(self, logger):
         """Fmt target should invoke pre-commit via uvx in dry-run output."""
         proc = run_make(logger, ["fmt"])
         out = proc.stdout
         # Check for uvx command with the configured path
-        expected_uvx = f"{expected_uv_install_dir}/uvx"
-        assert f"{expected_uvx} pre-commit run --all-files" in out
-
-    def test_deptry_target_dry_run(self, logger, expected_uv_install_dir):
-        """Deptry target should invoke deptry via uvx in dry-run output."""
-        proc = run_make(logger, ["deptry"])
-        out = proc.stdout
-        # Check for uvx command with the configured path
-        expected_uvx = f"{expected_uv_install_dir}/uvx"
-        assert f"{expected_uvx} deptry ." in out
+        assert "uvx pre-commit run --all-files" in out
 
-    def test_test_target_dry_run(self, logger, expected_uv_install_dir):
+    def test_test_target_dry_run(self, logger):
         """Test target should invoke pytest via uv with coverage and HTML outputs in dry-run output."""
         proc = run_make(logger, ["test"])
         out = proc.stdout
@@ -162,14 +147,13 @@ class TestMakefile:
         # expected_uv = f"{expected_uv_install_dir}/uv"
         # assert f"{expected_uv} run pytest" in out
 
-    def test_book_target_dry_run(self, logger, expected_uv_install_dir):
+    def test_book_target_dry_run(self, logger):
         """Book target should run inline commands to assemble the book without go-task."""
         proc = run_make(logger, ["book"])
         out = proc.stdout
         # Expect marimushka export to install marimo and minibook to be invoked
         # Check for uvx command with the configured path
-        expected_uvx = f"{expected_uv_install_dir}/uvx"
-        assert f"{expected_uvx} minibook" in out
+        assert "uvx minibook" in out
 
     @pytest.mark.parametrize("target", ["book", "docs", "marimushka"])
     def test_book_related_targets_fallback_without_book_folder(self, logger, tmp_path, target):
@@ -193,29 +177,6 @@ class TestMakefile:
         out = strip_ansi(proc.stdout)
         assert "Value of UV_NO_MODIFY_PATH:\n1" in out
 
-    def test_uv_install_dir_is_bin(self, logger, expected_uv_install_dir):
-        """`UV_INSTALL_DIR` can be configured via environment variable or defaults to ./bin."""
-        proc = run_make(logger, ["print-UV_INSTALL_DIR"], dry_run=False)
-        out = strip_ansi(proc.stdout)
-        # Check if UV_INSTALL_DIR is set in environment, otherwise expect default ./bin
-        assert f"Value of UV_INSTALL_DIR:\n{expected_uv_install_dir}" in out
-
-    def test_uv_bin_is_bin_uv(self, logger, expected_uv_install_dir):
-        """`UV_BIN` is derived from UV_INSTALL_DIR environment variable or defaults to ./bin/uv."""
-        proc = run_make(logger, ["print-UV_BIN"], dry_run=False)
-        out = strip_ansi(proc.stdout)
-        # Check if UV_INSTALL_DIR is set in environment, otherwise expect default ./bin
-        expected_bin = f"{expected_uv_install_dir}/uv"
-        assert f"Value of UV_BIN:\n{expected_bin}" in out
-
-    def test_uvx_bin_is_bin_uvx(self, logger, expected_uv_install_dir):
-        """`UVX_BIN` is derived from UV_INSTALL_DIR environment variable or defaults to ./bin/uvx."""
-        proc = run_make(logger, ["print-UVX_BIN"], dry_run=False)
-        out = strip_ansi(proc.stdout)
-        # Check if UV_INSTALL_DIR is set in environment, otherwise expect default ./bin
-        expected_bin = f"{expected_uv_install_dir}/uvx"
-        assert f"Value of UVX_BIN:\n{expected_bin}" in out
-
     def test_script_folder_is_github_scripts(self, logger):
         """`SCRIPTS_FOLDER` should point to `.rhiza/scripts`."""
         proc = run_make(logger, ["print-SCRIPTS_FOLDER"], dry_run=False)

{rhiza-0.8.4 → rhiza-0.8.5}/tests/test_rhiza/test_release_script.py

@@ -8,12 +8,11 @@ Tests call the script from a temporary clone and use a small mock `uv`
 to avoid external dependencies.
 """
 
-import shutil
 import subprocess
 
 # Get shell path once at module level
-SHELL = shutil.which("sh") or "/bin/sh"
-GIT = shutil.which("git") or "/usr/bin/git"
+SHELL = "/bin/sh"
+GIT = "/usr/bin/git"
 
 
 def test_release_creates_tag(git_repo):