Merge branch 'main' into fix/toml-error-locations

Author: kvlonge

.github/workflows/release-performance.yml

@@ -62,7 +62,9 @@ jobs:
       - name: Install dependencies
         run: uv sync --locked --all-groups --all-extras
       - name: Build candidate wheel
-        run: uv build --wheel --out-dir "${RUNNER_TEMP}/candidate"
+        run: |
+          uv build --wheel --out-dir "${RUNNER_TEMP}/candidate"
+          uv build --wheel crates/sqlbuild-cli --out-dir "${RUNNER_TEMP}/candidate"
       # Temporary: one-model edit compiles use MAX_EDIT_COMPILE_TIME_RATIO (1.35x) because an edited
       # model recompiles uncached; tighten it back to 1.15x once native rendering is the default.
       - name: Compare candidate and previous release on this runner

scripts/release_performance/_helpers/versions.py

@@ -196,7 +196,8 @@ def install_wheel(*, wheel: Path, venv_dir: Path, python: str) -> Path:
 
     _create_venv(venv_dir=venv_dir, python=python)
     completed: subprocess.CompletedProcess[str] = _uv_pip_install(
-        venv_dir=venv_dir, requirements=(str(wheel.resolve()),)
+        venv_dir=venv_dir,
+        requirements=("--find-links", str(wheel.resolve().parent), str(wheel.resolve())),
     )
     if completed.returncode != 0:
         raise ReleasePerformanceError(f"Installing {wheel} failed: {_tail(completed.stderr)}")

scripts/release_performance/constants.py

@@ -86,23 +86,23 @@
         name="lineage hub downstream",
         project=INSPECTION_PROJECT,
         sqb_args=("lineage", SHARED_DIAMOND_HUB, "--direction", "downstream"),
+        max_rss_ratio=1.75,
     ),
     BenchmarkCommand(
         name="lineage rollup upstream",
         project=INSPECTION_PROJECT,
         sqb_args=("lineage", SHARED_DIAMOND_ROLLUP, "--direction", "upstream"),
+        max_rss_ratio=1.75,
     ),
     BenchmarkCommand(
         name="lineage column trace",
         project=INSPECTION_PROJECT,
         sqb_args=("lineage", f"{SHARED_DIAMOND_ROLLUP}.amount", "--direction", "upstream"),
-        max_rss_ratio=2.0,
     ),
     BenchmarkCommand(
         name="dag --json",
         project=INSPECTION_PROJECT,
         sqb_args=("dag", "--json"),
-        max_rss_ratio=1.5,
     ),
     BenchmarkCommand(
         name="scope --json",
@@ -118,7 +118,6 @@
     ),
     BenchmarkCommand(
         name="compile (one-model edit)",
-        max_rss_ratio=1.35,
         project=INSPECTION_PROJECT,
         sqb_args=("compile", "--json"),
         edits_model=True,
@@ -128,6 +127,7 @@
         name="dense compile (warm cache)",
         project=DENSE_PROJECT,
         sqb_args=("compile", "--json"),
+        max_rss_ratio=1.45,
         max_time_ratio=MAX_COMPILE_TIME_RATIO,
     ),
     BenchmarkCommand(

tests/e2e/scripts/release_performance/test_compare_release_performance.py

@@ -39,9 +39,10 @@
                 "| `plan --json` |",
                 "| `build (empty warehouse)` |",
                 "| `lineage column trace` |",
-                "Peak RSS limit for `lineage column trace`: 2.00x "
-                "(+100%; temporary memory exception).",
-                "Peak RSS limit for `dag --json`: 1.50x (+50%; temporary memory exception).",
+                "Peak RSS limit for `lineage hub downstream`: 1.75x "
+                "(+75%; temporary memory exception).",
+                "Peak RSS limit for `dense compile (warm cache)`: 1.45x "
+                "(+45%; temporary memory exception).",
                 "Benchmark projects are generated per side",
                 "**Result: ",
             ),
