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

Collapse multiple 'pip install's into one in windows.py and macos.py, and replace full path by 'python' in windows.py

Browse Source
This commit is contained in:
Yannick Jadoul
2019-11-12 23:47:06 +01:00
parent dc01231301
commit 7d99ccfc7b
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/macos.py
+1 -3
View File
@@ -92,9 +92,7 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef
call(['python', get_pip_script, '--no-setuptools', '--no-wheel'], env=env)
assert os.path.exists(os.path.join(installation_bin_path, 'pip'))
call(['pip', '--version'], env=env)
call(['pip', 'install', '--upgrade', 'setuptools'], env=env)
call(['pip', 'install', 'wheel'], env=env)
call(['pip', 'install', 'delocate'], env=env)
call(['pip', 'install', '--upgrade', 'setuptools', 'wheel', 'delocate'], env=env)
# setup dirs
if os.path.exists('/tmp/built_wheel'):
cibuildwheel/windows.py
+2 -3
View File
@@ -124,14 +124,13 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef
# make sure pip is installed
if not os.path.exists(os.path.join(config_python_path, 'Scripts', 'pip.exe')):
simple_shell([os.path.join(config_python_path, 'python.exe'), get_pip_script], env=env)
simple_shell(['python', get_pip_script], env=env)
assert os.path.exists(os.path.join(config_python_path, 'Scripts', 'pip.exe'))
# prepare the Python environment
simple_shell(['python', '-m', 'pip', 'install', '--upgrade', 'pip'], env=env)
simple_shell(['pip', '--version'], env=env)
simple_shell(['pip', 'install', '--upgrade', 'setuptools'], env=env)
simple_shell(['pip', 'install', 'wheel'], env=env)
simple_shell(['pip', 'install', '--upgrade', 'setuptools', 'wheel'], env=env)
# setup dirs
if os.path.exists(built_wheel_dir):