Commit d4819e2a authored by mattip's avatar mattip
Browse files

revert CI temporary supression and update README

parent 94636b64
...@@ -15,205 +15,205 @@ matrix: ...@@ -15,205 +15,205 @@ matrix:
include: include:
- os: linux - os: linux
dist: trusty dist: trusty
# # 64-bit builds # 64-bit builds
# - os: linux - os: linux
# dist: xenial dist: xenial
# env: env:
# - TEST_BUILDS=1 - TEST_BUILDS=1
# # 64-bit builds, manylinux2010 # 64-bit builds, manylinux2010
# - os: linux - os: linux
# dist: xenial dist: xenial
# env: env:
# - TEST_BUILDS=1 - TEST_BUILDS=1
# - MB_ML_VER=2010 - MB_ML_VER=2010
# # 32-bit builds # 32-bit builds
# - os: linux - os: linux
# dist: xenial dist: xenial
# env: env:
# - TEST_BUILDS=1 - TEST_BUILDS=1
# - PLAT=i686 - PLAT=i686
- os: linux - os: linux
dist: xenial dist: xenial
env: env:
- TEST_BUILDS=1 - TEST_BUILDS=1
- PLAT=i686 - PLAT=i686
- MB_ML_VER=2010 - MB_ML_VER=2010
# # Builds with caching # Builds with caching
# - os: linux - os: linux
# dist: xenial dist: xenial
# env: env:
# - TEST_BUILDS=1 - TEST_BUILDS=1
# - USE_CCACHE=1 - USE_CCACHE=1
# # OSX builds # OSX builds
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=2.7 - MB_PYTHON_VERSION=2.7
# - TEST_BUILDS=1 - TEST_BUILDS=1
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=2.7 - MB_PYTHON_VERSION=2.7
# - MB_PYTHON_OSX_VER=10.9 - MB_PYTHON_OSX_VER=10.9
# - TEST_BUILDS=1 - TEST_BUILDS=1
# - os: osx - os: osx
# language: objective-c language: objective-c
# env: env:
# - MB_PYTHON_VERSION=2.7 - MB_PYTHON_VERSION=2.7
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.5
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.5
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=3.6 - MB_PYTHON_VERSION=3.6
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=3.6 - MB_PYTHON_VERSION=3.6
# - VENV=venv - VENV=venv
# - MB_PYTHON_OSX_VER=10.9 - MB_PYTHON_OSX_VER=10.9
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.7
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.7
# - VENV=venv - VENV=venv
# - MB_PYTHON_OSX_VER=10.9 - MB_PYTHON_OSX_VER=10.9
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.7
# - VENV=venv - VENV=venv
# - USE_CCACHE=1 - USE_CCACHE=1
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=3.8 - MB_PYTHON_VERSION=3.8
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=pypy-4.0 - MB_PYTHON_VERSION=pypy-4.0
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=pypy-5.0 - MB_PYTHON_VERSION=pypy-5.0
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=pypy-5.1 - MB_PYTHON_VERSION=pypy-5.1
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=pypy-5.3 - MB_PYTHON_VERSION=pypy-5.3
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=pypy-5.4 - MB_PYTHON_VERSION=pypy-5.4
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=pypy-5.6 - MB_PYTHON_VERSION=pypy-5.6
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=pypy-5.7 - MB_PYTHON_VERSION=pypy-5.7
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=pypy-5.8 - MB_PYTHON_VERSION=pypy-5.8
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=pypy-5.9 - MB_PYTHON_VERSION=pypy-5.9
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=pypy-6.0 - MB_PYTHON_VERSION=pypy-6.0
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=pypy-7.0 - MB_PYTHON_VERSION=pypy-7.0
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=pypy-7.1 - MB_PYTHON_VERSION=pypy-7.1
# - VENV=venv - VENV=venv
# - os: osx - os: osx
# env: env:
# - MB_PYTHON_VERSION=pypy-7.2 - MB_PYTHON_VERSION=pypy-7.2
# - VENV=venv - VENV=venv
# # Default OSX (xcode image) is 10.13 (xcode 9.4.1) as of 2018-08-03 # Default OSX (xcode image) is 10.13 (xcode 9.4.1) as of 2018-08-03
# # See: https://docs.travis-ci.com/user/reference/osx/ # See: https://docs.travis-ci.com/user/reference/osx/
# - os: osx - os: osx
# osx_image: xcode10.1 osx_image: xcode10.1
# env: env:
# - MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.7
# - TEST_BUILDS=1 - TEST_BUILDS=1
# - os: osx - os: osx
# osx_image: xcode10.1 osx_image: xcode10.1
# env: env:
# - MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.7
# - MB_PYTHON_OSX_VER=10.9 - MB_PYTHON_OSX_VER=10.9
# - TEST_BUILDS=1 - TEST_BUILDS=1
# - os: osx - os: osx
# osx_image: xcode10 osx_image: xcode10
# env: env:
# - MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.7
# - os: osx - os: osx
# osx_image: xcode10 osx_image: xcode10
# env: env:
# - MB_PYTHON_VERSION=3.8 - MB_PYTHON_VERSION=3.8
# - os: osx - os: osx
# osx_image: xcode10.1 osx_image: xcode10.1
# env: env:
# - MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.5
# - os: osx - os: osx
# osx_image: xcode10 osx_image: xcode10
# env: env:
# - MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.5
# - os: osx - os: osx
# osx_image: xcode9.4 osx_image: xcode9.4
# env: env:
# - MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.5
# - os: osx - os: osx
# osx_image: xcode9.3 osx_image: xcode9.3
# env: env:
# - MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.5
# - os: osx - os: osx
# osx_image: xcode9.2 osx_image: xcode9.2
# env: env:
# - MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.5
# - os: osx - os: osx
# osx_image: xcode9.1 osx_image: xcode9.1
# env: env:
# - MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.5
# - os: osx - os: osx
# osx_image: xcode9 osx_image: xcode9
# env: env:
# - MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.5
# - os: osx - os: osx
# osx_image: xcode8.3 osx_image: xcode8.3
# env: env:
# - MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.5
# - os: osx - os: osx
# osx_image: xcode8.2 osx_image: xcode8.2
# env: env:
# - MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.5
# - os: osx - os: osx
# osx_image: xcode8.1 osx_image: xcode8.1
# env: env:
# - MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.5
# - os: osx - os: osx
# osx_image: xcode8 osx_image: xcode8
# env: env:
# - MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.5
# - os: osx - os: osx
# osx_image: xcode7.3 osx_image: xcode7.3
# env: env:
# - MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.5
# ARM aarch 64 builds # ARM aarch 64 builds
- os: linux - os: linux
arch: arm64 arch: arm64
......
...@@ -82,19 +82,21 @@ a clean Ubuntu 14.04 container. ...@@ -82,19 +82,21 @@ a clean Ubuntu 14.04 container.
Build phase Build phase
----------- -----------
Specify the Manylinux version to build for with the `MB_ML_VER` environment variable. The default version is `1`. Versions that are currently valid are: Specify the Manylinux version to build for with the ``MB_ML_VER`` environment
variable. The default version is ``1``. Versions that are currently valid are:
* `1` corresponding to manylinux1 (see [PEP 513](https://www.python.org/dev/peps/pep-0513); * ``1`` corresponding to manylinux1 (see [PEP 513](https://www.python.org/dev/peps/pep-0513);
* `2010` corresponding to manylinux2010 (see [PEP * ``2010`` corresponding to manylinux2010 (see [PEP
571](https://www.python.org/dev/peps/pep-0571). 571](https://www.python.org/dev/peps/pep-0571).
* `2014` corresponding to manylinux2014 (see [PEP * ``2014`` corresponding to manylinux2014 and adds more architectures to ``PLAT``
599](https://www.python.org/dev/peps/pep-0599). (see [PEP 599](https://www.python.org/dev/peps/pep-0599).
The environment variable specified which Manylinux docker container you are building in. The environment variable specified which Manylinux docker container you are building in.
The `PLAT` environment variable can be one of `x86_64`, `i686` `s390x`, The ``PLAT`` environment variable can be one of ``x86_64``, ``i686`` ``s390x``,
`ppc64le`, or `aarch64`, specifying 64-bit x86, 32-bit x86, 64-bit s390x, ``ppc64le``, or ``aarch64``, specifying 64-bit x86, 32-bit x86, 64-bit s390x,
PowerPC, and ARM builds, respectively. The default is `x86_64`. PowerPC, and ARM builds, respectively. The default is ``x86_64``. Only ``x86_64``
and ``i686`` are valild on manylinux1 and manylinux2010.
``multibuild/travis_linux_steps.sh`` defines the ``build_wheel`` function, ``multibuild/travis_linux_steps.sh`` defines the ``build_wheel`` function,
which starts up the Manylinux1 Docker container to run a wrapper script which starts up the Manylinux1 Docker container to run a wrapper script
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment