Suppress python callstacks on lint/ts/scss command failure

Author: richardebeling

evap/evaluation/management/commands/precommit.py

@@ -1,10 +1,11 @@
 import os.path
-import subprocess  # nosec
 import sys
 
 from django.core.management import call_command
 from django.core.management.base import BaseCommand
 
+from evap.evaluation.management.commands.tools import run_exit_if_nonzero_return_code
+
 
 class Command(BaseCommand):
     args = ""
@@ -19,7 +20,7 @@ def handle(self, *args, **options):
         call_command("typecheck")
 
         # subprocess call so our sys.argv check in settings.py works
-        subprocess.run(["./manage.py", "test"], check=False)  # nosec
+        run_exit_if_nonzero_return_code(["./manage.py", "test"])
 
         call_command("format")
         call_command("lint")

evap/evaluation/management/commands/scss.py

@@ -1,8 +1,8 @@
-import subprocess  # nosec
-
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 
+from evap.evaluation.management.commands.tools import run_exit_if_nonzero_return_code
+
 
 class Command(BaseCommand):
     def add_arguments(self, parser):
@@ -34,7 +34,7 @@ def handle(self, *args, **options):
             command += ["--style", "compressed", "--no-source-map"]
 
         try:
-            subprocess.run(command, check=True)  # nosec
+            run_exit_if_nonzero_return_code(command)
         except FileNotFoundError as e:
             raise CommandError("Could not find sass command") from e
         except KeyboardInterrupt:

evap/evaluation/management/commands/tools.py

@@ -1,4 +1,5 @@
 import logging
+import subprocess
 import sys
 
 from django.conf import settings
@@ -47,3 +48,10 @@ def logged_call_command(stdout, *args, **kwargs):
     """Log execution of management command with all args."""
     stdout.write("Executing python manage.py " + " ".join(list(args) + [f"{a}={b}" for a, b in kwargs.items()]))
     call_command(*args, **kwargs)
+
+
+def run_exit_if_nonzero_return_code(command: list) -> None:
+    exit_code = subprocess.run(command, check=False).returncode
+    if exit_code != 0:
+        sys.exit(exit_code)
+    # don't sys.exit() on return code 0 so that precommit.py can chain commands

evap/evaluation/management/commands/ts.py

@@ -1,10 +1,11 @@
 import argparse
-import subprocess  # nosec
 
 from django.conf import settings
 from django.core.management import call_command
 from django.core.management.base import BaseCommand, CommandError
 
+from evap.evaluation.management.commands.tools import run_exit_if_nonzero_return_code
+
 
 class Command(BaseCommand):
     def add_arguments(self, parser: argparse.ArgumentParser):
@@ -36,13 +37,11 @@ def handle(self, *args, **options):
 
     def run_command(self, command):
         try:
-            subprocess.run(command, check=True)  # nosec
+            run_exit_if_nonzero_return_code(command)
         except FileNotFoundError as e:
             raise CommandError(f"Could not find {command[0]} command") from e
         except KeyboardInterrupt:
             pass
-        except subprocess.CalledProcessError as e:
-            raise CommandError("Error during command execution", returncode=e.returncode) from e
 
     def compile(self, watch=False, fresh=False, **_options):
         static_directory = settings.STATICFILES_DIRS[0]

evap/evaluation/management/commands/typecheck.py

@@ -1,12 +1,12 @@
-import subprocess  # nosec
-
 from django.core.management.base import BaseCommand
 
+from evap.evaluation.management.commands.tools import run_exit_if_nonzero_return_code
+
 
 class Command(BaseCommand):
     args = ""
     help = "Runs the type checker (mypy)"
     requires_migrations_checks = False
 
     def handle(self, *args, **options):
-        subprocess.run(["mypy"], check=True)  # nosec
+        run_exit_if_nonzero_return_code(["mypy"])