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

Fix some whitespace problems with the merge

Browse Source
This commit is contained in:
Joe Rickerby
2020-04-07 18:52:49 +01:00
parent e90e94a18e
commit 2b4bd815ed
1 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/macos.py
+5 -6
View File
@@ -151,12 +151,12 @@ def setup_python(python_configuration, dependency_constraint_flags, environment)
exit(1) exit(1)
call(['pip', 'install', '--upgrade', 'setuptools', 'wheel', 'delocate'] + dependency_constraint_flags, env=env) call(['pip', 'install', '--upgrade', 'setuptools', 'wheel', 'delocate'] + dependency_constraint_flags, env=env)
# Set MACOSX_DEPLOYMENT_TARGET to 10.9, if the user didn't set it. # Set MACOSX_DEPLOYMENT_TARGET to 10.9, if the user didn't set it.
# CPython 3.5 defaults to 10.6, and pypy defaults to 10.3, causing # CPython 3.5 defaults to 10.6, and pypy defaults to 10.7, causing
# warnings and potential problems if it's left unset. # inconsistencies if it's left unset.
env.setdefault('MACOSX_DEPLOYMENT_TARGET', '10.9') env.setdefault('MACOSX_DEPLOYMENT_TARGET', '10.9')
if config.version == '3.5': if python_configuration.version == '3.5':
# Cross-compilation platform override - CPython 3.5 has an # Cross-compilation platform override - CPython 3.5 has an
# i386/x86_64 version of Python, but we only want a x64_64 build # i386/x86_64 version of Python, but we only want a x64_64 build
env.setdefault('_PYTHON_HOST_PLATFORM', 'macosx-10.9-x86_64') env.setdefault('_PYTHON_HOST_PLATFORM', 'macosx-10.9-x86_64')
@@ -184,7 +184,6 @@ def build(project_dir, output_dir, test_command, before_test, test_requires, tes
env = setup_python(config, dependency_constraint_flags, environment) env = setup_python(config, dependency_constraint_flags, environment)
# run the before_build command # run the before_build command
if before_build: if before_build:
before_build_prepared = prepare_command(before_build, project=abs_project_dir) before_build_prepared = prepare_command(before_build, project=abs_project_dir)