From 9b31b5e6c9f5334698560df62db72b9922ae6358 Mon Sep 17 00:00:00 2001 From: Lele Gaifax Date: Sat, 16 Jun 2018 13:42:11 +0200 Subject: [PATCH 1/4] Add support for Python 3.7 This enables building binary wheels for Python 3.7, now at its rc1 release. It is included in the latest manylinux1 Docker image, see https://github.com/pypa/manylinux/pull/196. Accordingly to https://www.appveyor.com/docs/build-environment/#python it is not yet available on Appveyor. --- README.md | 2 +- cibuildwheel/linux.py | 2 ++ cibuildwheel/macos.py | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fd36baf14..dd9225c7a 100644 --- a/README.md +++ b/README.md @@ -152,7 +152,7 @@ Space-separated list of builds to skip. Each build has an identifier like `cp27- The format is `python_tag-platform_tag`. The tags are as defined in [PEP 0425](https://www.python.org/dev/peps/pep-0425/#details). -Python tags look like `cp27` `cp34` `cp35` `cp36` +Python tags look like `cp27` `cp34` `cp35` `cp36` `cp37` Platform tags look like `macosx_10_6_intel` `manylinux1_x86_64` `manylinux1_i686` `win32` `win_amd64` diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index 9d90a7ee5..0116e6005 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -25,11 +25,13 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be PythonConfiguration(identifier='cp34-manylinux1_x86_64', path='/opt/python/cp34-cp34m'), PythonConfiguration(identifier='cp35-manylinux1_x86_64', path='/opt/python/cp35-cp35m'), PythonConfiguration(identifier='cp36-manylinux1_x86_64', path='/opt/python/cp36-cp36m'), + PythonConfiguration(identifier='cp37-manylinux1_x86_64', path='/opt/python/cp37-cp37m'), PythonConfiguration(identifier='cp27-manylinux1_i686', path='/opt/python/cp27-cp27m'), PythonConfiguration(identifier='cp27-manylinux1_i686', path='/opt/python/cp27-cp27mu'), PythonConfiguration(identifier='cp34-manylinux1_i686', path='/opt/python/cp34-cp34m'), PythonConfiguration(identifier='cp35-manylinux1_i686', path='/opt/python/cp35-cp35m'), PythonConfiguration(identifier='cp36-manylinux1_i686', path='/opt/python/cp36-cp36m'), + PythonConfiguration(identifier='cp37-manylinux1_i686', path='/opt/python/cp37-cp36m'), ] # skip builds as required diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 4107c51f2..b445d2ba7 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -17,6 +17,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be 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.5/python-3.6.5-macosx10.6.pkg'), + PythonConfiguration(version='3.7', identifier='cp37-macosx_10_6_intel', url='https://www.python.org/ftp/python/3.7.0/python-3.7.0rc1-macosx10.6.pkg'), ] get_pip_url = 'https://bootstrap.pypa.io/get-pip.py' get_pip_script = '/tmp/get-pip.py' From e5b9d1f5864b00b03cb9b429712b11005abdb848 Mon Sep 17 00:00:00 2001 From: Lele Gaifax Date: Sat, 16 Jun 2018 15:23:26 +0200 Subject: [PATCH 2/4] Fix mistake in directory name --- cibuildwheel/linux.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index 0116e6005..114b63dab 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -31,7 +31,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be PythonConfiguration(identifier='cp34-manylinux1_i686', path='/opt/python/cp34-cp34m'), PythonConfiguration(identifier='cp35-manylinux1_i686', path='/opt/python/cp35-cp35m'), PythonConfiguration(identifier='cp36-manylinux1_i686', path='/opt/python/cp36-cp36m'), - PythonConfiguration(identifier='cp37-manylinux1_i686', path='/opt/python/cp37-cp36m'), + PythonConfiguration(identifier='cp37-manylinux1_i686', path='/opt/python/cp37-cp37m'), ] # skip builds as required From 0b21df216e1b40344f78d1a0c73d64694b33b108 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sun, 17 Jun 2018 20:52:46 +0100 Subject: [PATCH 3/4] update support matrix in readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index dd9225c7a..cf7e92062 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ What does it do? | Python 3.4 | ✅ | ✅ | ✅ | ✅ | ✅ | | Python 3.5 | ✅ | ✅ | ✅ | ✅ | ✅ | | Python 3.6 | ✅ | ✅ | ✅ | ✅ | ✅ | +| Python 3.7 | ✅ | ✅ | ✅ | | | - Builds manylinux, macOS and Windows (32 and 64bit) wheels using Travis CI and Appveyor - Bundles shared library dependencies on Linux and macOS through [auditwheel](https://github.com/pypa/auditwheel) and [delocate](https://github.com/matthew-brett/delocate) From e3981db2a622aa34422931c5d8fc64470f6a51bb Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 18 Jun 2018 22:35:05 +0100 Subject: [PATCH 4/4] Skip the custom docker image specifier for Python 3.7 We'll reenable this when 3.7 is released and dockcross updates :) --- test/06_docker_images/environment.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/06_docker_images/environment.json b/test/06_docker_images/environment.json index d91a26ef2..bd3ceda8b 100644 --- a/test/06_docker_images/environment.json +++ b/test/06_docker_images/environment.json @@ -1,4 +1,5 @@ { "CIBW_MANYLINUX1_X86_64_IMAGE": "dockcross/manylinux-x64", - "CIBW_MANYLINUX1_I686_IMAGE": "dockcross/manylinux-x86" + "CIBW_MANYLINUX1_I686_IMAGE": "dockcross/manylinux-x86", + "CIBW_SKIP": "cp37-manylinux*" }