Merge pull request #10652 from benesch/mzcompose-dev

mzcompose: always install dev deps when invoked from the root

bin/mzcompose

@@ -11,9 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-if [ "$1" == "--dev" ] ; then
-   shift
-   exec "$(dirname "$0")"/pyactivate --dev -m materialize.cli.mzcompose "$@"
-else
-   exec "$(dirname "$0")"/pyactivate -m materialize.cli.mzcompose "$@"
-fi
+exec "$(dirname "$0")"/pyactivate --dev -m materialize.cli.mzcompose "$@"

ci/test/cargo-test/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../../bin/pyactivate -m materialize.cli.mzcompose "$@"

demo/billing/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

demo/chbench/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

demo/http_logs/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

demo/simple/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

doc/developer/feature-benchmark.md

@@ -21,7 +21,7 @@ cd test/feature-benchmark
 Or, from the root of the repository:
 
 ```
-bin/mzcompose --dev --find feature-benchmark run default --other-tag unstable
+bin/mzcompose --find feature-benchmark run default --other-tag unstable
 ```
 
 This is going to benchmark the current source against the `materialize/materialized:unstable` container from DockerHub.

misc/dbt-materialize/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

misc/python/materialize/cli/mzcompose

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+# Copyright Materialize, Inc. and contributors. All rights reserved.
+#
+# Use of this software is governed by the Business Source License
+# included in the LICENSE file at the root of this repository.
+#
+# As of the Change Date specified in that file, in accordance with
+# the Business Source License, use of this software will be governed
+# by the Apache License, Version 2.0.
+#
+# mzcompose — runs Docker Compose with Materialize customizations.
+
+exec "$(dirname "$0")"/../../../../bin/pyactivate -m materialize.cli.mzcompose "$@"

misc/python/materialize/cli/mzcompose.py

@@ -238,7 +238,7 @@ def run(self, args: argparse.Namespace) -> None:
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/{}/bin/mzcompose" "$@"
+exec "$(dirname "$0")"/{}/bin/pyactivate -m materialize.cli.mzcompose "$@"
 """
         for path in repo.compositions.values():
             mzcompose_path = path / "mzcompose"

play/mbta/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

play/wikirecent/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/aws-config/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/catalog-compat/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/cluster/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/debezium/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/feature-benchmark/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" --dev "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate --dev -m materialize.cli.mzcompose "$@"

test/kafka-exactly-once/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/kafka-ingest-open-loop/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/kafka-krb5/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/kafka-matrix/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/kafka-multi-broker/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/kafka-resumption/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/kafka-sasl-plain/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/kafka-ssl/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/lang/csharp/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/lang/java/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/lang/js/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/lang/python/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/limits/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/metabase/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/mzcompose_examples/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/perf-kinesis/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/persistence/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/pg-cdc-resumption/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/pg-cdc/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/proxy/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/restart/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/s3-resumption/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/sqllogictest/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/testdrive/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"

test/upgrade/mzcompose

@@ -11,4 +11,4 @@
 #
 # mzcompose — runs Docker Compose with Materialize customizations.
 
-exec "$(dirname "$0")/../../bin/mzcompose" "$@"
+exec "$(dirname "$0")"/../../bin/pyactivate -m materialize.cli.mzcompose "$@"