Add python 3.8 support

pypa · Nov 2, 2019 · edae919 · edae919
1 parent e04968c
commit edae919
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -19,8 +19,9 @@ What does it do?
 | Python 3.5 | ✅ | ✅ | ✅ | ✅  | ✅  |
 | Python 3.6 | ✅ | ✅ | ✅ | ✅  | ✅  |
 | Python 3.7 | ✅ | ✅ | ✅ | ✅  | ✅  |
+| Python 3.8 | ✅ | ✅ | ✅ | ✅  | ✅  |
 
-> ¹ Not supported on Azure Pipelines 
+> ¹ Not supported on Azure Pipelines
 >
 > ² Not supported on Travis
 
@@ -58,7 +59,7 @@ Usage
 jobs:
 - job: linux
   pool: {vmImage: 'Ubuntu-16.04'}
-  steps: 
+  steps:
     - task: UsePythonVersion@0
     - bash: |
         python -m pip install --upgrade pip
@@ -68,7 +69,7 @@ jobs:
       inputs: {pathtoPublish: 'wheelhouse'}
 - job: macos
   pool: {vmImage: 'macOS-10.13'}
-  steps: 
+  steps:
     - task: UsePythonVersion@0
     - bash: |
         python -m pip install --upgrade pip
@@ -78,15 +79,9 @@ jobs:
       inputs: {pathtoPublish: 'wheelhouse'}
 - job: windows
   pool: {vmImage: 'vs2017-win2016'}
-  steps: 
+  steps:
     - {task: UsePythonVersion@0, inputs: {versionSpec: '2.7', architecture: x86}}
     - {task: UsePythonVersion@0, inputs: {versionSpec: '2.7', architecture: x64}}
-    - {task: UsePythonVersion@0, inputs: {versionSpec: '3.5', architecture: x86}}
-    - {task: UsePythonVersion@0, inputs: {versionSpec: '3.5', architecture: x64}}
-    - {task: UsePythonVersion@0, inputs: {versionSpec: '3.6', architecture: x86}}
-    - {task: UsePythonVersion@0, inputs: {versionSpec: '3.6', architecture: x64}}
-    - {task: UsePythonVersion@0, inputs: {versionSpec: '3.7', architecture: x86}}
-    - {task: UsePythonVersion@0, inputs: {versionSpec: '3.7', architecture: x64}}
     - script: choco install vcpython27 -f -y
       displayName: Install Visual C++ for Python 2.7
     - bash: |
@@ -110,7 +105,7 @@ jobs:
 
     ```yaml
     language: python
-    
+
     matrix:
       include:
         - sudo: required
@@ -126,7 +121,7 @@ jobs:
       - cibuildwheel --output-dir wheelhouse
     ```
 
-  To build on Windows too, add this matrix entry: 
+  To build on Windows too, add this matrix entry:
   ```yaml
     - os: windows
       language: shell
@@ -147,7 +142,7 @@ jobs:
         <img width="16" src="https://unpkg.com/simple-icons@latest/icons/apple.svg" />
         <img width="16" src="https://unpkg.com/simple-icons@latest/icons/linux.svg" />
     </summary>
-    
+
 - To build Linux and Mac wheels on CircleCI, create a `.circleci/config.yml` file in your repo,
 
   ```
