From 7e7e6c27976c8ce9c2cb95ac409b02ece2d06c92 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Sun, 13 Aug 2023 02:43:09 +0200 Subject: [PATCH] bazel: pretty print is all but pretty (#35963) * bazel: pretty print is all but pretty * Don't ask bazel to explain what it's up to --- var/spack/repos/builtin/packages/bazel/package.py | 9 +-------- var/spack/repos/builtin/packages/py-dm-tree/package.py | 7 ------- var/spack/repos/builtin/packages/py-keras/package.py | 7 ------- .../builtin/packages/py-tensorflow-estimator/package.py | 7 ------- .../repos/builtin/packages/py-tensorflow-hub/package.py | 7 ------- .../packages/py-tensorflow-probability/package.py | 7 ------- .../repos/builtin/packages/py-tensorflow/package.py | 7 ------- 7 files changed, 1 insertion(+), 50 deletions(-) diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py index a2cc4d96d2..fddd87ddc2 100644 --- a/var/spack/repos/builtin/packages/bazel/package.py +++ b/var/spack/repos/builtin/packages/bazel/package.py @@ -519,14 +519,7 @@ def setup_build_environment(self, env): # Spack's logs don't handle colored output well "--color=no --host_javabase=@local_jdk//:jdk" # Enable verbose output for failures - " --verbose_failures" - # Ask bazel to explain what it's up to - # Needs a filename as argument - " --explain=explainlogfile.txt" - # Increase verbosity of explanation, - " --verbose_explanations" - # Show (formatted) subcommands being executed - " --subcommands=pretty_print" " --jobs={0}".format(make_jobs), + " --verbose_failures --jobs={0}".format(make_jobs), ) @run_before("install") diff --git a/var/spack/repos/builtin/packages/py-dm-tree/package.py b/var/spack/repos/builtin/packages/py-dm-tree/package.py index 71a6ef4a0f..02002412e5 100644 --- a/var/spack/repos/builtin/packages/py-dm-tree/package.py +++ b/var/spack/repos/builtin/packages/py-dm-tree/package.py @@ -52,14 +52,7 @@ def patch(self): "'--jobs={0}',\n".format(make_jobs), # Enable verbose output for failures "'--verbose_failures',\n", - # Show (formatted) subcommands being executed - "'--subcommands=pretty_print',\n", "'--spawn_strategy=local',\n", - # Ask bazel to explain what it's up to - # Needs a filename as argument - "'--explain=explainlogfile.txt',\n", - # Increase verbosity of explanation, - "'--verbose_explanations',\n", # bazel uses system PYTHONPATH instead of spack paths "'--action_env', 'PYTHONPATH={0}',\n".format(env["PYTHONPATH"]), ] diff --git a/var/spack/repos/builtin/packages/py-keras/package.py b/var/spack/repos/builtin/packages/py-keras/package.py index 40351bf697..5604adf859 100644 --- a/var/spack/repos/builtin/packages/py-keras/package.py +++ b/var/spack/repos/builtin/packages/py-keras/package.py @@ -115,14 +115,7 @@ def install(self, spec, prefix): "--jobs={0}".format(make_jobs), # Enable verbose output for failures "--verbose_failures", - # Show (formatted) subcommands being executed - "--subcommands=pretty_print", "--spawn_strategy=local", - # Ask bazel to explain what it's up to - # Needs a filename as argument - "--explain=explainlogfile.txt", - # Increase verbosity of explanation, - "--verbose_explanations", # bazel uses system PYTHONPATH instead of spack paths "--action_env", "PYTHONPATH={0}".format(env["PYTHONPATH"]), diff --git a/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py b/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py index 7a6b5967cf..f0bde513db 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py @@ -74,14 +74,7 @@ def install(self, spec, prefix): "--jobs={0}".format(make_jobs), # Enable verbose output for failures "--verbose_failures", - # Show (formatted) subcommands being executed - "--subcommands=pretty_print", "--spawn_strategy=local", - # Ask bazel to explain what it's up to - # Needs a filename as argument - "--explain=explainlogfile.txt", - # Increase verbosity of explanation, - "--verbose_explanations", # bazel uses system PYTHONPATH instead of spack paths "--action_env", "PYTHONPATH={0}".format(env["PYTHONPATH"]), diff --git a/var/spack/repos/builtin/packages/py-tensorflow-hub/package.py b/var/spack/repos/builtin/packages/py-tensorflow-hub/package.py index 1ea9b79f90..6c59391a54 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-hub/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-hub/package.py @@ -49,14 +49,7 @@ def install(self, spec, prefix): "--jobs={0}".format(make_jobs), # Enable verbose output for failures "--verbose_failures", - # Show (formatted) subcommands being executed - "--subcommands=pretty_print", "--spawn_strategy=local", - # Ask bazel to explain what it's up to - # Needs a filename as argument - "--explain=explainlogfile.txt", - # Increase verbosity of explanation, - "--verbose_explanations", # bazel uses system PYTHONPATH instead of spack paths "--action_env", "PYTHONPATH={0}".format(env["PYTHONPATH"]), diff --git a/var/spack/repos/builtin/packages/py-tensorflow-probability/package.py b/var/spack/repos/builtin/packages/py-tensorflow-probability/package.py index 0ef321b1df..553fe250b3 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-probability/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-probability/package.py @@ -69,14 +69,7 @@ def install(self, spec, prefix): "--jobs={0}".format(make_jobs), # Enable verbose output for failures "--verbose_failures", - # Show (formatted) subcommands being executed - "--subcommands=pretty_print", "--spawn_strategy=local", - # Ask bazel to explain what it's up to - # Needs a filename as argument - "--explain=explainlogfile.txt", - # Increase verbosity of explanation, - "--verbose_explanations", # bazel uses system PYTHONPATH instead of spack paths "--action_env", "PYTHONPATH={0}".format(env["PYTHONPATH"]), diff --git a/var/spack/repos/builtin/packages/py-tensorflow/package.py b/var/spack/repos/builtin/packages/py-tensorflow/package.py index 2296ff40e0..d2cc34f2ce 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow/package.py @@ -932,13 +932,6 @@ def build(self, spec, prefix): "--config=opt", # Enable verbose output for failures "--verbose_failures", - # Show (formatted) subcommands being executed - "--subcommands=pretty_print", - # Ask bazel to explain what it's up to - # Needs a filename as argument - "--explain=explainlogfile.txt", - # Increase verbosity of explanation, - "--verbose_explanations", ] if spec.satisfies("^bazel@:3.5"):