diff options
| author | Eugene Kliuchnikov <eustas@google.com> | 2016-08-11 10:59:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-11 10:59:52 +0200 |
| commit | 2e0d3214c2b6248a486822d2c5267d1c961a29d0 (patch) | |
| tree | a3313898b40193d844a19bc132e996c644b58a1c | |
| parent | 014f6511149f53193e3f6c3c4748632c68cc9c4b (diff) | |
| parent | 11dc16bf918729778f4f38713315f4cd21e9e0ea (diff) | |
| download | brotli-2e0d3214c2b6248a486822d2c5267d1c961a29d0.zip brotli-2e0d3214c2b6248a486822d2c5267d1c961a29d0.tar.gz brotli-2e0d3214c2b6248a486822d2c5267d1c961a29d0.tar.bz2 | |
Merge pull request #407 from anthrotype/fix-python-build
Fix python build
| -rwxr-xr-x | .travis.sh | 14 | ||||
| -rw-r--r-- | .travis.yml | 18 |
2 files changed, 16 insertions, 16 deletions
@@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash case "$1" in "install") @@ -36,14 +36,22 @@ case "$1" in ctest -V ;; "python") - python setup.py build_ext test + if [ "${TRAVIS_OS_NAME}" = "osx" ]; then + source venv/bin/activate + fi + python setup.py build_ext test ;; esac ;; "after_success") case "${BUILD_SYSTEM}" in "python") - pip wheel -w dist . + case "${TRAVIS_OS_NAME}" in + "osx") + source venv/bin/activate + pip wheel -w dist . + ;; + esac ;; esac ;; diff --git a/.travis.yml b/.travis.yml index 48bca71..5bccc6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -159,19 +159,11 @@ matrix: ## Python OS X builds ### - os: osx - env: BUILD_SYSTEM=python INSTALL_TYPE=system PYTHON_VERSION=2.7 + env: BUILD_SYSTEM=python INSTALL_TYPE=macpython PYTHON_VERSION=2.7.12 - os: osx - env: BUILD_SYSTEM=python INSTALL_TYPE=macpython PYTHON_VERSION=2.7.10 + env: BUILD_SYSTEM=python INSTALL_TYPE=macpython PYTHON_VERSION=3.4.4 - os: osx - env: BUILD_SYSTEM=python INSTALL_TYPE=homebrew PYTHON_VERSION=2.7.10 - - os: osx - env: BUILD_SYSTEM=python INSTALL_TYPE=macpython PYTHON_VERSION=3.4.3 - - os: osx - env: BUILD_SYSTEM=python INSTALL_TYPE=homebrew PYTHON_VERSION=3.4.3 - - os: osx - env: BUILD_SYSTEM=python INSTALL_TYPE=macpython PYTHON_VERSION=3.5.0 - - os: osx - env: BUILD_SYSTEM=python INSTALL_TYPE=homebrew PYTHON_VERSION=3.5.0 + env: BUILD_SYSTEM=python INSTALL_TYPE=macpython PYTHON_VERSION=3.5.2 ### ## Sanitizers @@ -240,7 +232,7 @@ after_success: - ./.travis.sh after_success before_deploy: -- if [ "${BUILD_SYSTEM}" = "python" ]; then export WHEELS=$(ls ./dist/*.whl); fi +- if [ "${BUILD_SYSTEM}" = "python" ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then export WHEELS=$(ls ./dist/*.whl); fi deploy: provider: releases @@ -251,4 +243,4 @@ deploy: on: repo: "google/brotli" tags: true - condition: "${BUILD_SYSTEM} = python" + condition: "${BUILD_SYSTEM} = python && ${TRAVIS_OS_NAME} = osx" |