From 121f7cc678d57c0bde0d37e0a57e9399788b1392 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 31 Mar 2018 12:36:27 +0200 Subject: [PATCH 1/3] Fix macos python3 test --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5d1465fbf..a9d61238c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ matrix: - "PYTHON=python3" before_install: - brew update - - brew install python3 + - brew outdated python || brew upgrade python script: - | From c38a33381dd5e3d8d83aa99223e327a201c9128f Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 31 Mar 2018 12:34:57 +0200 Subject: [PATCH 2/3] Update python versions on macos --- cibuildwheel/macos.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index ccaed7af4..ddd0bf792 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -13,10 +13,10 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, skip, environment): PythonConfiguration = namedtuple('PythonConfiguration', ['version', 'identifier', 'url']) 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.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.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.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.5/python-3.6.5-macosx10.6.pkg'), ] pkgs_output = subprocess.check_output(['pkgutil', '--pkgs']) From 47873a9175795a4db6a4bc7f09b05cae27531a6a Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 31 Mar 2018 13:02:42 +0200 Subject: [PATCH 3/3] Use latest pip on macos --- cibuildwheel/macos.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index ddd0bf792..836a71891 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -18,6 +18,8 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be 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.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']) if sys.version_info[0] >= 3: @@ -35,6 +37,9 @@ def call(args, env=None, cwd=None, shell=False): 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: if skip(config.identifier): print('cibuildwheel: Skipping build %s' % config.identifier, file=sys.stderr) @@ -63,7 +68,7 @@ def call(args, env=None, cwd=None, shell=False): call([python, '--version'], env=env) # 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, 'install', 'wheel'], env=env) call([pip, 'install', 'delocate'], env=env)