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

Code tidy/reorganise

Browse Source
This commit is contained in:
Joe Rickerby
2018-04-08 23:26:04 +01:00
parent b47a5c018f
commit 460a4d9656
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/__main__.py
+3 -4
View File
@@ -177,11 +177,10 @@ def detect_warnings(platform, build_options):
# warn about deprecated {python} and {pip} # warn about deprecated {python} and {pip}
for option_name in ['test_command', 'before_build']: for option_name in ['test_command', 'before_build']:
option_value = build_options.get(option_name) option_value = build_options.get(option_name, '')
if option_value: if '{python}' in option_value or '{pip}' in option_value:
if '{python}' in option_value or '{pip}' in option_value: warnings.append(option_name + ": '{python}' and '{pip}' are no longer needed, and will be removed in a future release. Simply use 'python' or 'pip' instead.")
warnings.append(option_name + ": '{python}' and '{pip}' are no longer needed, and will be removed in a future release. Simply use 'python' or 'pip' instead.")
return warnings return warnings
cibuildwheel/macos.py
+2 -1
View File
@@ -47,13 +47,14 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
# if this version of python isn't installed, get it from python.org and install # if this version of python isn't installed, get it from python.org and install
python_package_identifier = 'org.python.Python.PythonFramework-%s' % config.version python_package_identifier = 'org.python.Python.PythonFramework-%s' % config.version
installation_bin_path = '/Library/Frameworks/Python.framework/Versions/{}/bin'.format(config.version)
if python_package_identifier not in installed_system_packages: if python_package_identifier not in installed_system_packages:
# download the pkg # download the pkg
call(['curl', '-L', '-o', '/tmp/Python.pkg', config.url]) call(['curl', '-L', '-o', '/tmp/Python.pkg', config.url])
# install # install
call(['sudo', 'installer', '-pkg', '/tmp/Python.pkg', '-target', '/']) call(['sudo', 'installer', '-pkg', '/tmp/Python.pkg', '-target', '/'])
installation_bin_path = '/Library/Frameworks/Python.framework/Versions/{}/bin'.format(config.version)
# Python bin folders on Mac don't symlink python3 to python, so we do that # Python bin folders on Mac don't symlink python3 to python, so we do that
# so `python` and `pip` always point to the active configuration. # so `python` and `pip` always point to the active configuration.
if os.path.exists('/tmp/cibw_bin'): if os.path.exists('/tmp/cibw_bin'):