From cbb7eafd1f0f686afff61359a9fe48c44dc89f18 Mon Sep 17 00:00:00 2001 From: mayeut Date: Thu, 26 Dec 2019 14:25:33 +0100 Subject: [PATCH 1/2] Remove extras spaces --- cibuildwheel/macos.py | 2 +- cibuildwheel/windows.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 5ada8ab2..784836ef 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -50,7 +50,7 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef return subprocess.check_call(args, env=env, cwd=cwd, shell=shell) # get latest pip once and for all - + call(['curl', '-L', '--retry', '3', '--retry-delay', '3', '-o', get_pip_script, get_pip_url]) for config in python_configurations: diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 61999fcc..79156b9a 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -63,7 +63,7 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef print('+ ' + ' '.join(args)) args = ['cmd', '/E:ON', '/V:ON', '/C'] + args return subprocess.check_call(' '.join(args), env=env, cwd=cwd) - + def download(url, dest): print('+ Download ' + url + ' to ' + dest) dest_dir = os.path.dirname(dest) @@ -75,7 +75,7 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef response = urlopen(url) except: if i == repeat_num - 1: - raise + raise sleep(3) continue break @@ -85,7 +85,7 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef file.write(response.read()) finally: response.close() - + if IS_RUNNING_ON_AZURE or IS_RUNNING_ON_TRAVIS: shell = simple_shell else: From 6732812ad79c4e366f8952aefa1e6b66ce712b0b Mon Sep 17 00:00:00 2001 From: mayeut Date: Thu, 26 Dec 2019 14:26:58 +0100 Subject: [PATCH 2/2] Update CPython on macOS / Windows - Update CPython 3.7 from 3.7.5 to 3.7.6 - Update CPython 3.8 from 3.8.0 to 3.8.1 --- cibuildwheel/macos.py | 4 ++-- cibuildwheel/windows.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 784836ef..e8dfb775 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -17,8 +17,8 @@ def get_python_configurations(build_selector): PythonConfiguration(version='2.7', identifier='cp27-macosx_10_6_intel', url='https://www.python.org/ftp/python/2.7.17/python-2.7.17-macosx10.6.pkg'), PythonConfiguration(version='3.5', identifier='cp35-macosx_10_6_intel', url='https://www.python.org/ftp/python/3.5.4/python-3.5.4-macosx10.6.pkg'), PythonConfiguration(version='3.6', identifier='cp36-macosx_10_6_intel', url='https://www.python.org/ftp/python/3.6.8/python-3.6.8-macosx10.6.pkg'), - PythonConfiguration(version='3.7', identifier='cp37-macosx_10_6_intel', url='https://www.python.org/ftp/python/3.7.5/python-3.7.5-macosx10.6.pkg'), - PythonConfiguration(version='3.8', identifier='cp38-macosx_10_9_x86_64', url='https://www.python.org/ftp/python/3.8.0/python-3.8.0-macosx10.9.pkg'), + PythonConfiguration(version='3.7', identifier='cp37-macosx_10_6_intel', url='https://www.python.org/ftp/python/3.7.6/python-3.7.6-macosx10.6.pkg'), + PythonConfiguration(version='3.8', identifier='cp38-macosx_10_9_x86_64', url='https://www.python.org/ftp/python/3.8.1/python-3.8.1-macosx10.9.pkg'), ] # skip builds as required diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 79156b9a..c0923934 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -41,10 +41,10 @@ def get_python_configurations(build_selector): PythonConfiguration(version='3.5.4', arch="64", identifier='cp35-win_amd64'), PythonConfiguration(version='3.6.8', arch="32", identifier='cp36-win32'), PythonConfiguration(version='3.6.8', arch="64", identifier='cp36-win_amd64'), - PythonConfiguration(version='3.7.5', arch="32", identifier='cp37-win32'), - PythonConfiguration(version='3.7.5', arch="64", identifier='cp37-win_amd64'), - PythonConfiguration(version='3.8.0', arch="32", identifier='cp38-win32'), - PythonConfiguration(version='3.8.0', arch="64", identifier='cp38-win_amd64'), + PythonConfiguration(version='3.7.6', arch="32", identifier='cp37-win32'), + PythonConfiguration(version='3.7.6', arch="64", identifier='cp37-win_amd64'), + PythonConfiguration(version='3.8.1', arch="32", identifier='cp38-win32'), + PythonConfiguration(version='3.8.1', arch="64", identifier='cp38-win_amd64'), ] if IS_RUNNING_ON_TRAVIS: