From b579cd5f2a9841ae3221f04e71fe5f7a047d94b0 Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Sun, 10 Mar 2019 21:20:29 +0100 Subject: [PATCH 1/5] Updating version of Python 2.7 to 2.7.16 on macOS --- cibuildwheel/macos.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index a62aadd0..8a41c888 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -13,7 +13,7 @@ from .util import prepare_command, get_build_verbosity_extra_flags def build(project_dir, output_dir, test_command, test_requires, before_build, build_verbosity, build_selector, 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.15/python-2.7.15-macosx10.6.pkg'), + PythonConfiguration(version='2.7', identifier='cp27-macosx_10_6_intel', url='https://www.python.org/ftp/python/2.7.16/python-2.7.16-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.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'), From 44256e4aa566b5cfea4ae82fa2cca72d3736bc3c Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Sun, 10 Mar 2019 22:25:28 +0100 Subject: [PATCH 2/5] Revert "Running 'pip install --upgrade setuptools' with 'sudo' on macOS, fixing #122" (#129) This reverts commit d79ca07bbbb1f515f706ab17b25d6ec1b5f95329. --- cibuildwheel/macos.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index a62aadd0..5ef450a1 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -86,8 +86,7 @@ def build(project_dir, output_dir, test_command, test_requires, before_build, bu # install pip & wheel call(['python', get_pip_script, '--no-setuptools', '--no-wheel'], env=env) call(['pip', '--version'], env=env) - # sudo required, because the removal of the old version of setuptools might cause problems with newer pip versions (see issue #122) - call(['sudo', 'pip', 'install', '--upgrade', 'setuptools'], env=env) + call(['pip', 'install', '--upgrade', 'setuptools'], env=env) call(['pip', 'install', 'wheel'], env=env) call(['pip', 'install', 'delocate'], env=env) From 1d3c59d80444a9d0d656ad48cd2796ae836538b5 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sun, 10 Mar 2019 11:53:37 +0100 Subject: [PATCH 3/5] Update openssl patch from 1.0.2q to 1.0.2r on macOS --- cibuildwheel/macos.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 8ad6c0be..8d873c42 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -55,7 +55,7 @@ def build(project_dir, output_dir, test_command, test_requires, before_build, bu call(['sudo', 'installer', '-pkg', '/tmp/Python.pkg', '-target', '/']) # patch open ssl if config.version in ('3.4', '3.5'): - call(['curl', '-fsSLo', '/tmp/python-patch.tar.gz', 'https://github.com/mayeut/patch-macos-python-openssl/releases/download/v1.0.2q/patch-macos-python-%s-openssl-v1.0.2q.tar.gz' % config.version]) + call(['curl', '-fsSLo', '/tmp/python-patch.tar.gz', 'https://github.com/mayeut/patch-macos-python-openssl/releases/download/v1.0.2r/patch-macos-python-%s-openssl-v1.0.2r.tar.gz' % config.version]) call(['sudo', 'tar', '-C', '/Library/Frameworks/Python.framework/Versions/%s/' % config.version, '-xmf', '/tmp/python-patch.tar.gz']) installation_bin_path = '/Library/Frameworks/Python.framework/Versions/{}/bin'.format(config.version) From 054c2739979388de93c39e9c531cecdb5734fde4 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sun, 10 Mar 2019 23:32:06 +0000 Subject: [PATCH 4/5] Bump version --- README.md | 4 ++-- cibuildwheel/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f4445d13..4881132c 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Usage env: PIP=pip2 script: - - $PIP install cibuildwheel==0.10.1 + - $PIP install cibuildwheel==0.10.2 - cibuildwheel --output-dir wheelhouse ``` @@ -106,7 +106,7 @@ Usage ``` build_script: - - pip install cibuildwheel==0.10.1 + - pip install cibuildwheel==0.10.2 - cibuildwheel --output-dir wheelhouse artifacts: - path: "wheelhouse\\*.whl" diff --git a/cibuildwheel/__init__.py b/cibuildwheel/__init__.py index e754a834..85b551d3 100644 --- a/cibuildwheel/__init__.py +++ b/cibuildwheel/__init__.py @@ -1 +1 @@ -__version__ = '0.10.1' +__version__ = '0.10.2' diff --git a/setup.cfg b/setup.cfg index 80361271..93e0e512 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.10.1 +current_version = 0.10.2 commit = True tag = True message = Bump version diff --git a/setup.py b/setup.py index b5e5455a..e0ae2885 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ except ImportError: setup( name='cibuildwheel', - version='0.10.1', + version='0.10.2', install_requires=['bashlex!=0.13'], description="Build Python wheels on CI with minimal configuration.", long_description='For readme please see http://github.com/joerick/cibuildwheel', From 6852d87d2e2af5eb6968c2c54f3042d4c6a219da Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sun, 10 Mar 2019 23:37:36 +0000 Subject: [PATCH 5/5] Update changelog --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 4881132c..2fc0699c 100644 --- a/README.md +++ b/README.md @@ -410,6 +410,14 @@ This is similar to static linking, so it might have some licence implications. C Changelog ========= +### 0.10.2 + +_10 March 2019_ + +- 🛠 Revert temporary fix in macOS, that was working around a bug in pip 19 (#129) +- 🛠 Update Python to 2.7.16 on macOS +- 🛠 Update OpenSSL patch to 1.0.2r on macOS + ### 0.10.1 _3 February 2019_