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

Merge pull request #57 from mayeut/macos-update

Browse Source 
macOS: Fix Pip bugs resulting from PyPI TLS 1.2 enforcement
macOS: Fix brew python version
This commit is contained in:
Joe Rickerby
2018-04-02 15:48:57 +01:00
committed by GitHub
parent d6361c0e31 47873a9175
commit 7f77aa86b1
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -32,7 +32,7 @@ matrix:
- "PYTHON=python3" - "PYTHON=python3"
before_install: before_install:
- brew update - brew update
- brew install python3 - brew outdated python || brew upgrade python
script: script:
- | - |
cibuildwheel/macos.py
+9 -4
View File
@@ -13,11 +13,13 @@ from .util import prepare_command
def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, skip, environment): def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, skip, environment):
PythonConfiguration = namedtuple('PythonConfiguration', ['version', 'identifier', 'url']) PythonConfiguration = namedtuple('PythonConfiguration', ['version', 'identifier', 'url'])
python_configurations = [ python_configurations = [
PythonConfiguration(version='2.7', identifier='cp27-macosx_10_6_intel', url='https://www.python.org/ftp/python/2.7.13/python-2.7.13-macosx10.6.pkg'), PythonConfiguration(version='2.7', identifier='cp27-macosx_10_6_intel', url='https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg'),
PythonConfiguration(version='3.4', identifier='cp34-macosx_10_6_intel', url='https://www.python.org/ftp/python/3.4.4/python-3.4.4-macosx10.6.pkg'), PythonConfiguration(version='3.4', identifier='cp34-macosx_10_6_intel', url='https://www.python.org/ftp/python/3.4.4/python-3.4.4-macosx10.6.pkg'),
PythonConfiguration(version='3.5', identifier='cp35-macosx_10_6_intel', url='https://www.python.org/ftp/python/3.5.3/python-3.5.3-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.0/python-3.6.0-macosx10.6.pkg'), PythonConfiguration(version='3.6', identifier='cp36-macosx_10_6_intel', url='https://www.python.org/ftp/python/3.6.5/python-3.6.5-macosx10.6.pkg'),
] ]
get_pip_url = 'https://bootstrap.pypa.io/get-pip.py'
get_pip_script = '/tmp/get-pip.py'
pkgs_output = subprocess.check_output(['pkgutil', '--pkgs']) pkgs_output = subprocess.check_output(['pkgutil', '--pkgs'])
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
@@ -35,6 +37,9 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
abs_project_dir = os.path.abspath(project_dir) abs_project_dir = os.path.abspath(project_dir)
# get latest pip once and for all
call(['curl', '-L', '-o', get_pip_script, get_pip_url])
for config in python_configurations: for config in python_configurations:
if skip(config.identifier): if skip(config.identifier):
print('cibuildwheel: Skipping build %s' % config.identifier, file=sys.stderr) print('cibuildwheel: Skipping build %s' % config.identifier, file=sys.stderr)
@@ -63,7 +68,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
call([python, '--version'], env=env) call([python, '--version'], env=env)
# install pip & wheel # install pip & wheel
call([python, '-m', 'ensurepip', '--upgrade'], env=env) call([python, get_pip_script, '--no-setuptools', '--no-wheel'], env=env)
call([pip, '--version'], env=env) call([pip, '--version'], env=env)
call([pip, 'install', 'wheel'], env=env) call([pip, 'install', 'wheel'], env=env)
call([pip, 'install', 'delocate'], env=env) call([pip, 'install', 'delocate'], env=env)