fix: add interop layer between older noxfile methods and newer env var logic for the time being

Author: 56kyle

noxfile.py

@@ -6,8 +6,10 @@
 
 import os
 import shutil
+from dataclasses import asdict
 from dataclasses import dataclass
 from pathlib import Path
+from typing import Any
 
 import nox
 import platformdirs
@@ -85,6 +87,22 @@ class RepoMetadata:
     develop_branch=os.getenv("COOKIECUTTER_ROBUST_PYTHON__DEVELOP_BRANCH")
 )
 
+PYTHON_DEMO: RepoMetadata = RepoMetadata(
+    app_name=os.getenv("ROBUST_PYTHON_DEMO__APP_NAME"),
+    app_author=os.getenv("ROBUST_PYTHON_DEMO__APP_AUTHOR"),
+    remote=os.getenv("ROBUST_PYTHON_DEMO__REMOTE"),
+    main_branch=os.getenv("ROBUST_PYTHON_DEMO__MAIN_BRANCH"),
+    develop_branch=os.getenv("ROBUST_PYTHON_DEMO__DEVELOP_BRANCH")
+)
+
+MATURIN_DEMO: RepoMetadata = RepoMetadata(
+    app_name=os.getenv("ROBUST_MATURIN_DEMO__APP_NAME"),
+    app_author=os.getenv("ROBUST_MATURIN_DEMO__APP_AUTHOR"),
+    remote=os.getenv("ROBUST_MATURIN_DEMO__REMOTE"),
+    main_branch=os.getenv("ROBUST_MATURIN_DEMO__MAIN_BRANCH"),
+    develop_branch=os.getenv("ROBUST_MATURIN_DEMO__DEVELOP_BRANCH")
+)
+
 
 @nox.session(python=DEFAULT_TEMPLATE_PYTHON_VERSION, name="generate-demo")
 def generate_demo(session: Session) -> None:
@@ -164,17 +182,25 @@ def test(session: Session) -> None:
     session.run("pytest", "tests")
 
 
-@nox.parametrize(arg_names="add_rust_extension", arg_values_list=[False, True], ids=["no-rust", "rust"])
+@nox.parametrize(
+    arg_names="demo",
+    arg_values_list=[PYTHON_DEMO, MATURIN_DEMO],
+    ids=["robust-python-demo", "robust-maturin-demo"]
+)
 @nox.session(python=DEFAULT_TEMPLATE_PYTHON_VERSION, name="update-demo")
-def update_demo(session: Session, add_rust_extension: bool) -> None:
+def update_demo(session: Session, demo: RepoMetadata) -> None:
     session.log("Installing script dependencies for updating generated project demos...")
     session.install("cookiecutter", "cruft", "platformdirs", "loguru", "python-dotenv", "typer")
 
     session.log("Updating generated project demos...")
     args: list[str] = [*UPDATE_DEMO_OPTIONS]
-    if add_rust_extension:
+    if "maturin" in demo.app_name:
         args.append("--add-rust-extension")
-    session.run("python", UPDATE_DEMO_SCRIPT, *args)
+
+    demo_env: dict[str, Any] = {
+        key.replace(demo.app_name.upper(), "ROBUST_DEMO"): value for key, value in asdict(demo).items()
+    }
+    session.run("python", UPDATE_DEMO_SCRIPT, *args, env=demo_env)
 
 
 @nox.session(python=False, name="release-template")

scripts/update-demo.py

@@ -43,49 +43,44 @@ def update_demo(
     max_python_version: Annotated[str, typer.Option("--max-python-version")] = "3.14"
 ) -> None:
     """Runs precommit in a generated project and matches the template to the results."""
