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

Replace a few shell invocations by simple_shell in windows.py

Browse Source
This commit is contained in:
Yannick Jadoul
2019-11-12 22:25:54 +01:00
parent d3fd087166
commit dc01231301
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/windows.py
+7 -7
View File
@@ -118,9 +118,9 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef
env = environment.as_dictionary(prev_environment=env) env = environment.as_dictionary(prev_environment=env)
# for the logs - check we're running the right version of python # for the logs - check we're running the right version of python
shell(['where', 'python'], env=env) simple_shell(['where', 'python'], env=env)
shell(['python', '--version'], env=env) simple_shell(['python', '--version'], env=env)
shell(['python', '-c', '"import struct; print(struct.calcsize(\'P\') * 8)\"'], env=env) simple_shell(['python', '-c', '"import struct; print(struct.calcsize(\'P\') * 8)\"'], env=env)
# make sure pip is installed # make sure pip is installed
if not os.path.exists(os.path.join(config_python_path, 'Scripts', 'pip.exe')): if not os.path.exists(os.path.join(config_python_path, 'Scripts', 'pip.exe')):
@@ -128,10 +128,10 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef
assert os.path.exists(os.path.join(config_python_path, 'Scripts', 'pip.exe')) assert os.path.exists(os.path.join(config_python_path, 'Scripts', 'pip.exe'))
# prepare the Python environment # prepare the Python environment
shell(['python', '-m', 'pip', 'install', '--upgrade', 'pip'], env=env) simple_shell(['python', '-m', 'pip', 'install', '--upgrade', 'pip'], env=env)
shell(['pip', '--version'], env=env) simple_shell(['pip', '--version'], env=env)
shell(['pip', 'install', '--upgrade', 'setuptools'], env=env) simple_shell(['pip', 'install', '--upgrade', 'setuptools'], env=env)
shell(['pip', 'install', 'wheel'], env=env) simple_shell(['pip', 'install', 'wheel'], env=env)
# setup dirs # setup dirs
if os.path.exists(built_wheel_dir): if os.path.exists(built_wheel_dir):