@@ -121,9 +122,9 @@ def test_given_two_installations_when_comparing_release_performance_then_reports
     ]
     for command in recorded["commands"]:
         assert command["max_rss_ratio"] == {
-            "lineage column trace": 2.0,
-            "dag --json": 1.5,
-            "compile (one-model edit)": 1.35,
+            "lineage hub downstream": 1.75,
+            "lineage rollup upstream": 1.75,
+            "dense compile (warm cache)": 1.45,
         }.get(command["name"])
 
 

tests/integration/scripts/__init__.py

@@ -0,0 +1 @@
+"""Integration checks for repository tooling."""

tests/integration/scripts/release_performance/__init__.py

@@ -0,0 +1 @@
+"""Release candidate installation integration checks."""

tests/integration/scripts/release_performance/_test_types.py

@@ -0,0 +1,12 @@
+"""Local candidate installation cases."""
+
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class LocalWheelTestCase:
+    """A synchronized candidate and companion version."""
+
+    description: str
+    version: str
+    expected_version: str

tests/integration/scripts/release_performance/test_local_wheels.py

@@ -0,0 +1,53 @@
+"""Exercise candidate installation with an unpublished companion wheel."""
+
+import sys
+from pathlib import Path
+from zipfile import ZipFile
+
+import pytest
+
+from scripts.release_performance._helpers.versions import install_wheel, installed_version
+from tests.integration.scripts.release_performance._test_types import LocalWheelTestCase
+
+
+@pytest.mark.skipif(sys.platform == "win32", reason="Release comparison uses POSIX environments")
+@pytest.mark.parametrize(
+    "test_case",
+    [
+        LocalWheelTestCase(
+            description="unpublished companion installs offline beside its candidate",
+            version="0.1.0",
+            expected_version="0.1.0",
+        )
+    ],
+    ids=lambda case: case.description,
+)
+def test_given_unpublished_companion_when_installing_candidate_then_resolves_local_wheel(
+    test_case: LocalWheelTestCase, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    monkeypatch.setenv("UV_NO_INDEX", "1")
+    wheels: Path = tmp_path / "wheels"
+    wheels.mkdir()
+    version: str = test_case.version
+    for name, dependency, entry_points in (
+        ("sqlbuild", f"Requires-Dist: sqlbuild-cli=={version}\n", ""),
+        ("sqlbuild_cli", "", "[console_scripts]\nsqb = sqlbuild_cli_probe:main\n"),
+    ):
+        metadata: str = f"Metadata-Version: 2.1\nName: {name}\nVersion: {version}\n{dependency}"
+        with ZipFile(wheels / f"{name}-{version}-py3-none-any.whl", "w") as wheel:
+            info: str = f"{name}-{version}.dist-info"
+            wheel.writestr(f"{info}/METADATA", metadata)
+            wheel.writestr(
+                f"{info}/WHEEL",
+                "Wheel-Version: 1.0\nGenerator: release-probe\n"
+                "Root-Is-Purelib: true\nTag: py3-none-any\n",
+            )
+            wheel.writestr(f"{info}/RECORD", "")
+            wheel.writestr(f"{name}_probe.py", f"def main():\n    print('sqlbuild {version}')\n")
+            wheel.writestr(f"{info}/entry_points.txt", entry_points)
+    sqb: Path = install_wheel(
+        wheel=wheels / f"sqlbuild-{version}-py3-none-any.whl",
+        venv_dir=tmp_path / "candidate",
+        python=sys.executable,
+    )
+    assert installed_version(sqb=sqb) == test_case.expected_version

tests/unit/scripts/release_performance/_helpers/test_verdict.py

@@ -290,9 +290,9 @@ def test_given_configured_command_when_judging_time_then_its_own_limit_applies(
             description=f"{command.name} enforces its RSS allowance and time limits",
             command=command,
             expected_rss_ratio={
-                "lineage column trace": 2.0,
-                "dag --json": 1.5,
-                "compile (one-model edit)": 1.35,
+                "lineage hub downstream": 1.75,
+                "lineage rollup upstream": 1.75,
+                "dense compile (warm cache)": 1.45,
             }.get(command.name, 1.25),
         )
         for command in BENCHMARK_COMMANDS