Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: don't assume that any configurations are active

Browse Source
This commit is contained in:
Paul McCarthy
2022-04-19 15:52:06 +01:00
parent bb2d5bdab6
commit be9a635f9b
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/macos.py
+11 -10
View File
@@ -276,17 +276,18 @@ def build(options: Options, tmp_path: Path) -> None:
) )
try: try:
before_all_options_identifier = python_configurations[0].identifier if len(python_configurations) > 0:
before_all_options = options.build_options(before_all_options_identifier) before_all_options_identifier = python_configurations[0].identifier
before_all_options = options.build_options(before_all_options_identifier)
if before_all_options.before_all: if before_all_options.before_all:
log.step("Running before_all...") log.step("Running before_all...")
env = before_all_options.environment.as_dictionary(prev_environment=os.environ) env = before_all_options.environment.as_dictionary(prev_environment=os.environ)
env.setdefault("MACOSX_DEPLOYMENT_TARGET", "10.9") env.setdefault("MACOSX_DEPLOYMENT_TARGET", "10.9")
before_all_prepared = prepare_command( before_all_prepared = prepare_command(
before_all_options.before_all, project=".", package=before_all_options.package_dir before_all_options.before_all, project=".", package=before_all_options.package_dir
) )
shell(before_all_prepared, env=env) shell(before_all_prepared, env=env)
for config in python_configurations: for config in python_configurations:
build_options = options.build_options(config.identifier) build_options = options.build_options(config.identifier)
cibuildwheel/windows.py
+10 -9
View File
@@ -235,16 +235,17 @@ def build(options: Options, tmp_path: Path) -> None:
) )
try: try:
before_all_options_identifier = python_configurations[0].identifier if len(python_configurations) > 0:
before_all_options = options.build_options(before_all_options_identifier) before_all_options_identifier = python_configurations[0].identifier
before_all_options = options.build_options(before_all_options_identifier)
if before_all_options.before_all: if before_all_options.before_all:
log.step("Running before_all...") log.step("Running before_all...")
env = before_all_options.environment.as_dictionary(prev_environment=os.environ) env = before_all_options.environment.as_dictionary(prev_environment=os.environ)
before_all_prepared = prepare_command( before_all_prepared = prepare_command(
before_all_options.before_all, project=".", package=options.globals.package_dir before_all_options.before_all, project=".", package=options.globals.package_dir
) )
shell(before_all_prepared, env=env) shell(before_all_prepared, env=env)
for config in python_configurations: for config in python_configurations:
build_options = options.build_options(config.identifier) build_options = options.build_options(config.identifier)