-    try:
-        demo_name: str = get_demo_name(add_rust_extension=add_rust_extension)
-        demo_path: Path = demos_cache_folder / demo_name
-
-        current_branch: str = get_current_branch()
-        template_commit: str = get_current_commit()
-
-        _validate_template_main_not_checked_out(branch=current_branch)
-        require_clean_and_up_to_date_repo(demo_path=demo_path)
-        _checkout_demo_develop_or_existing_branch(demo_path=demo_path, branch=current_branch)
-        last_update_commit: str = get_last_cruft_update_commit(demo_path=demo_path)
-
-        if not is_ancestor(last_update_commit, template_commit):
-            raise ValueError(
-                f"The last update commit '{last_update_commit}' is not an ancestor of the current commit "
-                f"'{template_commit}'."
-            )
-
-        typer.secho(f"Updating demo project at {demo_path=}.", fg="yellow")
-        with work_in(demo_path):
-            if current_branch != "develop":
-                git("checkout", "-b", current_branch)
-
-            uv("python", "pin", min_python_version)
-            uv("python", "install", min_python_version)
-            cruft.update(
-                project_dir=demo_path,
-                template_path=REPO_FOLDER,
-                extra_context={
-                    "project_name": demo_name,
-                    "add_rust_extension": add_rust_extension,
-                    "min_python_version": min_python_version,
-                    "max_python_version": max_python_version
-                },
-            )
-            uv("lock")
-            git("add", ".")
-            git("commit", "-m", f"chore: {last_update_commit} -> {template_commit}", "--no-verify")
-            git("push", "-u", "origin", current_branch)
-
-    except Exception as error:
-        typer.secho(f"error: {error}", fg="red")
-        sys.exit(1)
+    demo_name: str = get_demo_name(add_rust_extension=add_rust_extension)
+    demo_path: Path = demos_cache_folder / demo_name
+
+    current_branch: str = get_current_branch()
+    template_commit: str = get_current_commit()
+
+    _validate_template_main_not_checked_out(branch=current_branch)
+    require_clean_and_up_to_date_repo(demo_path=demo_path)
+    _checkout_demo_develop_or_existing_branch(demo_path=demo_path, branch=current_branch)
+    last_update_commit: str = get_last_cruft_update_commit(demo_path=demo_path)
+
+    if not is_ancestor(last_update_commit, template_commit):
+        raise ValueError(
+            f"The last update commit '{last_update_commit}' is not an ancestor of the current commit "
+            f"'{template_commit}'."
+        )
+
+    typer.secho(f"Updating demo project at {demo_path=}.", fg="yellow")
+    with work_in(demo_path):
+        if current_branch != "develop":
+            git("checkout", "-b", current_branch)
+
+        uv("python", "pin", min_python_version)
+        uv("python", "install", min_python_version)
+        cruft.update(
+            project_dir=demo_path,
+            template_path=REPO_FOLDER,
+            extra_context={
+                "project_name": demo_name,
+                "add_rust_extension": add_rust_extension,
+                "min_python_version": min_python_version,
+                "max_python_version": max_python_version
+            },
+        )
+        uv("lock")
+        git("add", ".")
+        git("commit", "-m", f"chore: {last_update_commit} -> {template_commit}", "--no-verify")
+        git("push", "-u", "origin", current_branch)
 
 
 def _checkout_demo_develop_or_existing_branch(demo_path: Path, branch: str) -> None:

scripts/util.py

@@ -129,10 +129,14 @@ def run_command(command: str, *args: str, ignore_error: bool = False) -> Optiona
 
 def require_clean_and_up_to_date_repo(demo_path: Path) -> None:
     """Checks if the repo is clean and up to date with any important branches."""
-    with work_in(demo_path):
-        git("fetch")
-        git("status", "--porcelain")
-        validate_is_synced_ancestor(ancestor=DEMO.main_branch, descendent=DEMO.develop_branch)
+    try:
+        with work_in(demo_path):
+            git("fetch")
+            git("status", "--porcelain")
+            validate_is_synced_ancestor(ancestor=DEMO.main_branch, descendent=DEMO.develop_branch)
+    except Exception as e:
+        typer.secho(f"Failed initial repo state check.")
+        raise e
 
 
 def validate_is_synced_ancestor(ancestor: str, descendent: str) -> None: