rhiza 0.2.0__tar.gz → 0.3.0__tar.gz

{rhiza-0.2.0 → rhiza-0.3.0}/.devcontainer/devcontainer.json

@@ -43,6 +43,6 @@
             ]
         }
     },
-    "onCreateCommand": ".devcontainer/startup.sh",
+    "onCreateCommand": ".devcontainer/bootstrap.sh",
     "remoteUser": "vscode"
 }

{rhiza-0.2.0 → rhiza-0.3.0}/.github/scripts/marimushka.sh

@@ -43,11 +43,21 @@ case "$UVX_BIN" in
   *) ;;
 esac
 
+# Resolve UV_BIN to absolute path
+case "$UV_BIN" in
+  /*) ;;
+  */*) UV_BIN="$CURRENT_DIR/$UV_BIN" ;;
+  *) ;;
+esac
+
+# Derive UV_INSTALL_DIR from UV_BIN
+UV_INSTALL_DIR=$(dirname "$UV_BIN")
+
 # Change to the notebook directory to ensure relative paths in notebooks work correctly
 cd "$MARIMO_FOLDER"
 
 # Run marimushka export
-"$UVX_BIN" "marimushka>=0.1.9" export --notebooks "." --output "$OUTPUT_DIR" --bin-path "$CURRENT_DIR/bin"
+"$UVX_BIN" "marimushka>=0.1.9" export --notebooks "." --output "$OUTPUT_DIR" --bin-path "$UV_INSTALL_DIR"
 
 # Ensure GitHub Pages does not process with Jekyll
 : > "$OUTPUT_DIR/.nojekyll"

{rhiza-0.2.0 → rhiza-0.3.0}/Makefile

@@ -30,6 +30,7 @@ BOOK_SUBTITLE := Generated by minibook
 SCRIPTS_FOLDER := .github/scripts
 CUSTOM_SCRIPTS_FOLDER := .github/scripts/customisations
 PDOC_TEMPLATE_DIR := book/pdoc-templates
+BOOK_TEMPLATE := book/minibook-templates/custom.html.jinja2
 DOCFORMAT :=
 
 export UV_NO_MODIFY_PATH := 1
@@ -110,7 +111,7 @@ marimo: install ## fire up Marimo server
 	@if [ ! -d "${MARIMO_FOLDER}" ]; then \
 	  printf " ${YELLOW}[WARN] Marimo folder '${MARIMO_FOLDER}' not found, skipping start${RESET}\n"; \
 	else \
-	  ${UV_BIN} run --with marimo marimo edit "${MARIMO_FOLDER}"; \
+	  ${UV_BIN} run --with marimo marimo edit --no-token --headless "${MARIMO_FOLDER}"; \
 	fi
 
 marimushka: install-uv ## export Marimo notebooks to HTML
@@ -162,7 +163,12 @@ docs: install ## create documentation with pdoc
 book: test docs marimushka ## compile the companion book
 	@${UV_BIN} pip install marimo
 	@/bin/sh "${SCRIPTS_FOLDER}/book.sh"
-	@${UVX_BIN} minibook --title "${BOOK_TITLE}" --subtitle "${BOOK_SUBTITLE}" --links "$$(python3 -c 'import json,sys; print(json.dumps(json.load(open("_book/links.json"))))')" --output "_book"
+	@TEMPLATE_ARG=""; \
+	if [ -f "${BOOK_TEMPLATE}" ]; then \
+	  TEMPLATE_ARG="--template ${BOOK_TEMPLATE}"; \
+	  printf "${BLUE}[INFO] Using book template ${BOOK_TEMPLATE}${RESET}\n"; \
+	fi; \
+	${UVX_BIN} minibook --title "${BOOK_TITLE}" --subtitle "${BOOK_SUBTITLE}" $$TEMPLATE_ARG --links "$$(python3 -c 'import json,sys; print(json.dumps(json.load(open("_book/links.json"))))')" --output "_book"
 	@touch "_book/.nojekyll"
 
 fmt: install-uv ## check the pre-commit hooks and the linting

