Skip to content

Commit 2e48667

Browse files
committed
refactor: use frontend instead of plural
Signed-off-by: Henry Schreiner <[email protected]>
1 parent c681860 commit 2e48667

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

Diff for: cibuildwheel/linux.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ def build_in_container(
241241

242242
verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity)
243243
extra_flags = split_config_settings(
244-
build_options.config_settings, plural=build_options.build_frontend == "pip"
244+
build_options.config_settings, build_options.build_frontend
245245
)
246246

247247
if build_options.build_frontend == "pip":

Diff for: cibuildwheel/macos.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def build(options: Options, tmp_path: Path) -> None:
375375

376376
verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity)
377377
extra_flags = split_config_settings(
378-
build_options.config_settings, plural=build_options.build_frontend == "pip"
378+
build_options.config_settings, build_options.build_frontend
379379
)
380380

381381
if build_options.build_frontend == "pip":

Diff for: cibuildwheel/util.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,9 @@ def get_build_verbosity_extra_flags(level: int) -> list[str]:
208208
return []
209209

210210

211-
def split_config_settings(config_settings: str, *, plural: bool) -> list[str]:
211+
def split_config_settings(config_settings: str, frontend: Literal["pip", "build"]) -> list[str]:
212212
config_settings_list = shlex.split(config_settings)
213-
s = "s" if plural else ""
213+
s = "s" if frontend == "pip" else ""
214214
return [f"--config-setting{s}={setting}" for setting in config_settings_list]
215215

216216

Diff for: cibuildwheel/windows.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ def build(options: Options, tmp_path: Path) -> None:
412412

413413
verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity)
414414
extra_flags = split_config_settings(
415-
build_options.config_settings, plural=build_options.build_frontend == "pip"
415+
build_options.config_settings, build_options.build_frontend
416416
)
417417

418418
if build_options.build_frontend == "pip":

Diff for: unit_test/main_tests/main_options_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -283,13 +283,13 @@ def test_config_settings(platform_specific, platform, intercepted_build_args, mo
283283

284284
assert build_options.config_settings == config_settings
285285

286-
assert split_config_settings(config_settings, plural=False) == [
286+
assert split_config_settings(config_settings, "build") == [
287287
"--config-setting=setting=value",
288288
"--config-setting=setting=value2",
289289
"--config-setting=other=something else",
290290
]
291291

292-
assert split_config_settings(config_settings, plural=True) == [
292+
assert split_config_settings(config_settings, "pip") == [
293293
"--config-settings=setting=value",
294294
"--config-settings=setting=value2",
295295
"--config-settings=other=something else",

0 commit comments

Comments
 (0)