fix(cli): stabilize --fixture for CI format, types, and env leak

Format catalog helpers, fix pyright on the fixture generator, walk up
for fixture roots, and keep integration scaffolds out of fixture mode.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: ulises-jeremias

packages/create-awesome-python-app/src/create_awesome_python_app/catalog.py

@@ -363,7 +363,7 @@ def catalog_cache_path() -> Path:
 def resolve_fixture_root() -> Path | None:
     """Resolve the repo root that contains ``fixtures/catalog/templates.json``.
 
-    Priority: ``CPA_FIXTURE_DIR`` → package-relative monorepo root → ``cwd``.
+    Priority: ``CPA_FIXTURE_DIR`` → walk-up from package → ``cwd``.
     """
     if _fixture_root_override is not _SENTINEL:
         return _fixture_root_override  # type: ignore[return-value]
@@ -372,12 +372,19 @@ def resolve_fixture_root() -> Path | None:
     if env:
         return Path(env).expanduser().resolve()
 
-    auto = _AUTO_FIXTURE_DIR
-    if (auto / "fixtures" / "catalog" / "templates.json").is_file():
-        return auto
+    def _has_fixture_catalog(root: Path) -> bool:
+        return (root / "fixtures" / "catalog" / "templates.json").is_file()
+
+    if _has_fixture_catalog(_AUTO_FIXTURE_DIR):
+        return _AUTO_FIXTURE_DIR
+
+    # Editable / site-packages layouts vary; walk up from this file.
+    for parent in Path(__file__).resolve().parents:
+        if _has_fixture_catalog(parent):
+            return parent
 
     cwd = Path.cwd()
-    if (cwd / "fixtures" / "catalog" / "templates.json").is_file():
+    if _has_fixture_catalog(cwd):
         return cwd
     return None
 
@@ -505,9 +512,7 @@ def get_catalog_data(*, force_refresh: bool = False) -> dict[str, Any]:
                 )
                 data = fixture
             else:
-                raise RuntimeError(
-                    f"Failed to load template catalog: {err}"
-                ) from err
+                raise RuntimeError(f"Failed to load template catalog: {err}") from err
 
     _memory_cache = data
     _memory_ts = time.time()

packages/create-awesome-python-app/tests/test_catalog_fetch.py

@@ -24,7 +24,7 @@
 
 
 @pytest.fixture(autouse=True)
-def _reset_cache(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+def _reset_cache(tmp_path: Path, monkeypatch: pytest.MonkeyPatch):
     reset_catalog_cache_for_tests()
     reset_fixture_root_for_tests()
     monkeypatch.setenv("CPA_CACHE_DIR", str(tmp_path / "cache"))
@@ -111,9 +111,7 @@ def test_get_catalog_data_fixture_uses_custom_dir(
         "extensions": [],
         "categories": [],
     }
-    (catalog_dir / "templates.json").write_text(
-        json.dumps(payload), encoding="utf-8"
-    )
+    (catalog_dir / "templates.json").write_text(json.dumps(payload), encoding="utf-8")
     monkeypatch.setenv("CPA_CATALOG_FIXTURE", "1")
     monkeypatch.setenv("CPA_FIXTURE_DIR", str(tmp_path))
     data = get_catalog_data(force_refresh=True)

packages/create-awesome-python-app/tests/test_cli.py

@@ -239,7 +239,8 @@ async def fake_check_for_latest_version(_package_name):
 def test_help_mentions_fixture() -> None:
     result = runner.invoke(app, ["--help"])
     assert result.exit_code == 0
-    assert "--fixture" in result.stdout
+    text = (result.stdout or "") + (result.stderr or "")
+    assert "fixture" in text.lower()
 
 
 def test_preprocess_fixture_argv_bare_and_with_dir() -> None:

packages/create-awesome-python-app/tests/test_cpa_templates_integration.py

@@ -21,13 +21,27 @@ def _cpa_templates_available() -> bool:
     return (FASTAPI_TEMPLATE / "pyproject.toml").is_file()
 
 
+def _clean_fixture_env(monkeypatch: pytest.MonkeyPatch) -> None:
+    """Ensure subprocess scaffolds are not forced into fixture mode."""
+    monkeypatch.delenv("CPA_CATALOG_FIXTURE", raising=False)
+    monkeypatch.delenv("CPA_FIXTURE_DIR", raising=False)
+
+
+def _subprocess_env() -> dict[str, str]:
+    env = os.environ.copy()
+    env.pop("CPA_CATALOG_FIXTURE", None)
+    env.pop("CPA_FIXTURE_DIR", None)
+    return env
+
+
 @pytest.mark.skipif(
     not _cpa_templates_available(),
     reason="cpa-templates checkout not available (set CPA_TEMPLATES_ROOT)",
 )
 def test_scaffold_fastapi_starter_from_cpa_templates(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
+    _clean_fixture_env(monkeypatch)
     monkeypatch.setenv("CI", "1")
     monkeypatch.setenv("CPA_SKIP_GIT", "1")
     monkeypatch.setenv("CPA_CACHE_DIR", str(tmp_path / "cpa-cache"))
@@ -48,6 +62,7 @@ def test_scaffold_fastapi_starter_from_cpa_templates(
         cwd=_REPO_ROOT,
         capture_output=True,
         text=True,
+        env=_subprocess_env(),
         check=False,
     )
     assert result.returncode == 0, result.stdout + result.stderr
@@ -78,6 +93,7 @@ def test_scaffold_fastapi_starter_via_catalog_slug(
     """Scaffold using --template fastapi-starter slug (issue #160 / #161)."""
     import json
 
+    _clean_fixture_env(monkeypatch)
     monkeypatch.setenv("CI", "1")
     monkeypatch.setenv("CPA_SKIP_GIT", "1")
     monkeypatch.setenv("CPA_CACHE_DIR", str(tmp_path / "cpa-cache"))
@@ -114,6 +130,7 @@ def test_scaffold_fastapi_starter_via_catalog_slug(
         cwd=_REPO_ROOT,
         capture_output=True,
         text=True,
+        env=_subprocess_env(),
         check=False,
     )
     assert result.returncode == 0, result.stdout + result.stderr
@@ -129,6 +146,7 @@ def test_scaffold_via_catalog_addon_slug(
 ) -> None:
     import json
 
+    _clean_fixture_env(monkeypatch)
     monkeypatch.setenv("CI", "1")
     monkeypatch.setenv("CPA_SKIP_GIT", "1")
     monkeypatch.setenv("CPA_CACHE_DIR", str(tmp_path / "cpa-cache"))
@@ -170,6 +188,7 @@ def test_scaffold_via_catalog_addon_slug(
         cwd=_REPO_ROOT,
         capture_output=True,
         text=True,
+        env=_subprocess_env(),
         check=False,
     )
     assert result.returncode == 0, result.stdout + result.stderr
@@ -183,6 +202,7 @@ def test_scaffold_via_catalog_addon_slug(
 def test_scaffold_fastapi_with_github_setup_extension(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
+    _clean_fixture_env(monkeypatch)
     monkeypatch.setenv("CI", "1")
     monkeypatch.setenv("CPA_SKIP_GIT", "1")
     monkeypatch.setenv("CPA_CACHE_DIR", str(tmp_path / "cpa-cache"))
@@ -204,6 +224,7 @@ def test_scaffold_fastapi_with_github_setup_extension(
         cwd=_REPO_ROOT,
         capture_output=True,
         text=True,
+        env=_subprocess_env(),
         check=False,
     )
     assert result.returncode == 0, result.stdout + result.stderr