From c2618086b67d5cc192fb2bf52556d042592d39b6 Mon Sep 17 00:00:00 2001 From: "Reid D. McKenzie" Date: Fri, 30 May 2025 12:56:37 -0600 Subject: [PATCH] [NO TESTS] WIP --- py/private/py_pytest_main.bzl | 2 +- py/private/pytest.py.tmpl | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/py/private/py_pytest_main.bzl b/py/private/py_pytest_main.bzl index 4ce6292a..9f575d2b 100644 --- a/py/private/py_pytest_main.bzl +++ b/py/private/py_pytest_main.bzl @@ -19,7 +19,7 @@ load(":py_library.bzl", default_py_library = "py_library") def _py_pytest_main_impl(ctx): substitutions = { - "$$FLAGS$$": ", ".join(['"{}"'.format(f) for f in ctx.attr.args]).strip(), + "user_args: List[str] = []": "user_args: List[str] = " + repr(['"{}"'.format(f) for f in ctx.attr.args]), # Leaving CHDIR empty results in potentially user facing issues w/ # black and flake8, so we'll just assign something trivial as a no-op. "$$CHDIR$$": "os.chdir('{}')".format(ctx.attr.chdir) if ctx.attr.chdir else "_ = 0", diff --git a/py/private/pytest.py.tmpl b/py/private/pytest.py.tmpl index aaf5282f..8cfd089f 100644 --- a/py/private/pytest.py.tmpl +++ b/py/private/pytest.py.tmpl @@ -1,3 +1,4 @@ +# -*- mode: python -*- # Copyright 2022 Aspect Build Systems, Inc. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -88,7 +89,8 @@ if __name__ == "__main__": if test_filter is not None: args.append(f"-k={test_filter}") - user_args: List[str] = [$$FLAGS$$] + # This list will be replaced if the user provides args to bake in + user_args: List[str] = [] if len(user_args) > 0: args.extend(user_args)