@@ -213,14 +208,14 @@ jobs:
       - path: "wheelhouse\\*.whl"
         name: Wheels
     ```
-    
+
   AppVeyor will store the built wheels for you - you can access them from the project console. Alternatively, you may want to store them in the same place as the Travis CI build. See [AppVeyor deployment docs](https://www.appveyor.com/docs/deployment/) for more info, or see [Delivering to PyPI](#delivering-to-pypi) below.
-    
+
 </details>
 
 - Commit those files, enable building of your repo on Travis CI and AppVeyor, and push.
 
-All being well, you should get wheels delivered to you in a few minutes. 
+All being well, you should get wheels delivered to you in a few minutes.
 
 > ⚠️ Got an error? Check the [checklist](#it-didnt-work) below.
 
@@ -259,7 +254,7 @@ Options
 usage: cibuildwheel [-h] [--platform {auto,linux,macos,windows}]
                     [--output-dir OUTPUT_DIR] [--print-build-identifiers]
                     [project_dir]
-    
+
 Build wheels for all the platforms.
 
 positional arguments:
@@ -312,7 +307,7 @@ When both options are specified, both conditions are applied and only builds wit
 
 The format is `python_tag-platform_tag`. The tags are similar but not identical to the ones defined in [PEP 425](https://www.python.org/dev/peps/pep-0425/#details).
 
-Python tags look like `cp27` `cp34` `cp35` `cp36` `cp37`
+Python tags look like `cp27` `cp34` `cp35` `cp36` `cp37` `cp38`
 
 Platform tags look like `macosx_10_6_intel` `manylinux_x86_64` `manylinux_i686` `win32` `win_amd64`
 
@@ -355,10 +350,10 @@ You must set this variable to pass variables to Linux builds (since they execute
 
 You can use `$PATH` syntax to insert other variables, or the `$(pwd)` syntax to insert the output of other shell commands.
 
-Example: `CFLAGS="-g -Wall" CXXFLAGS="-Wall"`  
-Example: `PATH=$PATH:/usr/local/bin`  
-Example: `BUILD_TIME="$(date)"`  
-Example: `PIP_EXTRA_INDEX_URL="https://pypi.myorg.com/simple"`  
+Example: `CFLAGS="-g -Wall" CXXFLAGS="-Wall"`
+Example: `PATH=$PATH:/usr/local/bin`
+Example: `BUILD_TIME="$(date)"`
+Example: `PIP_EXTRA_INDEX_URL="https://pypi.myorg.com/simple"`
 
 Platform-specific variants also available:
 `CIBW_ENVIRONMENT_MACOS` | `CIBW_ENVIRONMENT_WINDOWS` | `CIBW_ENVIRONMENT_LINUX`
@@ -378,11 +373,11 @@ If dependencies are required to build your wheel (for example if you include a h
 
 The active Python binary can be accessed using `python`, and pip with `pip`; `cibuildwheel` makes sure the right version of Python and pip will be executed. `{project}` can be used as a placeholder for the absolute path to the project's root.
 
-Example: `pip install .`  
-Example: `pip install pybind11`  
+Example: `pip install .`
+Example: `pip install pybind11`
 Example: `yum install -y libffi-dev && pip install .`
 
-Platform-specific variants also available:  
+Platform-specific variants also available:
  `CIBW_BEFORE_BUILD_MACOS` | `CIBW_BEFORE_BUILD_WINDOWS` | `CIBW_BEFORE_BUILD_LINUX`
 
 ***
@@ -400,8 +395,8 @@ Beware to specify a valid Docker image that can be used in the same way as the o
 
 Note that `auditwheel` detects the version of the `manylinux` standard in the Docker image through the `AUDITWHEEL_PLAT` environment variable, as `cibuildwheel` has no way of detecting the correct `--plat` command line argument to pass to `auditwheel` for a custom image. If a Docker image does not correctly set this `AUDITWHEEL_PLAT` environment variable, the `CIBW_ENVIRONMENT` option can be used to do so (e.g., `CIBW_ENVIRONMENT="manylinux2010_$(uname -m)"`).
 
-Example: `manylinux1`  
-Example: `dockcross/manylinux-x64`  
+Example: `manylinux1`
+Example: `dockcross/manylinux-x64`
 Example: `dockcross/manylinux-x86`
 
 ***
@@ -413,7 +408,7 @@ Optional.
 
 Shell command to run tests after the build. The wheel will be installed automatically and available for import from the tests. `{project}` can be used as a placeholder for the absolute path to the project's root and will be replaced by `cibuildwheel`.
 
-On Linux and Mac, the command runs in a shell, so you can write things like `cmd1 && cmd2`. 
+On Linux and Mac, the command runs in a shell, so you can write things like `cmd1 && cmd2`.
 
 Example: `nosetests {project}/tests`
 
@@ -429,7 +424,7 @@ Optional.
 
 Space-separated list of dependencies required for running the tests.
 
-Example: `pytest`  
+Example: `pytest`
 Example: `nose==1.3.7 moto==0.4.31`
 
 Platform-specific variants also available:
@@ -480,13 +475,13 @@ After you've built your wheels, you'll probably want to deliver them to PyPI.
 On your development machine, do the following...
 
 ```bash
-# Clear out your 'dist' folder. 
+# Clear out your 'dist' folder.
 rm -rf dist
 # Make a source distribution
 python setup.py sdist
 
 # 🏃🏻
-# Go and download your wheel files from wherever you put them. Put 
+# Go and download your wheel files from wherever you put them. Put
 # them all into the 'dist' folder.
 
 # Upload using 'twine' (you may need to 'pip install twine')
@@ -518,7 +513,7 @@ If your wheel didn't compile, check the list below for some debugging tips.
 Working examples
 ----------------
 
-Here are some repos that use cibuildwheel. 
+Here are some repos that use cibuildwheel.
 
 - [pyinstrument_cext](https://github.com/joerick/pyinstrument_cext)
 - [websockets](https://github.com/aaugustin/websockets)
@@ -536,7 +531,7 @@ Here are some repos that use cibuildwheel.
 Legal note
 ----------
 
-Since `cibuildwheel` runs the wheel through delocate or auditwheel, it might automatically bundle dynamically linked libraries from the build machine. 
+Since `cibuildwheel` runs the wheel through delocate or auditwheel, it might automatically bundle dynamically linked libraries from the build machine.
 
 It helps ensure that the library can run without any dependencies outside of the pip toolchain.
 
@@ -568,7 +563,7 @@ _26 May 2019_
 
 - ✨ Add support for building on Azure pipelines! This lets you build all
   Linux, Mac and Windows wheels on one service, so it promises to be the
-  easiest to set up! Check out the quickstart in the docs, or 
+  easiest to set up! Check out the quickstart in the docs, or
   [cibuildwheel-azure-example](https://github.com/joerick/cibuildwheel-azure-example)
   for an example project. (#126, #132)
 - 🛠 Internal change - the end-to-end test projects format was updated, so we
@@ -708,7 +703,7 @@ _11 June 2017_
 
 _13 April 2017_
 
-- ✨ Added `CIBW_SKIP` option, letting users explicitly skip a build 
+- ✨ Added `CIBW_SKIP` option, letting users explicitly skip a build
 - ✨ Added `CIBW_BEFORE_BUILD` option, letting users run a shell command before the build starts
 
 ### 0.1.3
@@ -750,7 +745,7 @@ Maintainers
 Credits
 -------
 
-`cibuildwheel` stands on the shoulders of giants. 
+`cibuildwheel` stands on the shoulders of giants.
 
 - ⭐️ @matthew-brett for [matthew-brett/multibuild](http://github.com/matthew-brett/multibuild) and [matthew-brett/delocate](http://github.com/matthew-brett/delocate)
 - @PyPA for the manylinux Docker images [pypa/manylinux](https://github.com/pypa/manylinux)

diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py
@@ -18,12 +18,14 @@ def get_python_configurations(build_selector):
         PythonConfiguration(identifier='cp35-manylinux_x86_64', path='/opt/python/cp35-cp35m'),
         PythonConfiguration(identifier='cp36-manylinux_x86_64', path='/opt/python/cp36-cp36m'),
         PythonConfiguration(identifier='cp37-manylinux_x86_64', path='/opt/python/cp37-cp37m'),
+        PythonConfiguration(identifier='cp38-manylinux_x86_64', path='/opt/python/cp38-cp38'),
         PythonConfiguration(identifier='cp27-manylinux_i686', path='/opt/python/cp27-cp27m'),
         PythonConfiguration(identifier='cp27-manylinux_i686', path='/opt/python/cp27-cp27mu'),
         PythonConfiguration(identifier='cp34-manylinux_i686', path='/opt/python/cp34-cp34m'),
         PythonConfiguration(identifier='cp35-manylinux_i686', path='/opt/python/cp35-cp35m'),
         PythonConfiguration(identifier='cp36-manylinux_i686', path='/opt/python/cp36-cp36m'),
         PythonConfiguration(identifier='cp37-manylinux_i686', path='/opt/python/cp37-cp37m'),
+        PythonConfiguration(identifier='cp38-manylinux_i686', path='/opt/python/cp38-cp38'),
     ]
 
     # skip builds as required

diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py
@@ -19,6 +19,7 @@ def get_python_configurations(build_selector):
         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'),
     ]
 
     # skip builds as required

diff --git a/test/shared/utils.py b/test/shared/utils.py
@@ -55,24 +55,28 @@ def expected_wheels(package_name, package_version):
             '{package_name}-{package_version}-cp35-cp35m-manylinux1_x86_64.whl',
             '{package_name}-{package_version}-cp36-cp36m-manylinux1_x86_64.whl',
             '{package_name}-{package_version}-cp37-cp37m-manylinux1_x86_64.whl',
+            '{package_name}-{package_version}-cp38-cp38-manylinux1_x86_64.whl',
             '{package_name}-{package_version}-cp27-cp27m-manylinux2010_x86_64.whl',
             '{package_name}-{package_version}-cp27-cp27mu-manylinux2010_x86_64.whl',
             '{package_name}-{package_version}-cp34-cp34m-manylinux2010_x86_64.whl',
             '{package_name}-{package_version}-cp35-cp35m-manylinux2010_x86_64.whl',
             '{package_name}-{package_version}-cp36-cp36m-manylinux2010_x86_64.whl',
             '{package_name}-{package_version}-cp37-cp37m-manylinux2010_x86_64.whl',
+            '{package_name}-{package_version}-cp38-cp38-manylinux2010_x86_64.whl',
             '{package_name}-{package_version}-cp27-cp27m-manylinux1_i686.whl',
             '{package_name}-{package_version}-cp27-cp27mu-manylinux1_i686.whl',
             '{package_name}-{package_version}-cp34-cp34m-manylinux1_i686.whl',
             '{package_name}-{package_version}-cp35-cp35m-manylinux1_i686.whl',
             '{package_name}-{package_version}-cp36-cp36m-manylinux1_i686.whl',
             '{package_name}-{package_version}-cp37-cp37m-manylinux1_i686.whl',
+            '{package_name}-{package_version}-cp38-cp38-manylinux1_i686.whl',
             '{package_name}-{package_version}-cp27-cp27m-manylinux2010_i686.whl',
             '{package_name}-{package_version}-cp27-cp27mu-manylinux2010_i686.whl',
             '{package_name}-{package_version}-cp34-cp34m-manylinux2010_i686.whl',
             '{package_name}-{package_version}-cp35-cp35m-manylinux2010_i686.whl',
             '{package_name}-{package_version}-cp36-cp36m-manylinux2010_i686.whl',
             '{package_name}-{package_version}-cp37-cp37m-manylinux2010_i686.whl',
+            '{package_name}-{package_version}-cp38-cp38-manylinux2010_i686.whl',
         ]
     elif platform == 'windows':
         templates = [
@@ -96,6 +100,7 @@ def expected_wheels(package_name, package_version):
             '{package_name}-{package_version}-cp35-cp35m-macosx_10_6_intel.whl',
             '{package_name}-{package_version}-cp36-cp36m-macosx_10_6_intel.whl',
             '{package_name}-{package_version}-cp37-cp37m-macosx_10_6_intel.whl',
+            '{package_name}-{package_version}-cp38-cp38-macosx_10_9_x86_64.whl',
         ]
     else:
         raise Exception('unsupported platform')