rhiza 0.10.1__tar.gz → 0.10.2__tar.gz

{rhiza-0.10.1 → rhiza-0.10.2}/.github/workflows/rhiza_validate.yml

@@ -26,7 +26,7 @@ jobs:
         with:
           token: ${{ secrets.GH_PAT }}
 
-      #- name: Validate Rhiza config
-      #  shell: bash
-      #  run: |
-      #     uvx "rhiza>=0.8.0" validate .
+      - name: Validate Rhiza config
+        shell: bash
+        run: |
+           uvx "rhiza>=0.10.0" validate .

{rhiza-0.10.1 → rhiza-0.10.2}/.pre-commit-config.yaml

@@ -54,7 +54,7 @@ repos:
       - id: uv-lock
   
   - repo: https://github.com/Jebel-Quant/rhiza-hooks
-    rev: v0.1.4  # Use the latest release
+    rev: v0.1.5  # Use the latest release
     hooks:
       # Migrated from rhiza
       - id: check-rhiza-workflow-names
@@ -63,3 +63,5 @@ repos:
       - id: check-rhiza-config
       - id: check-makefile-targets
       - id: check-python-version-consistency
+      - id: check-template-bundles
+

{rhiza-0.10.1 → rhiza-0.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rhiza
-Version: 0.10.1
+Version: 0.10.2
 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

{rhiza-0.10.1 → rhiza-0.10.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rhiza"
-version = "0.10.1"
+version = "0.10.2"
 description = "Reusable configuration templates for modern Python projects"
 readme = "README.md"
 requires-python = ">=3.11"

{rhiza-0.10.1 → rhiza-0.10.2}/src/rhiza/bundle_resolver.py

@@ -1,7 +1,7 @@
 """Bundle resolution logic for template configuration.
 
 This module provides functions to load and resolve bundle configurations
-from the template repository's template_bundles.yml file.
+from the template repository's template-bundles.yml file.
 """
 
 from pathlib import Path
@@ -10,19 +10,19 @@ from rhiza.models import RhizaBundles, RhizaTemplate
 
 
 def load_bundles_from_clone(tmp_dir: Path) -> RhizaBundles | None:
-    """Load .rhiza/template_bundles.yml from cloned template repo.
+    """Load .rhiza/template-bundles.yml from cloned template repo.
 
     Args:
         tmp_dir: Path to the cloned template repository.
 
     Returns:
-        RhizaBundles if template_bundles.yml exists, None otherwise.
+        RhizaBundles if template-bundles.yml exists, None otherwise.
 
     Raises:
-        yaml.YAMLError: If template_bundles.yml is malformed.
-        ValueError: If template_bundles.yml is invalid.
+        yaml.YAMLError: If template-bundles.yml is malformed.
+        ValueError: If template-bundles.yml is invalid.
     """
-    bundles_file = tmp_dir / ".rhiza" / "template_bundles.yml"
+    bundles_file = tmp_dir / ".rhiza" / "template-bundles.yml"
     if not bundles_file.exists():
         return None
     return RhizaBundles.from_yaml(bundles_file)
@@ -54,7 +54,7 @@ def resolve_include_paths(
     # Resolve templates to paths if specified
     if template.templates:
         if not bundles_config:
-            msg = "Template uses templates but template_bundles.yml not found in template repository"
+            msg = "Template uses templates but template-bundles.yml not found in template repository"
             raise ValueError(msg)
         paths.extend(bundles_config.resolve_to_paths(template.templates))
 

{rhiza-0.10.1 → rhiza-0.10.2}/src/rhiza/commands/materialize.py

@@ -121,7 +121,7 @@ def _validate_and_load_template(target: Path, branch: str) -> tuple[RhizaTemplat
     excluded_paths = template.exclude
 
     # Note: We'll resolve templates to paths after cloning the template repo,
-    # since we need access to template_bundles.yml from the template
+    # since we need access to template-bundles.yml from the template
     include_paths = template.include
 
     # Validate that we have either templates or include paths
@@ -545,11 +545,11 @@ def materialize(target: Path, branch: str, target_branch: str | None, force: boo
     logger.debug(f"Temporary directory: {tmp_dir}")
 
     try:
-        # Clone with initial minimal checkout to load template_bundles.yml if needed
+        # Clone with initial minimal checkout to load template-bundles.yml if needed
         initial_paths = [".rhiza"] if template.templates else include_paths
         _clone_template_repository(tmp_dir, git_url, rhiza_branch, initial_paths, git_executable, git_env)
 
-        # Load template_bundles.yml and resolve templates to paths if using template mode
+        # Load template-bundles.yml and resolve templates to paths if using template mode
         if template.templates:
             logger.info("Resolving templates to file paths...")
             try:

{rhiza-0.10.1 → rhiza-0.10.2}/src/rhiza/models.py

@@ -64,7 +64,7 @@ def _normalize_to_list(value: str | list[str] | None) -> list[str]:
 
 @dataclass
 class BundleDefinition:
-    """Represents a single bundle from template_bundles.yml.
+    """Represents a single bundle from template-bundles.yml.
 
     Attributes:
         name: The bundle identifier (e.g., "core", "tests", "github").
@@ -87,7 +87,7 @@ class BundleDefinition:
 
 @dataclass
 class RhizaBundles:
-    """Represents the structure of template_bundles.yml.
+    """Represents the structure of template-bundles.yml.
 
     Attributes:
         version: Version string of the bundles configuration format.
@@ -102,7 +102,7 @@ class RhizaBundles:
         """Load RhizaBundles from a YAML file.
 
         Args:
-            file_path: Path to the template_bundles.yml file.
+            file_path: Path to the template-bundles.yml file.
 
         Returns:
             The loaded bundles configuration.
@@ -163,7 +163,7 @@ class RhizaBundles:
         # Validate all bundles exist
         for name in bundle_names:
             if name not in self.bundles:
-                raise ValueError(f"Bundle '{name}' not found in template_bundles.yml")  # noqa: TRY003
+                raise ValueError(f"Bundle '{name}' not found in template-bundles.yml")  # noqa: TRY003
 
         resolved: list[str] = []
         visiting: set[str] = set()

{rhiza-0.10.1 → rhiza-0.10.2}/tests/test_bundle_resolver.py

@@ -170,8 +170,8 @@ class TestRhizaBundles:
         assert result.index("tests1.txt") < result.index("docs1.txt")
 
     def test_from_yaml_valid(self, tmp_path):
-        """Test loading valid template_bundles.yml."""
-        bundles_file = tmp_path / "template_bundles.yml"
+        """Test loading valid template-bundles.yml."""
+        bundles_file = tmp_path / "template-bundles.yml"
         bundles_file.write_text("""
 version: "1.0"
 bundles:
@@ -200,24 +200,24 @@ bundles:
         assert result.bundles["tests"].depends_on == ["core"]
 
     def test_from_yaml_empty(self, tmp_path):
-        """Test loading empty template_bundles.yml."""
-        bundles_file = tmp_path / "template_bundles.yml"
+        """Test loading empty template-bundles.yml."""
+        bundles_file = tmp_path / "template-bundles.yml"
         bundles_file.write_text("")
 
         with pytest.raises(ValueError, match="Bundles file is empty"):
             RhizaBundles.from_yaml(bundles_file)
 
     def test_from_yaml_missing_version(self, tmp_path):
-        """Test loading template_bundles.yml without version."""
-        bundles_file = tmp_path / "template_bundles.yml"
+        """Test loading template-bundles.yml without version."""
+        bundles_file = tmp_path / "template-bundles.yml"
         bundles_file.write_text("bundles: {}")
 
         with pytest.raises(ValueError, match="missing required field: version"):
             RhizaBundles.from_yaml(bundles_file)
 
     def test_from_yaml_invalid_bundles_type(self, tmp_path):
-        """Test loading template_bundles.yml with invalid bundles type."""
-        bundles_file = tmp_path / "template_bundles.yml"
+        """Test loading template-bundles.yml with invalid bundles type."""
+        bundles_file = tmp_path / "template-bundles.yml"
         bundles_file.write_text("version: '1.0'\nbundles: 'invalid'")
 
         with pytest.raises(TypeError, match="Bundles must be a dictionary"):
@@ -322,7 +322,7 @@ class TestResolveIncludePaths:
             templates=["core"],
         )
 
-        with pytest.raises(ValueError, match=r"Template uses templates but template_bundles\.yml not found"):
+        with pytest.raises(ValueError, match=r"Template uses templates but template-bundles\.yml not found"):
             resolve_include_paths(template, None)
 
     def test_no_configuration(self) -> None:
@@ -339,10 +339,10 @@ class TestLoadBundlesFromClone:
     """Test load_bundles_from_clone function."""
 
     def test_load_existing_bundles(self, tmp_path):
-        """Test loading template_bundles.yml from cloned repo."""
+        """Test loading template-bundles.yml from cloned repo."""
         rhiza_dir = tmp_path / ".rhiza"
         rhiza_dir.mkdir()
-        bundles_file = rhiza_dir / "template_bundles.yml"
+        bundles_file = rhiza_dir / "template-bundles.yml"
         bundles_file.write_text("""
 version: "1.0"
 bundles:
@@ -359,6 +359,6 @@ bundles:
         assert "core" in result.bundles
 
     def test_load_missing_bundles(self, tmp_path):
-        """Test that missing template_bundles.yml returns None."""
+        """Test that missing template-bundles.yml returns None."""
         result = load_bundles_from_clone(tmp_path)
         assert result is None

{rhiza-0.10.1 → rhiza-0.10.2}/tests/test_commands/test_materialize_bundles.py

@@ -7,7 +7,7 @@ from rhiza.models import RhizaTemplate
 
 @pytest.fixture
 def template_repo(tmp_path):
-    """Create a mock template repository with template_bundles.yml."""
+    """Create a mock template repository with template-bundles.yml."""
     repo = tmp_path / "template-repo"
     repo.mkdir()
 
@@ -18,10 +18,10 @@ def template_repo(tmp_path):
     subprocess.run(["git", "config", "user.email", "test@example.com"], cwd=repo, capture_output=True, check=True)
     subprocess.run(["git", "config", "user.name", "Test User"], cwd=repo, capture_output=True, check=True)
 
-    # Create template_bundles.yml
+    # Create template-bundles.yml
     rhiza_dir = repo / ".rhiza"
     rhiza_dir.mkdir()
-    bundles_file = rhiza_dir / "template_bundles.yml"
+    bundles_file = rhiza_dir / "template-bundles.yml"
     bundles_file.write_text("""
 version: "1.0"
 bundles:

{rhiza-0.10.1 → rhiza-0.10.2}/uv.lock

@@ -919,7 +919,7 @@ wheels = [
 
 [[package]]
 name = "rhiza"
-version = "0.10.1"
+version = "0.10.2"
 source = { editable = "." }
 dependencies = [
     { name = "jinja2" },