odctl 0.4.2__tar.gz → 0.4.3__tar.gz

{odctl-0.4.2 → odctl-0.4.3}/.github/renovate.json

@@ -2,13 +2,16 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": ["config:base", ":dependencyDashboard", "docker:enableMajor"],
   "schedule": ["every weekend"],
+
+  "automerge": false,
+
   "docker-compose": {
     "fileMatch": ["(^|/)compose-[^/]+\\.ya?ml$"]
   },
   "dockerfile": {
     "fileMatch": [
-      "^src/dml/resources/docker/.*/Dockerfile$",
-      "^src/dml/resources/deps/Dockerfile$"
+      "^src/odctl/resources/docker/.*/Dockerfile$",
+      "^src/odctl/resources/deps/Dockerfile$"
     ]
   },
   "packageRules": [
@@ -23,10 +26,13 @@
       "allowedVersions": "<0.9"
     },
     {
-      "description": "Auto-merge non-breaking minor and patch updates if CI passes",
-      "matchUpdateTypes": ["minor", "patch"],
-      "automerge": true,
-      "automergeType": "pr"
+      "description": "Spark stays on 4.1: Iceberg publishes iceberg-spark-runtime for 4.0 and 4.1 only, so a 4.2 image loads a 4.1 runtime and every Iceberg statement dies with IncompatibleClassChangeError. HADOOP_AWS_V in versions.env is matched to the Hadoop this series bundles, and the airflow image pins pyspark to the same minor. Raise this only when Iceberg ships a runtime for a newer minor, and move SPARK_COMPAT_MINOR, HADOOP_AWS_V and the pyspark pin with it. See PR #29.",
+      "matchPackageNames": [
+        "apache/spark",
+        "pyspark",
+        "org.apache.spark:{/,}**"
+      ],
+      "allowedVersions": "<4.2"
     },
     {
       "description": "Group all Python dependencies from pyproject.toml into a single PR",

{odctl-0.4.2 → odctl-0.4.3}/.github/workflows/e2e-test.yml

@@ -83,7 +83,17 @@ jobs:
               exit 1
             fi
 
-            echo "🧹 Tearing down $profile..."
+            # Tear down by name before sweeping with --all. These are two code
+            # paths: --all resolves dependency profiles for itself, while a
+            # named teardown did not until 0.4.3, so compose rejected the
+            # project with "depends on undefined service" and only the named
+            # form could catch it. Naming the profile is also what a user runs.
+            echo "🧹 Tearing down $profile by name..."
+            yes | odctl down "$profile" --volumes
+
+            # Sweep afterwards so a failure above cannot leak state into the
+            # next profile in the group. This is a no-op when the named
+            # teardown succeeded.
             yes | odctl down --all --volumes
             echo "::endgroup::"
           done

{odctl-0.4.2 → odctl-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: odctl
-Version: 0.4.2
+Version: 0.4.3
 Summary: Orchestrator for the Open Data Stack
 Project-URL: Homepage, https://github.com/jaehyeon-kim/odctl
 Project-URL: Repository, https://github.com/jaehyeon-kim/odctl

{odctl-0.4.2 → odctl-0.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "odctl"
-version = "0.4.2"
+version = "0.4.3"
 description = "Orchestrator for the Open Data Stack"
 readme = "README.md"
 authors = [

{odctl-0.4.2 → odctl-0.4.3}/src/odctl/main.py

@@ -17,7 +17,7 @@ from odctl.docker import (
 )
 from odctl.planner import (
     build_execution_plan,
-    expand_same_file_dependencies,
+    expand_plan_dependencies,
     get_profile_map,
 )
 from odctl.registry import load_registry
@@ -373,9 +373,15 @@ def down(
                 ):
                     active_profs.append(p)
             if active_profs:
-                active_plan[file] = expand_same_file_dependencies(profs, active_profs)
+                active_plan[file] = active_profs
         plan = active_plan
 
+    # Widen after the running-state filter, not inside it, so a teardown that
+    # names profiles directly is validated the same way `--all` is. Without
+    # this, `odctl down catalog` hands compose a project where catalog's
+    # depends_on points at a postgres that the profile filter removed.
+    plan = expand_plan_dependencies(plan)
+
     plan = dict(reversed(list(plan.items())))
 
     if dry_run:
@@ -420,8 +426,11 @@ def ps(
         ui.print_error("Docker is not reachable.")
         raise typer.Exit(1)
 
-    # Use resolve_deps=False so we ONLY see what was explicitly requested
-    plan = build_execution_plan(profiles, all, resolve_deps=False)
+    # Use resolve_deps=False so we ONLY see what was explicitly requested,
+    # widened just enough that compose accepts the project.
+    plan = expand_plan_dependencies(
+        build_execution_plan(profiles, all, resolve_deps=False)
+    )
 
     containers = get_managed_containers(plan)
 
@@ -504,7 +513,7 @@ def logs(
         ui.print_error("Docker is not reachable.")
         raise typer.Exit(1)
 
-    plan = build_execution_plan(profiles, resolve_deps=False)
+    plan = expand_plan_dependencies(build_execution_plan(profiles, resolve_deps=False))
     get_managed_logs(
         execution_plan=plan,
         follow=follow,
@@ -523,7 +532,7 @@ def restart(profiles: List[str] = typer.Argument(..., help="Profiles to restart.
         ui.print_error("Docker is not reachable.")
         raise typer.Exit(1)
 
-    plan = build_execution_plan(profiles, resolve_deps=False)
+    plan = expand_plan_dependencies(build_execution_plan(profiles, resolve_deps=False))
     ui.print_step("Restarting containers...")
     restart_managed_containers(plan)
     ui.print_success("Restart complete.")

{odctl-0.4.2 → odctl-0.4.3}/src/odctl/planner.py

@@ -174,3 +174,30 @@ def expand_same_file_dependencies(
                 selected.add(dep)
                 queue.append(dep)
     return [p for p in file_profiles if p in selected]
+
+
+def expand_plan_dependencies(plan: Dict[str, List[str]]) -> Dict[str, List[str]]:
+    """Widen every file in a plan to include its same-file dependencies.
+
+    Any command that hands profiles to a compose client has to pass a set that
+    validates, because compose filters services by active profile and then
+    checks depends_on against what survives. Naming a profile whose service
+    depends on one in another profile of the same file therefore aborts with
+    "depends on undefined service", and that applies to teardown, ps, logs and
+    restart alike, not just to teardown of a whole file.
+
+    Plans built with ``resolve_deps=False`` need this. Plans built with
+    ``resolve_deps=True`` already carry their dependencies.
+
+    Args:
+        plan (Dict[str, List[str]]): Compose file to selected profiles.
+
+    Returns:
+        Dict[str, List[str]]: Same mapping, each selection widened to a set
+            compose will accept, in the order each file declares.
+    """
+    declared = build_execution_plan(None, all_profiles=True, resolve_deps=False)
+    return {
+        file: expand_same_file_dependencies(declared.get(file, profiles), profiles)
+        for file, profiles in plan.items()
+    }

{odctl-0.4.2 → odctl-0.4.3}/src/odctl/resources/compose-analytics.yml

@@ -1,7 +1,7 @@
 name: odctl-analytics
 
 x-clickhouse-base: &clickhouse-base
-  image: clickhouse/clickhouse-server:25.8-alpine
+  image: clickhouse/clickhouse-server:25.12-alpine
   networks:
     - odctl
   mem_limit: 4g
@@ -32,7 +32,7 @@ services:
   # [SHARED] Consensus Node
   # ==========================================
   ch-keeper:
-    image: clickhouse/clickhouse-keeper:25.8-alpine
+    image: clickhouse/clickhouse-keeper:25.12-alpine
     container_name: ch-keeper
     # Keeper must run in BOTH profiles
     profiles:

{odctl-0.4.2 → odctl-0.4.3}/src/odctl/resources/compose-infra.yml

@@ -53,7 +53,7 @@ services:
   # Object Storage (SeaweedFS - Single Node)
   # ==========================================
   seaweed:
-    image: &seaweed-image chrislusf/seaweedfs:4.22
+    image: &seaweed-image chrislusf/seaweedfs:4.40
     container_name: seaweed
     ports:
       - "8333:8333" # S3 API

{odctl-0.4.2 → odctl-0.4.3}/src/odctl/resources/compose-kafka.yml

@@ -163,7 +163,7 @@ services:
   # Schema Registry & UI
   # ==========================================
   karapace:
-    image: ghcr.io/aiven-open/karapace:6.1.3
+    image: ghcr.io/aiven-open/karapace:6.2.2
     container_name: karapace
     entrypoint:
       - python3

{odctl-0.4.2 → odctl-0.4.3}/src/odctl/resources/compose-metadata.yml

@@ -5,7 +5,7 @@ services:
   # [PROFILE: metadata] Elasticsearch (OM Backend)
   # ==========================================
   openmetadata-es:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.11.4
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.19.19
     container_name: openmetadata-es
     profiles:
       - metadata
@@ -33,7 +33,7 @@ services:
   # [PROFILE: metadata] OpenMetadata DB Migration
   # ==========================================
   openmetadata-migrate:
-    image: &om-server-image docker.getcollate.io/openmetadata/server:1.12.6
+    image: &om-server-image docker.getcollate.io/openmetadata/server:1.13.3
     container_name: openmetadata-migrate
     command: "./bootstrap/openmetadata-ops.sh migrate"
     profiles:
@@ -126,7 +126,7 @@ services:
   # [PROFILE: metadata] OpenMetadata Ingestion (Standard Image)
   # ==========================================
   openmetadata-ingestion:
-    image: docker.getcollate.io/openmetadata/ingestion:1.12.6
+    image: docker.getcollate.io/openmetadata/ingestion:1.13.3
     container_name: openmetadata-ingestion
     profiles:
       - metadata

{odctl-0.4.2 → odctl-0.4.3}/src/odctl/resources/deps/Dockerfile

@@ -13,7 +13,7 @@ RUN --mount=type=cache,target=/root/.gradle \
 # ==========================================
 # Stage 2: Gradle Resolver (Schema Converters & Flink Parquet)
 # ==========================================
-FROM gradle:8.6-jdk17 AS gradle-resolver
+FROM gradle:8.14-jdk17 AS gradle-resolver
 WORKDIR /app
 COPY build.gradle versions.env ./
 # Let Gradle do the heavy transitive lifting for both Connect and Flink, using the

{odctl-0.4.2 → odctl-0.4.3}/src/odctl/resources/deps/build.gradle

@@ -10,7 +10,7 @@ repositories {
 }
 
 ext {
-    confluentVersion = '8.2.0'
+    confluentVersion = '8.3.1'
     // Supplied by the Dockerfile from versions.env. The '+' resolves the latest
     // patch of the pinned minor, which is what the fetch scripts do too.
     flinkVersion = "${project.findProperty('flinkMinor') ?: '2.1'}.+"

{odctl-0.4.2 → odctl-0.4.3}/src/odctl/resources/deps/versions.env

@@ -21,8 +21,10 @@ HADOOP_V=3.3.6
 # Hadoop S3A for Spark. Iceberg's own reads and writes go through S3FileIO, but
 # the remove_orphan_files and add_files procedures list and stage through
 # Hadoop's FileSystem API, so they need hadoop-aws on the Spark classpath.
-# Match apache/spark:4.1.2, which bundles Hadoop 3.4.2, and pin the AWS SDK to
-# the version hadoop-aws declares rather than the newest published one.
+# Match the Hadoop that the pinned apache/spark image bundles, currently 3.4.2
+# for the 4.1 series, and pin the AWS SDK to the version hadoop-aws declares
+# rather than the newest published one. Spark 4.2.0 bundles Hadoop 3.5.0, so
+# this value moves only when that image's minor does.
 #
 # The shaded `bundle` artifact is deliberate, despite being about 640 MB. Two
 # slimmer attempts both failed: resolving hadoop-aws with `bundle` excluded plus

{odctl-0.4.2 → odctl-0.4.3}/src/odctl/resources/docker/airflow/Dockerfile

@@ -1,11 +1,13 @@
-FROM apache/airflow:3.2.1
+FROM apache/airflow:3.3.0
 
 # Metadata Bindings for GHCR
 LABEL org.opencontainers.image.source="https://github.com/jaehyeon-kim/odctl"
 LABEL org.opencontainers.image.description="Custom Apache Airflow orchestrator image for the Open Data Stack. Fully loaded with pipeline execution providers for PostgreSQL, Trino, ClickHouse, Amazon S3, Flink, PySpark, and PyIceberg."
 
 # Install Lean Open Data SDKs and Providers
-# Pinning PySpark strictly to 4.0.x for Iceberg compatibility
+# Pinned to the same Spark minor the spark image runs, because Iceberg
+# publishes iceberg-spark-runtime per minor. Move it with that image, not on its
+# own. See the renovate ceiling on apache/spark.
 RUN --mount=type=cache,target=/home/airflow/.cache/pip \
     pip install \
     apache-airflow-providers-apache-flink \

{odctl-0.4.2 → odctl-0.4.3}/src/odctl/resources/docker/ray-mlops/Dockerfile

@@ -1,4 +1,4 @@
-FROM rayproject/ray:2.55.1-py312-cpu
+FROM rayproject/ray:2.56.1-py312-cpu
 
 LABEL org.opencontainers.image.source="https://github.com/jaehyeon-kim/odctl"
 LABEL org.opencontainers.image.description="Unified Ray Serve and MLflow image for the Open Data Stack. Handles inference deployment, experiment tracking, and direct ClickHouse/Kafka connections."

{odctl-0.4.2 → odctl-0.4.3}/src/odctl/resources/docker/spark/Dockerfile

@@ -1,3 +1,10 @@
+# Pinned to the 4.1 series on purpose. Iceberg 1.11.0 publishes
+# iceberg-spark-runtime for 4.0 and 4.1 only, so a 4.2 image loads a runtime
+# built against 4.1 and every Iceberg statement dies with
+# IncompatibleClassChangeError on connector.catalog.View. HADOOP_AWS_V in
+# versions.env is also matched to the Hadoop this series bundles, and the
+# airflow image pins pyspark to the same minor. Raise all four together, and
+# only once Iceberg ships a runtime for the newer minor. See PR #29.
 FROM apache/spark:4.1.2
 
 # Switch to root to install system-wide packages

odctl-0.4.3/tests/test_compose_profiles.py

@@ -0,0 +1,253 @@
+"""Static checks on profile wiring in the packaged compose files.
+
+These exist because of a real failure. `odctl down --all --volumes` selected the
+`catalog` profile on its own, since teardown picks profiles by running state and
+by volume ownership. That service declares a `depends_on` on services gated
+behind the `postgres` and `storage` profiles, so compose rejected the file with
+"depends on undefined service" before contacting Docker, and teardown aborted for
+every profile group.
+
+Nothing here needs Docker, so it belongs in the unit suite rather than in the
+end-to-end tests, which run only on tags and so cannot fail a pull request.
+"""
+
+from unittest import mock
+
+import pytest
+import yaml
+from typer.testing import CliRunner
+
+from odctl import config
+from odctl.main import app
+from odctl.config import get_internal_resources_dir
+from odctl.planner import (
+    build_execution_plan,
+    expand_plan_dependencies,
+    expand_same_file_dependencies,
+)
+from odctl.registry import load_registry
+
+runner = CliRunner()
+
+
+@pytest.fixture(autouse=True)
+def _read_packaged_resources(monkeypatch):
+    """Read the registry from the packaged resources, not a local workspace.
+
+    Without this the compose files come from src/odctl/resources while the
+    registry comes from ./.odctl, so an inconsistency between the two is
+    invisible to these tests.
+    """
+    monkeypatch.setattr(config, "get_active_dir", get_internal_resources_dir)
+
+
+def _compose_files():
+    return sorted(get_internal_resources_dir().glob("compose-*.yml"))
+
+
+def _services(path):
+    return (yaml.safe_load(path.read_text()) or {}).get("services") or {}
+
+
+def _depends_on(service):
+    dep = service.get("depends_on")
+    if isinstance(dep, dict):
+        return list(dep.keys())
+    return list(dep or [])
+
+
+def _profiles_of_file(path):
+    seen = []
+    for svc in _services(path).values():
+        for profile in svc.get("profiles") or []:
+            if profile not in seen:
+                seen.append(profile)
+    return seen
+
+
+def test_every_teardown_selection_yields_a_valid_project():
+    """Selecting any single profile, then widening it the way teardown does,
+    must leave every depends_on target inside the active set.
+
+    This is the property that actually matters: teardown may select one profile
+    of a file, so after expansion the resulting project has to be well-formed.
+    """
+    violations = []
+    for path in _compose_files():
+        services = _services(path)
+        for profile in _profiles_of_file(path):
+            active = set(
+                expand_same_file_dependencies(_profiles_of_file(path), [profile])
+            )
+            live = {
+                name
+                for name, svc in services.items()
+                if not svc.get("profiles") or (set(svc["profiles"]) & active)
+            }
+            for name in sorted(live):
+                for target in _depends_on(services[name]):
+                    if target not in live:
+                        violations.append(
+                            f"{path.name}: selecting {profile} activates {name}, "
+                            f"which depends on {target}, absent from the project"
+                        )
+    assert not violations, (
+        "a teardown selection would produce an invalid compose project:\n"
+        + "\n".join(violations)
+    )
+
+
+def test_expansion_pulls_in_same_file_dependencies():
+    """Selecting `catalog` must widen to `postgres` and `storage`.
+
+    This is the concrete case that broke: `catalog` owns no volume of its own but
+    mounts the shared dependency volume, so `--volumes` selects it even when
+    nothing of it is running.
+    """
+    expanded = expand_same_file_dependencies(
+        ["postgres", "storage", "catalog"], ["catalog"]
+    )
+    assert expanded == ["postgres", "storage", "catalog"]
+
+
+def test_expansion_stays_within_the_file():
+    """Dependencies declared outside the file must not be added.
+
+    Each file is torn down by its own compose call, so widening across files
+    would stop shared infrastructure other profiles may still be using.
+    """
+    registry = load_registry()
+    catalog_deps = None
+    for stack in registry.stacks.values():
+        if "catalog" in (stack.depends_on or {}):
+            catalog_deps = stack.depends_on["catalog"]
+    assert catalog_deps and "deps" in catalog_deps, "expected catalog to depend on deps"
+
+    expanded = expand_same_file_dependencies(
+        ["postgres", "storage", "catalog"], ["catalog"]
+    )
+    assert "deps" not in expanded
+
+
+def test_expansion_is_a_noop_without_dependencies():
+    """A profile with no same-file dependencies is returned unchanged."""
+    assert expand_same_file_dependencies(
+        ["kafka-lite", "kafka-full"], ["kafka-lite"]
+    ) == ["kafka-lite"]
+
+
+def test_named_profile_plan_is_widened():
+    """Naming profiles directly must widen the same way `--all` does.
+
+    This is the regression the tests above could not catch. They exercise the
+    helper, while the bug was that `down` only called it inside its `--all`
+    branch, so `odctl down storage catalog trino` handed compose a project where
+    catalog depended on a postgres the profile filter had removed, and every
+    teardown of a named selection aborted.
+    """
+    plan = build_execution_plan(
+        ["storage", "catalog", "trino"], False, resolve_deps=False
+    )
+    assert plan["compose-infra.yml"] == ["storage", "catalog"], (
+        "precondition changed: the raw plan is expected to omit postgres"
+    )
+
+    widened = expand_plan_dependencies(plan)
+    assert widened["compose-infra.yml"] == ["postgres", "storage", "catalog"]
+
+
+def test_plan_widening_does_not_cross_files():
+    """Widening one file must not add profiles to another.
+
+    Each file gets its own compose call, so pulling a dependency across files
+    would stop infrastructure that other profiles are still using.
+    """
+    plan = build_execution_plan(["catalog", "trino"], False, resolve_deps=False)
+    widened = expand_plan_dependencies(plan)
+
+    assert widened["compose-analytics.yml"] == plan["compose-analytics.yml"]
+    assert "postgres" not in widened["compose-analytics.yml"]
+
+
+def test_plan_widening_is_idempotent():
+    """Widening an already-valid plan must change nothing.
+
+    `down --all` filters by running state and then widens, so the same plan can
+    pass through expansion twice. That has to be safe.
+    """
+    plan = build_execution_plan(["catalog"], False, resolve_deps=False)
+    once = expand_plan_dependencies(plan)
+    assert expand_plan_dependencies(once) == once
+
+
+def test_down_widens_a_named_profile():
+    """`odctl down catalog` must plan to stop postgres as well.
+
+    This is the only test here that exercises the command rather than the
+    planner, and it is the one that fails without the fix. Every other test in
+    this file passes while `down` is broken, because they call the helper
+    directly and the bug was that `down` reached it only on its `--all` branch.
+    `--dry-run` returns before the Docker check, so this needs no daemon.
+    """
+    result = runner.invoke(app, ["down", "catalog", "--dry-run"])
+
+    assert result.exit_code == 0, result.stdout
+    assert "compose-infra.yml" in result.stdout
+    assert "postgres" in result.stdout, (
+        "catalog depends on postgres, so a teardown that omits it hands compose "
+        "an invalid project:\n" + result.stdout
+    )
+
+
+def test_restart_widens_a_named_profile():
+    """`odctl restart catalog` must resolve the same widened plan.
+
+    `down`, `ps`, `logs` and `restart` all build their plan with
+    `resolve_deps=False` and all pass profiles to a compose client, so all four
+    need the widening. This pins the one with no dry-run of its own.
+    """
+    captured = {}
+    with (
+        mock.patch("odctl.main.is_docker_running", return_value=True),
+        mock.patch(
+            "odctl.main.restart_managed_containers",
+            side_effect=lambda plan: captured.update(plan),
+        ),
+    ):
+        result = runner.invoke(app, ["restart", "catalog"])
+
+    assert result.exit_code == 0, result.stdout
+    assert "postgres" in captured.get("compose-infra.yml", []), (
+        f"expected postgres in the restart plan, got {captured}"
+    )
+
+
+def test_every_named_selection_yields_a_valid_project():
+    """Every single-profile plan must survive widening as a valid project.
+
+    Same property as the teardown test above, asserted one level up through the
+    plan so it covers the code path the commands actually take rather than the
+    helper in isolation.
+    """
+    violations = []
+    for path in _compose_files():
+        services = _services(path)
+        for profile in _profiles_of_file(path):
+            plan = build_execution_plan([profile], False, resolve_deps=False)
+            active = set(expand_plan_dependencies(plan).get(path.name, []))
+            live = {
+                name
+                for name, svc in services.items()
+                if not svc.get("profiles") or (set(svc["profiles"]) & active)
+            }
+            for name in sorted(live):
+                for target in _depends_on(services[name]):
+                    if target not in live:
+                        violations.append(
+                            f"{path.name}: naming {profile} activates {name}, "
+                            f"which depends on {target}, absent from the project"
+                        )
+    assert not violations, (
+        "a named selection would produce an invalid compose project:\n"
+        + "\n".join(violations)
+    )

odctl-0.4.2/tests/test_compose_profiles.py

@@ -1,126 +0,0 @@
-"""Static checks on profile wiring in the packaged compose files.
-
-These exist because of a real failure. `odctl down --all --volumes` selected the
-`catalog` profile on its own, since teardown picks profiles by running state and
-by volume ownership. That service declares a `depends_on` on services gated
-behind the `postgres` and `storage` profiles, so compose rejected the file with
-"depends on undefined service" before contacting Docker, and teardown aborted for
-every profile group.
-
-Nothing here needs Docker, so it belongs in the unit suite rather than in the
-end-to-end tests, which run only on tags and so cannot fail a pull request.
-"""
-
-import pytest
-import yaml
-
-from odctl import config
-from odctl.config import get_internal_resources_dir
-from odctl.planner import expand_same_file_dependencies
-from odctl.registry import load_registry
-
-
-@pytest.fixture(autouse=True)
-def _read_packaged_resources(monkeypatch):
-    """Read the registry from the packaged resources, not a local workspace.
-
-    Without this the compose files come from src/odctl/resources while the
-    registry comes from ./.odctl, so an inconsistency between the two is
-    invisible to these tests.
-    """
-    monkeypatch.setattr(config, "get_active_dir", get_internal_resources_dir)
-
-
-def _compose_files():
-    return sorted(get_internal_resources_dir().glob("compose-*.yml"))
-
-
-def _services(path):
-    return (yaml.safe_load(path.read_text()) or {}).get("services") or {}
-
-
-def _depends_on(service):
-    dep = service.get("depends_on")
-    if isinstance(dep, dict):
-        return list(dep.keys())
-    return list(dep or [])
-
-
-def _profiles_of_file(path):
-    seen = []
-    for svc in _services(path).values():
-        for profile in svc.get("profiles") or []:
-            if profile not in seen:
-                seen.append(profile)
-    return seen
-
-
-def test_every_teardown_selection_yields_a_valid_project():
-    """Selecting any single profile, then widening it the way teardown does,
-    must leave every depends_on target inside the active set.
-
-    This is the property that actually matters: teardown may select one profile
-    of a file, so after expansion the resulting project has to be well-formed.
-    """
-    violations = []
-    for path in _compose_files():
-        services = _services(path)
-        for profile in _profiles_of_file(path):
-            active = set(
-                expand_same_file_dependencies(_profiles_of_file(path), [profile])
-            )
-            live = {
-                name
-                for name, svc in services.items()
-                if not svc.get("profiles") or (set(svc["profiles"]) & active)
-            }
-            for name in sorted(live):
-                for target in _depends_on(services[name]):
-                    if target not in live:
-                        violations.append(
-                            f"{path.name}: selecting {profile} activates {name}, "
-                            f"which depends on {target}, absent from the project"
-                        )
-    assert not violations, (
-        "a teardown selection would produce an invalid compose project:\n"
-        + "\n".join(violations)
-    )
-
-
-def test_expansion_pulls_in_same_file_dependencies():
-    """Selecting `catalog` must widen to `postgres` and `storage`.
-
-    This is the concrete case that broke: `catalog` owns no volume of its own but
-    mounts the shared dependency volume, so `--volumes` selects it even when
-    nothing of it is running.
-    """
-    expanded = expand_same_file_dependencies(
-        ["postgres", "storage", "catalog"], ["catalog"]
-    )
-    assert expanded == ["postgres", "storage", "catalog"]
-
-
-def test_expansion_stays_within_the_file():
-    """Dependencies declared outside the file must not be added.
-
-    Each file is torn down by its own compose call, so widening across files
-    would stop shared infrastructure other profiles may still be using.
-    """
-    registry = load_registry()
-    catalog_deps = None
-    for stack in registry.stacks.values():
-        if "catalog" in (stack.depends_on or {}):
-            catalog_deps = stack.depends_on["catalog"]
-    assert catalog_deps and "deps" in catalog_deps, "expected catalog to depend on deps"
-
-    expanded = expand_same_file_dependencies(
-        ["postgres", "storage", "catalog"], ["catalog"]
-    )
-    assert "deps" not in expanded
-
-
-def test_expansion_is_a_noop_without_dependencies():
-    """A profile with no same-file dependencies is returned unchanged."""
-    assert expand_same_file_dependencies(
-        ["kafka-lite", "kafka-full"], ["kafka-lite"]
-    ) == ["kafka-lite"]