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

move calculate constraints outside python setup

Browse Source
This commit is contained in:
Grzegorz Bokota
2020-04-07 00:56:00 +02:00
parent 8b465bc94a
commit a4602c32dd
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/macos.py
+10 -9
View File
@@ -108,7 +108,7 @@ def install_pypy(version, url):
return installation_bin_path return installation_bin_path
def setup_python(python_configuration, dependency_constraints, environment): def setup_python(python_configuration, dependency_constraint_flags, environment):
if python_configuration.identifier.startswith('cp'): if python_configuration.identifier.startswith('cp'):
installation_bin_path = install_cpython(python_configuration.version, python_configuration.url) installation_bin_path = install_cpython(python_configuration.version, python_configuration.url)
elif python_configuration.identifier.startswith('pp'): elif python_configuration.identifier.startswith('pp'):
@@ -140,12 +140,6 @@ def setup_python(python_configuration, dependency_constraints, environment):
print("cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.", file=sys.stderr) print("cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.", file=sys.stderr)
exit(1) exit(1)
dependency_constraint_flags = []
if dependency_constraints:
dependency_constraint_flags = [
'-c', dependency_constraints.get_for_python_version(python_configuration.version)
]
# install pip & wheel # install pip & wheel
call(['python', get_pip_script] + dependency_constraint_flags, env=env, cwd="/tmp") call(['python', get_pip_script] + dependency_constraint_flags, env=env, cwd="/tmp")
assert os.path.exists(os.path.join(installation_bin_path, 'pip')) assert os.path.exists(os.path.join(installation_bin_path, 'pip'))
@@ -168,7 +162,7 @@ def setup_python(python_configuration, dependency_constraints, environment):
if 'MACOSX_DEPLOYMENT_TARGET' not in env: if 'MACOSX_DEPLOYMENT_TARGET' not in env:
env['MACOSX_DEPLOYMENT_TARGET'] = '10.9' env['MACOSX_DEPLOYMENT_TARGET'] = '10.9'
return env, dependency_constraint_flags return env
def build(project_dir, output_dir, test_command, before_test, test_requires, test_extras, before_build, build_verbosity, build_selector, repair_command, environment, dependency_constraints): def build(project_dir, output_dir, test_command, before_test, test_requires, test_extras, before_build, build_verbosity, build_selector, repair_command, environment, dependency_constraints):
@@ -180,7 +174,14 @@ def build(project_dir, output_dir, test_command, before_test, test_requires, tes
python_configurations = get_python_configurations(build_selector) python_configurations = get_python_configurations(build_selector)
for config in python_configurations: for config in python_configurations:
env, dependency_constraint_flags = setup_python(config, dependency_constraints, environment)
dependency_constraint_flags = []
if dependency_constraints:
dependency_constraint_flags = [
'-c', dependency_constraints.get_for_python_version(config.version)
]
env = setup_python(config, dependency_constraint_flags, environment)
# run the before_build command # run the before_build command
cibuildwheel/windows.py
+9 -9
View File
@@ -89,7 +89,7 @@ def install_pypy(version, arch, url):
return installation_path return installation_path
def setup_python(python_configuration, dependency_constraints, environment): def setup_python(python_configuration, dependency_constraint_flags, environment):
nuget = 'C:\\cibw\\nuget.exe' nuget = 'C:\\cibw\\nuget.exe'
if not os.path.exists(nuget): if not os.path.exists(nuget):
download('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe', nuget) download('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe', nuget)
@@ -124,12 +124,6 @@ def setup_python(python_configuration, dependency_constraints, environment):
print("cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.", file=sys.stderr) print("cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.", file=sys.stderr)
exit(1) exit(1)
dependency_constraint_flags = []
if dependency_constraints:
dependency_constraint_flags = [
'-c', dependency_constraints.get_for_python_version(python_configuration.version)
]
# make sure pip is installed # make sure pip is installed
if not os.path.exists(os.path.join(installation_path, 'Scripts', 'pip.exe')): if not os.path.exists(os.path.join(installation_path, 'Scripts', 'pip.exe')):
shell(['python', get_pip_script] + dependency_constraint_flags, env=env, cwd="C:\\cibw") shell(['python', get_pip_script] + dependency_constraint_flags, env=env, cwd="C:\\cibw")
@@ -144,7 +138,7 @@ def setup_python(python_configuration, dependency_constraints, environment):
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)
return env, dependency_constraint_flags return env
def build(project_dir, output_dir, test_command, before_test, test_requires, test_extras, before_build, build_verbosity, build_selector, repair_command, environment, dependency_constraints): def build(project_dir, output_dir, test_command, before_test, test_requires, test_extras, before_build, build_verbosity, build_selector, repair_command, environment, dependency_constraints):
@@ -159,8 +153,14 @@ def build(project_dir, output_dir, test_command, before_test, test_requires, tes
python_configurations = get_python_configurations(build_selector) python_configurations = get_python_configurations(build_selector)
for config in python_configurations: for config in python_configurations:
dependency_constraint_flags = []
if dependency_constraints:
dependency_constraint_flags = [
'-c', dependency_constraints.get_for_python_version(config.version)
]
# install Python # install Python
env, dependency_constraint_flags = setup_python(config, dependency_constraints, 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: