Skip to content

Commit

Permalink
feat: empty config-file triggers default behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
henryiii committed Oct 22, 2021
1 parent 4f0cf9b commit 4b7e0be
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion action.yml
Expand Up @@ -12,7 +12,7 @@ inputs:
config-file:
description: 'File containing the config, defaults to {package}/pyproject.toml'
required: false
default: '{package}/pyproject.toml'
default: ''
branding:
icon: package
color: yellow
Expand Down
7 changes: 4 additions & 3 deletions cibuildwheel/__main__.py
Expand Up @@ -57,14 +57,15 @@ def main() -> None:

parser.add_argument(
"--output-dir",
help="Destination folder for the wheels.",
help="Destination folder for the wheels. Default: wheelhouse.",
)

parser.add_argument(
"--config-file",
default="",
help="""
TOML config file for cibuildwheel. Defaults to pyproject.toml, but
can be overridden with this option.
TOML config file for cibuildwheel. If empty, this will use
{package}/pyproject.toml, but will not error if it is missing.
""",
)

Expand Down
5 changes: 3 additions & 2 deletions cibuildwheel/options.py
Expand Up @@ -42,7 +42,7 @@ class CommandLineArguments:
platform: Literal["auto", "linux", "macos", "windows"]
archs: Optional[str]
output_dir: Optional[str]
config_file: Optional[str]
config_file: str
package_dir: str
print_build_identifiers: bool
allow_empty: bool
Expand Down Expand Up @@ -335,8 +335,9 @@ def __init__(self, platform: PlatformName, command_line_arguments: CommandLineAr
def config_file_path(self) -> Optional[Path]:
args = self.command_line_arguments

if args.config_file is not None:
if args.config_file:
return Path(args.config_file.format(package=args.package_dir))

# return pyproject.toml, if it's available
pyproject_toml_path = Path(args.package_dir) / "pyproject.toml"
if pyproject_toml_path.exists():
Expand Down
2 changes: 1 addition & 1 deletion unit_test/utils.py
Expand Up @@ -7,7 +7,7 @@ def get_default_command_line_arguments() -> CommandLineArguments:
defaults.platform = "auto"
defaults.allow_empty = False
defaults.archs = None
defaults.config_file = None
defaults.config_file = ""
defaults.output_dir = None
defaults.package_dir = "."
defaults.prerelease_pythons = False
Expand Down

0 comments on commit 4b7e0be

Please sign in to comment.