{rhiza-0.2.0 → rhiza-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rhiza
-Version: 0.2.0
+Version: 0.3.0
 Summary: Reusable configuration templates for modern Python projects
 Project-URL: Homepage, https://github.com/jebel-quant/rhiza
 Project-URL: Repository, https://github.com/jebel-quant/rhiza
@@ -8,7 +8,7 @@ Project-URL: Issues, https://github.com/jebel-quant/rhiza/issues
 Author: Thomas Schmelzer
 License: MIT
 License-File: LICENSE
-Keywords: ci,configuration,ruff,taskfile,templates
+Keywords: ci,configuration,ruff,templates
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
@@ -19,9 +19,6 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Build Tools
 Requires-Python: >=3.11
-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'
@@ -205,6 +202,28 @@ Hello, World!
 0.71
 ```
 
+## 🎨 Documentation Customization
+
+You can customize the look and feel of your documentation by providing your own templates.
+
+### API Documentation (pdoc)
+
+The `make docs` command checks for a directory at `book/pdoc-templates`. If found, it uses the templates within that directory to generate the API documentation.
+
+To customize the API docs:
+1. Create the directory: `mkdir -p book/pdoc-templates`
+2. Add your Jinja2 templates (e.g., `module.html.jinja2`) to this directory.
+
+See the [pdoc documentation](https://pdoc.dev/docs/pdoc.html#templates) for more details on templating.
+
+### Companion Book (minibook)
+
+The `make book` command checks for a template at `book/minibook-templates/custom.html.jinja2`. If found, it uses this template for the minibook generation.
+
+To customize the book:
+1. Create the directory: `mkdir -p book/minibook-templates`
+2. Create your custom template at `book/minibook-templates/custom.html.jinja2`.
+
 ## 📁 Available Templates
 
 This repository provides a curated set of reusable configuration templates, organised by purpose.

{rhiza-0.2.0 → rhiza-0.3.0}/README.md

@@ -172,6 +172,28 @@ Hello, World!
 0.71
 ```
 
+## 🎨 Documentation Customization
+
+You can customize the look and feel of your documentation by providing your own templates.
+
+### API Documentation (pdoc)
+
+The `make docs` command checks for a directory at `book/pdoc-templates`. If found, it uses the templates within that directory to generate the API documentation.
+
+To customize the API docs:
+1. Create the directory: `mkdir -p book/pdoc-templates`
+2. Add your Jinja2 templates (e.g., `module.html.jinja2`) to this directory.
+
+See the [pdoc documentation](https://pdoc.dev/docs/pdoc.html#templates) for more details on templating.
+
+### Companion Book (minibook)
+
+The `make book` command checks for a template at `book/minibook-templates/custom.html.jinja2`. If found, it uses this template for the minibook generation.
+
+To customize the book:
+1. Create the directory: `mkdir -p book/minibook-templates`
+2. Create your custom template at `book/minibook-templates/custom.html.jinja2`.
+
 ## 📁 Available Templates
 
 This repository provides a curated set of reusable configuration templates, organised by purpose.

{rhiza-0.2.0 → rhiza-0.3.0}/book/marimo/df.py

@@ -25,7 +25,9 @@ app = marimo.App(width="medium")
 
 @app.cell
 def _():
-    from rhiza.commands.hello import hello
+    # from rhiza.commands.hello import hello
+    def hello():
+        return "Guten Tach"
 
     hello()
     return

rhiza-0.3.0/book/minibook-templates/custom.html.jinja2

@@ -0,0 +1,210 @@
+<! DOCTYPE html>
+<html lang="en" class="dark">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>{{ title }}</title>
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script>
+        tailwind.config = {
+            darkMode: 'class',
+            theme: {
+                extend:  {
+                    animation: {
+                        'gradient': 'gradient 15s ease infinite',
+                    },
+                    keyframes:  {
+                        gradient: {
+                            '0%, 100%': { backgroundPosition: '0% 50%' },
+                            '50%': { backgroundPosition:  '100% 50%' },
+                        }
+                    }
+                }
+            }
+        }
+    </script>
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=Inter: wght@300;400;500;600;700&display=swap');
+
+        body {
+            font-family: 'Inter', sans-serif;
+        }
+
+        .link-card {
+            /* Animation removed as requested */
+        }
+
+        .gradient-text {
+            background-clip: text;
+            -webkit-background-clip:  text;
+            color: transparent;
+            background-image: linear-gradient(to right, #6366f1, #8b5cf6, #d946ef);
+        }
+
+        /* Logo styling */
+        .logo-img {
+            max-height: 60px;
+            width: auto;
+        }
+
+        /* Light mode styles */
+        html:not(.dark) body {
+            background-color: #f9fafb;
+            color:  #1f2937;
+        }
+
+        html:not(.dark) .theme-container {
+            background: linear-gradient(to bottom right, #f3f4f6, #e5e7eb, #f3f4f6);
+        }
+
+        html: not(.dark) .content-container {
+            background-color: rgba(255, 255, 255, 0.8);
+            border-color: #e5e7eb;
+        }
+
+        html:not(.dark) .link-card a {
+            background-color: rgba(243, 244, 246, 0.5);
+            border-color: #e5e7eb;
+        }
+
+        html:not(.dark) .link-card a:hover {
+            background-color: rgba(249, 250, 251, 0.5);
+            border-color: #6366f1;
+        }
+
+        html:not(.dark) .card-title {
+            color: #1f2937;
+        }
+
+        html:not(.dark) .card-url {
+            color:  #6b7280;
+        }
+
+        html:not(.dark) .footer-border {
+            border-color: #e5e7eb;
+        }
+
+        html:not(.dark) .footer-text {
+            color: #6b7280;
+        }
+    </style>
+    <script>
+        // Check for saved theme preference or use default (dark)
+        document.addEventListener('DOMContentLoaded', () => {
+            const theme = localStorage.getItem('theme') || 'dark';
+            document.documentElement. className = theme;
+
+            // Update toggle button appearance
+            updateToggleButton();
+        });
+
+        // Toggle between dark and light themes
+        function toggleTheme() {
+            const html = document.documentElement;
+            const newTheme = html.classList.contains('dark') ? '' : 'dark';
+
+            html.className = newTheme;
+            localStorage.setItem('theme', newTheme);
+
+            // Update toggle button appearance
+            updateToggleButton();
+        }
+
+        // Update toggle button icon based on current theme
+        function updateToggleButton() {
+            const isDark = document.documentElement.classList. contains('dark');
+            const sunIcon = document.getElementById('sun-icon');
+            const moonIcon = document.getElementById('moon-icon');
+
+            if (isDark) {
+                sunIcon.classList.remove('hidden');
+                moonIcon. classList.add('hidden');
+            } else {
+                sunIcon. classList.add('hidden');
+                moonIcon.classList.remove('hidden');
+            }
+        }
+    </script>
+</head>
+<body class="dark:bg-black dark:text-gray-200 text-gray-800 font-sans leading-normal tracking-normal min-h-screen">
+    <div class="theme-container dark:bg-gradient-to-br dark:from-gray-900 dark:via-gray-800 dark:to-gray-900 min-h-screen py-12 px-4 sm: px-6 dark:animate-gradient dark:bg-[length: 200%_200%]">
+        <div class="content-container container max-w-4xl mx-auto backdrop-blur-sm dark:bg-black/30 rounded-xl shadow-2xl p-8 border dark:border-gray-800">
+            
+            <!-- LOGO SECTION - ADD THIS -->
+            <div class="flex justify-center mb-6">
+                <img src="https://raw.githubusercontent.com/Jebel-Quant/rhiza/main/assets/rhiza-logo.svg" alt="Logo" class="logo-img">
+            </div>
+            <!-- END LOGO SECTION -->
+
+            <div class="flex items-center justify-between mb-8">
+                <div>
+                    <h1 class="text-4xl font-bold mb-2 gradient-text">{{ title }}</h1>
+                    {% if description %}
+                    <div class="dark:text-gray-400 text-gray-600 italic">{{ description }}</div>
+                    {% endif %}
+                </div>
+                <div class="flex items-center space-x-4">
+                    <button onclick="toggleTheme()" class="flex items-center px-3 py-2 rounded-lg dark: bg-gray-800 bg-gray-200 border dark:border-gray-700 border-gray-300 hover:border-indigo-500 transition-colors duration-200">
+                        <!-- Sun icon for dark mode (shows when in dark mode) -->
+                        <svg id="sun-icon" xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2 text-yellow-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z" />
+                        </svg>
+                        <!-- Moon icon for light mode (shows when in light mode) -->
+                        <svg id="moon-icon" xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2 text-indigo-600 hidden" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20.354 15.354A9 9 0 018.646 3.646 9.003 9.003 0 0012 21a9.003 9.003 0 008.354-5.646z" />
+                        </svg>
+                        <span class="dark:text-white text-gray-800 text-sm font-medium">Toggle Theme</span>
+                    </button>
+                    <a href="{{ repository_url }}" target="_blank" class="flex items-center px-3 py-2 rounded-lg dark:bg-gray-800 bg-gray-200 border dark:border-gray-700 border-gray-300 hover:border-indigo-500 transition-colors duration-200">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2 dark:text-indigo-400 text-indigo-600" fill="currentColor" viewBox="0 0 24 24">
+                            <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
+                        </svg>
+                        <span class="dark:text-white text-gray-800 text-sm font-medium">Home Repo</span>
+                    </a>
+                </div>
+            </div>
+
+            <div class="grid grid-cols-1 md: grid-cols-2 gap-4 mb-8">
+                {% for name, url in links %}
+                <div class="link-card group">
+                    <a href="{{ url }}" target="_blank" class="block p-4 rounded-lg dark:bg-gray-800/50 bg-gray-100/80 border dark:border-gray-700 border-gray-300 dark:hover:border-indigo-500 hover: border-indigo-600 transition-all duration-200">
+                        <div class="flex items-center">
+                            <div class="flex-shrink-0 w-10 h-10 rounded-full bg-gradient-to-r from-indigo-500 to-purple-600 flex items-center justify-center mr-4 group-hover:from-purple-600 group-hover:to-pink-600 transition-all duration-200">
+                                <span class="text-white font-bold">{{ name[0] | upper }}</span>
+                            </div>
+                            <div>
+                                <h3 class="card-title text-lg font-medium dark:text-white text-gray-800 dark:group-hover:text-indigo-300 group-hover:text-indigo-600 transition-colors duration-200">{{ name }}</h3>
+                                <p class="card-url text-xs dark:text-gray-400 text-gray-500 truncate">{{ url }}</p>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                {% endfor %}
+            </div>
+
+            <div class="mt-12 pt-6 border-t footer-border dark:border-gray-800 border-gray-300 text-center">
+                <div class="footer-text dark:text-gray-500 text-gray-600 text-sm mb-2">
+                    Generated by <a href="https://pypi.org/project/minibook/" class="dark:text-indigo-400 text-indigo-600 dark:hover:text-indigo-300 hover: text-indigo-500 transition-colors duration-200 font-medium">MiniBook</a> on {{ timestamp }}
+                </div>
+                <div class="flex items-center justify-center space-x-2 mb-2">
+                    <span class="footer-text dark:text-gray-500 text-gray-600">A product by</span>
+                    <a href="https://jqr.ae" class="dark:text-indigo-400 text-indigo-600 dark:hover:text-indigo-300 hover: text-indigo-500 transition-colors duration-200 font-medium flex items-center">
+                        jqr
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 ml-1" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14" />
+                        </svg>
+                    </a>
+                </div>
+                <div class="flex items-center justify-center">
+                    <a href="https://pypi.org/project/minibook/" class="dark:text-indigo-400 text-indigo-600 dark:hover:text-indigo-300 hover:text-indigo-500 transition-colors duration-200 font-medium flex items-center">
+                        PyPI Package
+                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 ml-1" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14" />
+                        </svg>
+                    </a>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

rhiza-0.3.0/book/pdoc-templates/module.html.jinja2

@@ -0,0 +1,19 @@
+{% extends "default/module.html.jinja2" %}
+
+{% block nav %}
+<style>
+    .logo img {
+        width: 100%;
+        max-width: 100px;
+        height: auto;
+        display: block;
+        margin: 0 auto 20px;
+    }
+</style>
+<div class="logo">
+    <a href="https://github.com/Jebel-Quant/rhiza" title="Home">
+        <img src="https://raw.githubusercontent.com/Jebel-Quant/rhiza/main/assets/rhiza-logo.svg" alt="Rhiza Logo">
+    </a>
+</div>
+{{ super() }}
+{% endblock nav %}

{rhiza-0.2.0 → rhiza-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rhiza"
-version = "0.2.0"
+version = "0.3.0"
 description = "Reusable configuration templates for modern Python projects"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -12,7 +12,7 @@ license = { text = "MIT" }
 authors = [
   { name = "Thomas Schmelzer" }
 ]
-keywords = ["templates", "configuration", "taskfile", "ci", "ruff"]
+keywords = ["templates", "configuration", "ci", "ruff"]
 classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
@@ -25,12 +25,6 @@ classifiers = [
     "Topic :: Software Development :: Build Tools",
 ]
 
-dependencies = [
-    "loguru>=0.7.3",
-    "typer>=0.20.0",
-    "PyYAML==6.0.3"
-]
-
 [project.urls]
 Homepage = "https://github.com/jebel-quant/rhiza"
 Repository = "https://github.com/jebel-quant/rhiza"
@@ -55,11 +49,5 @@ packages = ["src/rhiza"]
 # see https://deptry.com/usage/#pep-621-dev-dependency-groups
 pep621_dev_dependency_groups = ["dev"]
 
-[tool.deptry.package_module_name_map]
-PyYAML = "yaml"
-
 [tool.marimo.runtime]
 pythonpath = ["src"]
-
-[project.scripts]
-rhiza = "rhiza.__main__:app"

{rhiza-0.2.0 → rhiza-0.3.0}/tests/test_rhiza/conftest.py

@@ -14,6 +14,32 @@ import subprocess
 
 import pytest
 
+MOCK_MAKE_SCRIPT = """#!/usr/bin/env python3
+import sys
+
+if len(sys.argv) > 1 and sys.argv[1] == "help":
+    print("Mock Makefile Help")
+    print("target: ## Description")
+"""
+
+MOCK_UVX_SCRIPT = """#!/usr/bin/env python3
+import sys
+import os
+
+# args look like: marimushka>=0.1.9 export --notebooks . --output /path/to/output --bin-path ...
+args = sys.argv[1:]
+if "export" in args:
+    try:
+        if "--output" in args:
+            output_idx = args.index("--output")
+            output_dir = args[output_idx + 1]
+            os.makedirs(output_dir, exist_ok=True)
+            with open(os.path.join(output_dir, "index.html"), "w") as f:
+                f.write("<html>Mock Export</html>")
+    except ValueError:
+        pass
+"""
+
 MOCK_UV_SCRIPT = """#!/usr/bin/env python3
 import sys
 import re
@@ -50,7 +76,12 @@ def bump_version(current, bump_type):
 def main():
     args = sys.argv[1:]
     # Expected invocations from release.sh start with 'version'
-    if not args or args[0] != "version":
+    if not args:
+        sys.exit(1)
+
+    if args[0] != "version":
+        # It might be a uvx call if we use the same script, but let's keep them separate or handle it here.
+        # For now, let's assume this is only for uv version commands as per original design.
         sys.exit(1)
 
     # uv version --short
@@ -157,6 +188,16 @@ def git_repo(root, tmp_path, monkeypatch):
         f.write(MOCK_UV_SCRIPT)
     uv_path.chmod(0o755)
 
+    uvx_path = bin_dir / "uvx"
+    with open(uvx_path, "w") as f:
+        f.write(MOCK_UVX_SCRIPT)
+    uvx_path.chmod(0o755)
+
+    make_path = bin_dir / "make"
+    with open(make_path, "w") as f:
+        f.write(MOCK_MAKE_SCRIPT)
+    make_path.chmod(0o755)
+
     # Ensure our bin comes first on PATH so 'uv' resolves to mock
     monkeypatch.setenv("PATH", f"{bin_dir}:{os.environ.get('PATH', '')}")
 
@@ -166,9 +207,13 @@ def git_repo(root, tmp_path, monkeypatch):
 
     shutil.copy(root / ".github" / "scripts" / "release.sh", script_dir / "release.sh")
     shutil.copy(root / ".github" / "scripts" / "bump.sh", script_dir / "bump.sh")
+    shutil.copy(root / ".github" / "scripts" / "marimushka.sh", script_dir / "marimushka.sh")
+    shutil.copy(root / ".github" / "scripts" / "update-readme-help.sh", script_dir / "update-readme-help.sh")
 
     (script_dir / "release.sh").chmod(0o755)
     (script_dir / "bump.sh").chmod(0o755)
+    (script_dir / "marimushka.sh").chmod(0o755)
+    (script_dir / "update-readme-help.sh").chmod(0o755)
 
     # Commit and push initial state
     subprocess.run(["git", "config", "user.email", "test@example.com"], check=True)

{rhiza-0.2.0 → rhiza-0.3.0}/tests/test_rhiza/test_makefile.py

@@ -27,6 +27,12 @@ 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 only the Makefile into a temp directory and chdir there.
@@ -100,32 +106,40 @@ class TestMakefile:
         assert "Targets:" in out
         assert "Bootstrap" in out or "Meta" in out  # section headers
 
-    def test_fmt_target_dry_run(self, logger):
+    def test_fmt_target_dry_run(self, logger, expected_uv_install_dir):
         """Fmt target should invoke pre-commit via uvx in dry-run output."""
         proc = run_make(logger, ["fmt"])
         out = proc.stdout
-        assert "./bin/uvx pre-commit run --all-files" in out
+        # 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):
+    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
-        assert './bin/uvx deptry "src"' in out
+        # Check for uvx command with the configured path
+        expected_uvx = f"{expected_uv_install_dir}/uvx"
+        assert f'{expected_uvx} deptry "src"' in out
 
-    def test_test_target_dry_run(self, logger):
+    def test_test_target_dry_run(self, logger, expected_uv_install_dir):
         """Test target should invoke pytest via uv with coverage and HTML outputs in dry-run output."""
         proc = run_make(logger, ["test"])
         out = proc.stdout
         # Expect key steps
         assert "mkdir -p _tests/html-coverage _tests/html-report" in out
-        assert "./bin/uv run pytest" in out
+        # Check for uv command with the configured path
+        expected_uv = f"{expected_uv_install_dir}/uv"
+        assert f"{expected_uv} run pytest" in out
 
-    def test_book_target_dry_run(self, logger):
+    def test_book_target_dry_run(self, logger, expected_uv_install_dir):
         """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
-        assert "./bin/uvx minibook" in out
+        # Check for uvx command with the configured path
+        expected_uvx = f"{expected_uv_install_dir}/uvx"
+        assert f"{expected_uvx} minibook" in out
 
     def test_all_target_dry_run(self, logger):
         """All target echoes a composite message in dry-run output."""
@@ -140,23 +154,28 @@ 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):
-        """`UV_INSTALL_DIR` should point to `./bin`."""
+    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)
-        assert "Value of UV_INSTALL_DIR:\n./bin" in out
+        # 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):
-        """`UV_BIN` should point to `./bin/uv`."""
+    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)
-        assert "Value of UV_BIN:\n./bin/uv" in out
+        # 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):
-        """`UVX_BIN` should point to `./bin/uvx`."""
+    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)
-        assert "Value of UVX_BIN:\n./bin/uvx" in out
+        # 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 `.github/scripts`."""