fix: support -q for build/uv (#2737)
This commit is contained in:
@@ -36,13 +36,13 @@ class BuildFrontendConfig:
|
||||
return {"name": self.name, "args": repr(self.args)}
|
||||
|
||||
|
||||
def _get_verbosity_flags(level: int, frontend: BuildFrontendName) -> list[str]:
|
||||
def _get_verbosity_flags(level: int, frontend: BuildFrontendName, *, py38: bool) -> list[str]:
|
||||
if level < 0:
|
||||
if frontend == "pip":
|
||||
return ["-" + -level * "q"]
|
||||
|
||||
msg = f"build_verbosity {level} is not supported for {frontend} frontend. Ignoring."
|
||||
log.warning(msg)
|
||||
if frontend.startswith("build") and py38:
|
||||
msg = f"build_verbosity {level} is not supported for {frontend} frontend. Ignoring."
|
||||
log.warning(msg)
|
||||
return []
|
||||
return ["-" + -level * "q"]
|
||||
|
||||
if level > 0:
|
||||
if frontend == "pip":
|
||||
@@ -75,10 +75,10 @@ def parse_config_settings(config_settings_str: str) -> dict[str, str | list[str]
|
||||
|
||||
|
||||
def get_build_frontend_extra_flags(
|
||||
build_frontend: BuildFrontendConfig, verbosity_level: int, config_settings: str
|
||||
build_frontend: BuildFrontendConfig, verbosity_level: int, config_settings: str, *, py38: bool
|
||||
) -> list[str]:
|
||||
return [
|
||||
*_split_config_settings(config_settings),
|
||||
*build_frontend.args,
|
||||
*_get_verbosity_flags(verbosity_level, build_frontend.name),
|
||||
*_get_verbosity_flags(verbosity_level, build_frontend.name, py38=py38),
|
||||
]
|
||||
|
||||
@@ -457,6 +457,7 @@ def build_wheel(state: BuildState) -> Path:
|
||||
state.options.build_frontend,
|
||||
state.options.build_verbosity,
|
||||
state.options.config_settings,
|
||||
py38=False,
|
||||
),
|
||||
env=state.android_env,
|
||||
)
|
||||
@@ -474,6 +475,7 @@ def build_wheel(state: BuildState) -> Path:
|
||||
state.options.build_frontend,
|
||||
state.options.build_verbosity,
|
||||
state.options.config_settings,
|
||||
py38=False,
|
||||
),
|
||||
env=state.android_env,
|
||||
)
|
||||
|
||||
@@ -487,7 +487,10 @@ def build(options: Options, tmp_path: Path) -> None:
|
||||
built_wheel_dir.mkdir()
|
||||
|
||||
extra_flags = get_build_frontend_extra_flags(
|
||||
build_frontend, build_options.build_verbosity, build_options.config_settings
|
||||
build_frontend,
|
||||
build_options.build_verbosity,
|
||||
build_options.config_settings,
|
||||
py38=False,
|
||||
)
|
||||
|
||||
match build_frontend.name:
|
||||
|
||||
@@ -274,7 +274,10 @@ def build_in_container(
|
||||
container.call(["mkdir", "-p", built_wheel_dir])
|
||||
|
||||
extra_flags = get_build_frontend_extra_flags(
|
||||
build_frontend, build_options.build_verbosity, build_options.config_settings
|
||||
build_frontend,
|
||||
build_options.build_verbosity,
|
||||
build_options.config_settings,
|
||||
py38=config.identifier[1:].startswith("p38"),
|
||||
)
|
||||
|
||||
match build_frontend.name:
|
||||
|
||||
@@ -472,7 +472,10 @@ def build(options: Options, tmp_path: Path) -> None:
|
||||
built_wheel_dir.mkdir()
|
||||
|
||||
extra_flags = get_build_frontend_extra_flags(
|
||||
build_frontend, build_options.build_verbosity, build_options.config_settings
|
||||
build_frontend,
|
||||
build_options.build_verbosity,
|
||||
build_options.config_settings,
|
||||
py38=config.identifier[1:].startswith("p38"),
|
||||
)
|
||||
|
||||
build_env = env.copy()
|
||||
|
||||
@@ -416,7 +416,10 @@ def build(options: Options, tmp_path: Path) -> None:
|
||||
log.step("Building wheel...")
|
||||
|
||||
extra_flags = get_build_frontend_extra_flags(
|
||||
build_frontend, build_options.build_verbosity, build_options.config_settings
|
||||
build_frontend,
|
||||
build_options.build_verbosity,
|
||||
build_options.config_settings,
|
||||
py38=False,
|
||||
)
|
||||
|
||||
call(
|
||||
|
||||
@@ -450,7 +450,10 @@ def build(options: Options, tmp_path: Path) -> None:
|
||||
built_wheel_dir.mkdir()
|
||||
|
||||
extra_flags = get_build_frontend_extra_flags(
|
||||
build_frontend, build_options.build_verbosity, build_options.config_settings
|
||||
build_frontend,
|
||||
build_options.build_verbosity,
|
||||
build_options.config_settings,
|
||||
py38=config.identifier[1:].startswith("p38"),
|
||||
)
|
||||
|
||||
if (
|
||||
|
||||
Reference in New Issue
Block a user