Merge remote-tracking branch 'origin/master' into docs

docs/options.md

@@ -59,15 +59,15 @@ For `linux` you need Docker running, on Mac or Linux. For `macos`, you need a Ma
 
 > Choose the Python versions to build
 
-Space-separated list of builds to build and skip. Each build has an identifier like `cp27-manylinux_x86_64` or `cp34-macosx_10_6_intel` - you can list specific ones to build and `cibuildwheel` will only build those, and/or list ones to skip and `cibuildwheel` won't try to build them.
+Space-separated list of builds to build and skip. Each build has an identifier like `cp27-manylinux_x86_64` or `cp35-macosx_10_6_intel` - you can list specific ones to build and `cibuildwheel` will only build those, and/or list ones to skip and `cibuildwheel` won't try to build them.
 
 When both options are specified, both conditions are applied and only builds with a tag that matches `CIBW_BUILD` and does not match `CIBW_SKIP` will be built.
 
 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`
+Platform tags look like `macosx_10_6_intel` `macosx_10_9_x86_64` `manylinux_x86_64` `manylinux_i686` `win32` `win_amd64`
 
 You can also use shell-style globbing syntax (as per `fnmatch`).
 
@@ -77,10 +77,11 @@ Examples:
 
 - Only build on Python 3.6: `CIBW_BUILD=cp36-*`
 - Skip building on Python 2.7 on the Mac: `CIBW_SKIP=cp27-macosx_10_6_intel`
+- Skip building on Python 3.8 on the Mac: `CIBW_SKIP=cp38-macosx_10_9_x86_64`
 - Skip building on Python 2.7 on all platforms: `CIBW_SKIP=cp27-*`
 - Skip Python 2.7 on Windows: `CIBW_SKIP=cp27-win*`
 - Skip Python 2.7 on 32-bit Windows: `CIBW_SKIP=cp27-win32`
-- Skip Python 3.4 and Python 3.5: `CIBW_SKIP=cp34-* cp35-*`
+- Skip Python 2.7 and Python 3.5: `CIBW_SKIP=cp27-* cp35-*`
 - Skip Python 3.6 on Linux: `CIBW_SKIP=cp36-manylinux*`
 - Only build on Python 3 and skip 32-bit builds: `CIBW_BUILD=cp3?-*` and `CIBW_SKIP=*-win32 *-manylinux_i686`
 
@@ -95,10 +96,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`
@@ -114,11 +115,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`
 
 ### CIBW_MANYLINUX_X86_64_IMAGE, CIBW_MANYLINUX_I686_IMAGE {: #manylinux-image}
@@ -132,8 +133,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`
 
 ## Testing
@@ -155,7 +156,7 @@ Platform-specific variants also available:
 
 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: