diff options
author | Cosimo Lupo <cosimo@anthrotype.com> | 2017-08-23 19:45:13 +0100 |
---|---|---|
committer | Eugene Kliuchnikov <eustas@google.com> | 2017-08-23 20:45:13 +0200 |
commit | 4f455cac329d0c612887123c9dc6de9a66fa8490 (patch) | |
tree | 7d4c2d9f96660869bd30fc9d0578bbfafad6f5be /.travis.yml | |
parent | 019091f994c581bbadc3995a97a51488616d2f59 (diff) | |
download | brotli-4f455cac329d0c612887123c9dc6de9a66fa8490.zip brotli-4f455cac329d0c612887123c9dc6de9a66fa8490.tar.gz brotli-4f455cac329d0c612887123c9dc6de9a66fa8490.tar.bz2 |
disable buidling/deployment of python wheels (#583)
* [appveyor] remove 'deploy' stage; only test python 2.7 and 3.6
all the other python versions are being built and tested on
https://github.com/google/brotli-wheels/blob/d571d63/appveyor.yml
* remove terrify submodule as not needed any more
* [travis] just test py2.7 and 3.6 on linux; remove extra osx python builds
All the other python versions for OSX are being built/tested on:
https://github.com/google/brotli-wheels/blob/d571d63/.travis.yml
Also, there's no need to build and deploy wheels here, as that's done
in the separate repository.
* [setup.py] only rebuild if dependency are newer; fix typo in list of 'depends'
https://github.com/python/cpython/blob/v3.6.2/Lib/distutils/command/build_ext.py#L485-L500
* [ci] only run 'python setup.py test'
if we run 'python setup.py built test', the setuptools 'test' command will
forcibly re-run the build_ext subcommand because it wants to pass the --inplace
option (it ignores whether it's up to date, just re-runs it all the time).
with this we go from running built_ext twice, to running it only once per build
* [Makefile] run 'build_ext --inplace' instead of 'develop' as default target
The 'develop' command is like 'install' in the sense that it
modifies the user's python environment.
The default make target should be less intrusive, i.e. just building
the extension module in-place without modify anything in the user's
environment.
We don't need to tell make about the dependency between 'test' and
'build' target as that is baked in the `python setup.py test` command.
* [Makefile] add 'develop' target; remove unnecessary 'tests' target
`make test` is good enough
* [Makefile] `setup.py test` requires setuptools; run `python -m unittest`
This will work even if setuptools is not installed, which is unlikely
nowadays but still our `setup.py` works with plain distutils, so
we may well have our tests work without setuptools.
* [python/README.md] add ref to 'develop' target; remove 'tests', just 'make test'
* [setup.py] import modules as per nicksay's comment
https://github.com/google/brotli/pull/583#discussion_r131981049
* [Makefile] add 'develop' to .PHONY targets
remove 'tests' from .PHONY
* [appveyor] remove unused setup scripts
We don't need to install custom python versions, we are
using the pre-installed ones on Appveyor.
* [appveyor] remove unneeded setup code
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index 73a7615..2f26eaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,9 +125,22 @@ matrix: env: BUILD_SYSTEM=cmake C_COMPILER=pgcc CXX_COMPILER=pgc++ ### - ## Python build on Linux + ## Python 2.7 and 3.6 builds on Linux ### - os: linux + language: python + python: 2.7 + env: BUILD_SYSTEM=python C_COMPILER=gcc-6 CXX_COMPILER=g++-6 + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-6 + - g++-6 + - os: linux + language: python + python: 3.6 env: BUILD_SYSTEM=python C_COMPILER=gcc-6 CXX_COMPILER=g++-6 addons: apt: @@ -163,14 +176,10 @@ matrix: env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.4 CXX_COMPILER=g++-4.4 ### - ## Python OS X builds + ## Python 2.7 OS X build (using the system /usr/bin/python) ### - os: osx - env: BUILD_SYSTEM=python INSTALL_TYPE=macpython PYTHON_VERSION=2.7.12 C_COMPILER=gcc CXX_COMPILER=g++ - - os: osx - env: BUILD_SYSTEM=python INSTALL_TYPE=macpython PYTHON_VERSION=3.4.4 C_COMPILER=gcc CXX_COMPILER=g++ - - os: osx - env: BUILD_SYSTEM=python INSTALL_TYPE=macpython PYTHON_VERSION=3.5.2 C_COMPILER=gcc CXX_COMPILER=g++ + env: BUILD_SYSTEM=python C_COMPILER=gcc CXX_COMPILER=g++ ### ## Sanitizers @@ -262,19 +271,9 @@ after_success: - scripts/.travis.sh after_success before_deploy: -- if [ "${BUILD_SYSTEM}" = "python" ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then export WHEELS=$(ls ./dist/*.whl); fi - scripts/.travis.sh before_deploy deploy: -- provider: releases - api_key: - secure: YcCBi6W/w4dtKCa59Wfm8L5lGWvK7KxaFNDr3yh1Hz5aStXXf758pEMHGewnlbfbwuj5a3SjBb1nLp1M69OQJfxm442uXBaBKo52PM9PPbD7NjvbNIso73pqcSODXQXKuZxDFpEhfuDTVq3hUkUqiwhChWhrFucJsSL51i7qSss= - file: "${WHEELS}" - skip_cleanup: true - on: - repo: "google/brotli" - tags: true - condition: "${BUILD_SYSTEM} = python && ${TRAVIS_OS_NAME} = osx" - provider: bintray file: "scripts/.bintray.json" user: "eustas" |