Merge pull request #238 from mayeut/update-python

Update CPython on macOS / Windows
This commit is contained in:
Matthieu Darbois
2019-12-26 16:07:19 +01:00
committed by GitHub
2 changed files with 10 additions and 10 deletions
+3 -3
View File
@@ -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
@@ -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:
+7 -7
View File
@@ -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:
@@ -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: