Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Apr 7, 2023
1 parent 3f039b7 commit 141b3f8
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 14 deletions.
6 changes: 2 additions & 4 deletions cibuildwheel/linux.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
from .util import (
AlreadyBuiltWheelError,
BuildSelector,
build_frontend_or_default,
NonPlatformWheelError,
build_frontend_or_default,
find_compatible_wheel,
get_build_verbosity_extra_flags,
prepare_command,
Expand Down Expand Up @@ -243,9 +243,7 @@ def build_in_container(
container.call(["mkdir", "-p", built_wheel_dir])

verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity)
extra_flags = split_config_settings(
build_options.config_settings, build_frontend
)
extra_flags = split_config_settings(build_options.config_settings, build_frontend)

if build_frontend == "pip":
extra_flags += verbosity_flags
Expand Down
7 changes: 2 additions & 5 deletions cibuildwheel/macos.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
AlreadyBuiltWheelError,
BuildFrontend,
BuildSelector,
build_frontend_or_default,
NonPlatformWheelError,
build_frontend_or_default,
call,
detect_ci_provider,
download,
Expand Down Expand Up @@ -314,7 +314,6 @@ def build(options: Options, tmp_path: Path) -> None:

build_frontend = build_frontend_or_default(options.build_frontend, "pip")


if not python_configurations:
return

Expand Down Expand Up @@ -379,9 +378,7 @@ def build(options: Options, tmp_path: Path) -> None:
built_wheel_dir.mkdir()

verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity)
extra_flags = split_config_settings(
build_options.config_settings, build_frontend
)
extra_flags = split_config_settings(build_options.config_settings, build_frontend)

if build_frontend == "pip":
extra_flags += verbosity_flags
Expand Down
6 changes: 5 additions & 1 deletion cibuildwheel/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,15 @@

BuildFrontend = Literal["pip", "build"]

def build_frontend_or_default(setting: BuildFrontend | Literal["default"], default: BuildFrontend) -> BuildFrontend:

def build_frontend_or_default(
setting: BuildFrontend | Literal["default"], default: BuildFrontend
) -> BuildFrontend:
if setting == "default":
return default
return setting


MANYLINUX_ARCHS: Final[tuple[str, ...]] = (
"x86_64",
"i686",
Expand Down
6 changes: 2 additions & 4 deletions cibuildwheel/windows.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
AlreadyBuiltWheelError,
BuildFrontend,
BuildSelector,
build_frontend_or_default,
NonPlatformWheelError,
build_frontend_or_default,
call,
download,
find_compatible_wheel,
Expand Down Expand Up @@ -414,9 +414,7 @@ def build(options: Options, tmp_path: Path) -> None:
built_wheel_dir.mkdir()

verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity)
extra_flags = split_config_settings(
build_options.config_settings, build_frontend
)
extra_flags = split_config_settings(build_options.config_settings, build_frontend)

if build_frontend == "pip":
extra_flags += verbosity_flags
Expand Down

0 comments on commit 141b3f8

Please sign in to comment.