sync

Author: tschm

.github/workflows/rhiza_ci.yml

@@ -37,7 +37,7 @@ jobs:
         uses: ./.github/actions/configure-git-auth
         with:
           token: ${{ secrets.GH_PAT }}
-
+          
       - id: versions
         env:
           UV_EXTRA_INDEX_URL: ${{ secrets.UV_EXTRA_INDEX_URL }}

.rhiza/.cfg.toml

@@ -31,7 +31,7 @@ filename = "pyproject.toml"
 search = 'version = "{current_version}"'
 replace = 'version = "{new_version}"'
 
-[[tool.bumpversion.files]]
-filename = ".rhiza/template-bundles.yml"
-search = 'version: "{current_version}"'
-replace = 'version: "{new_version}"'
+# [[tool.bumpversion.files]]
+# filename = ".rhiza/template-bundles.yml"
+# search = 'version: "{current_version}"'
+# replace = 'version: "{new_version}"'

.rhiza/history

@@ -48,29 +48,23 @@
 .rhiza/scripts/release.sh
 .rhiza/templates/minibook/custom.html.jinja2
 .rhiza/tests/README.md
-.rhiza/tests/__init__.py
-.rhiza/tests/api/__init__.py
 .rhiza/tests/api/conftest.py
 .rhiza/tests/api/test_github_targets.py
 .rhiza/tests/api/test_makefile_api.py
 .rhiza/tests/api/test_makefile_targets.py
 .rhiza/tests/conftest.py
-.rhiza/tests/deps/__init__.py
 .rhiza/tests/deps/test_dependency_health.py
-.rhiza/tests/integration/__init__.py
 .rhiza/tests/integration/test_book_targets.py
 .rhiza/tests/integration/test_marimushka.py
 .rhiza/tests/integration/test_notebook_execution.py
 .rhiza/tests/integration/test_release.py
-.rhiza/tests/structure/__init__.py
 .rhiza/tests/structure/test_project_layout.py
 .rhiza/tests/structure/test_requirements.py
-.rhiza/tests/sync/__init__.py
 .rhiza/tests/sync/conftest.py
 .rhiza/tests/sync/test_docstrings.py
 .rhiza/tests/sync/test_readme_validation.py
 .rhiza/tests/sync/test_rhiza_version.py
-.rhiza/tests/utils/__init__.py
+.rhiza/tests/test_utils.py
 .rhiza/tests/utils/conftest.py
 .rhiza/tests/utils/test_git_repo_fixture.py
 .rhiza/tests/utils/test_version_matrix.py

.rhiza/tests/README.md

@@ -102,11 +102,14 @@ uv run pytest .rhiza/tests/ --cov
 
 ### Import Patterns
 ```python
-# Import from root conftest
-from ..conftest import strip_ansi, run_make
+# Import shared helpers from test_utils
+from test_utils import strip_ansi, run_make, setup_rhiza_git_repo
 
-# Import from category conftest
-from .conftest import setup_tmp_makefile
+# Import from local category conftest (for fixtures and category-specific helpers)
+from api.conftest import SPLIT_MAKEFILES, setup_tmp_makefile
+
+# Note: Fixtures defined in conftest.py are automatically available in tests
+# and don't need to be explicitly imported
 ```
 
 ## Test Coverage

.rhiza/tests/__init__.py

@@ -2,8 +2,8 @@
 
 This conftest provides:
 - setup_tmp_makefile: Copies Makefile and split files to temp dir for isolated testing
-- run_make: Helper to execute make commands with dry-run support
-- setup_rhiza_git_repo: Initialize a git repo configured as rhiza origin
+- run_make: Helper to execute make commands with dry-run support (imported from test_utils)
+- setup_rhiza_git_repo: Initialize a git repo configured as rhiza origin (imported from test_utils)
 - SPLIT_MAKEFILES: List of split Makefile paths
 """
 
@@ -16,8 +16,9 @@
 
 import pytest
 
-# Get absolute paths for executables to avoid S607 warnings from CodeFactor/Bandit
-MAKE = shutil.which("make") or "/usr/bin/make"
+# Import shared utilities (no __init__.py needed with new structure)
+# Note: we define our own run_make and setup_rhiza_git_repo here with enhanced functionality
+from test_utils import MAKE
 
 # Split Makefile paths that are included in the main Makefile
 # These are now located in .rhiza/make.d/ directory

.rhiza/tests/api/__init__.py

@@ -7,7 +7,7 @@
 from __future__ import annotations
 
 # Import run_make from local conftest (setup_tmp_makefile is autouse)
-from .conftest import run_make
+from api.conftest import run_make
 
 
 def test_gh_targets_exist(logger):

.rhiza/tests/api/conftest.py

@@ -91,7 +91,7 @@ def setup_api_env(logger, root, tmp_path: Path):
 
 
 # Import run_make from local conftest
-from .conftest import run_make  # noqa: E402
+from api.conftest import run_make  # noqa: E402
 
 
 def test_api_delegation(logger, setup_api_env):

.rhiza/tests/api/test_github_targets.py

@@ -15,10 +15,10 @@
 import os
 
 import pytest
+from api.conftest import SPLIT_MAKEFILES, run_make, setup_rhiza_git_repo
 
-# Import shared helpers from parent and local conftest
-from ..conftest import strip_ansi
-from .conftest import SPLIT_MAKEFILES, run_make, setup_rhiza_git_repo
+# Import shared helpers from test_utils and local conftest
+from test_utils import strip_ansi
 
 
 class TestMakefile: