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

review: Address review suggestion

Browse Source
This commit is contained in:
Henry Schreiner
2020-06-14 11:25:14 -04:00
parent 0597088f64
commit 901ac79dbc
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/windows.py
+25 -13
View File
@@ -149,25 +149,32 @@ def setup_python(python_configuration: PythonConfiguration, dependency_constrain
shell(['pip', '--version'], env=env) shell(['pip', '--version'], env=env)
shell(['pip', 'install', '--upgrade', 'setuptools', 'wheel'] + dependency_constraint_flags, env=env) shell(['pip', 'install', '--upgrade', 'setuptools', 'wheel'] + dependency_constraint_flags, env=env)
# Python 3.5 PEP 518 hack (see https://github.com/pypa/pip/issues/8392#issuecomment-639563494) return env
# Basically, nuget's Python is an embedded Python distribution, which is not supported by pip.
# Before version 3.6, there was no way to disable the "embedded" behavior, including the ignoring
# of environment variables, including the ones pip uses to setup PEP 518 builds. def pep_518_cp35_workaround(package_dir: str, env: Dict[str, str]) -> None:
# """
# The fix here is as suggested in that issue; we manually setup the PEP 518 requirements. Since we Python 3.5 PEP 518 hack (see https://github.com/pypa/pip/issues/8392#issuecomment-639563494)
# are in a fresh environment (except for pinned cibuildweel dependencies), the build is already Basically, nuget's Python is an embedded Python distribution, which is not supported by pip.
# mostly "isolated". Before version 3.6, there was no way to disable the "embedded" behavior, including the ignoring
if python_configuration.version.startswith('3.5') and os.path.exists('pyproject.toml'): of environment variables, including the ones pip uses to setup PEP 518 builds.
data = toml.load('pyproject.toml')
The fix here is as suggested in that issue; we manually setup the PEP 518 requirements. Since we
are in a fresh environment (except for pinned cibuildweel dependencies), the build is already
mostly "isolated".
"""
pyproject_path = os.path.join(package_dir, 'pyproject.toml')
if os.path.exists(pyproject_path):
data = toml.load(pyproject_path)
requirements = ( requirements = (
data['build-system'].get('requires', []) data['build-system'].get('requires', [])
if 'build-system' in data if 'build-system' in data
else [] else []
) )
if requirements: if requirements:
shell(['pip', 'install'] + requirements + dependency_constraint_flags, env=env) shell(['pip', 'install'] + requirements, env=env)
return env
def build(options: BuildOptions) -> None: def build(options: BuildOptions) -> None:
@@ -195,6 +202,11 @@ def build(options: BuildOptions) -> None:
before_build_prepared = prepare_command(options.before_build, project='.', package=options.package_dir) before_build_prepared = prepare_command(options.before_build, project='.', package=options.package_dir)
shell([before_build_prepared], env=env) shell([before_build_prepared], env=env)
# activate the PEP 518 patch if on Windows Python 3.5
# (will only have an effect if PEP 517 builds are used):
if config.version.startswith('3.5'):
pep_518_cp35_workaround(options.package_dir, env)
# build the wheel # build the wheel
if os.path.exists(built_wheel_dir): if os.path.exists(built_wheel_dir):
shutil.rmtree(built_wheel_dir) shutil.rmtree(built_wheel_dir)