Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-01-31 15:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use trusty for travis-ci pypy build (#716)

Browse Source 
Nightlies for pypy no longer run on Ubuntu 12.04; change the pypy build
distribution to the travis-ci trusty (i.e. 14.04) beta container.

The pypy build was also installing numpy and scipy for the *system*
python version, which was pointless; this also adds a guard to the
eigen/numpy/scipy install code with a !PYPY check.
This commit is contained in:
Jason Rhinelander 2017-03-10 06:50:50 -05:00 committed by Wenzel Jakob
parent 10d1304806
commit 303ee29d9f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -31,10 +31,10 @@ matrix:
env: PYTHON=3.6 CPP=14 CLANG env: PYTHON=3.6 CPP=14 CLANG
# Test a PyPy 2.7 nightly build # Test a PyPy 2.7 nightly build
- os: linux - os: linux
dist: trusty
env: PYPY=1 PYTHON=2.7 CPP=11 GCC=4.8 env: PYPY=1 PYTHON=2.7 CPP=11 GCC=4.8
addons: addons:
apt: apt:
sources: [ubuntu-toolchain-r-test, kubuntu-backports]
packages: [g++-4.8, cmake] packages: [g++-4.8, cmake]
- sudo: true - sudo: true
services: docker services: docker
@ -112,8 +112,7 @@ before_install:
if [ -n "$PYPY" ]; then if [ -n "$PYPY" ]; then
$PYPY_BINARY -m ensurepip $PYPY_BINARY -m ensurepip
$PYPY_BINARY -m pip install pytest $PYPY_BINARY -m pip install pytest
fi elif [ -n "$DOCKER" ]; then
if [ -n "$DOCKER" ]; then
docker pull $DOCKER docker pull $DOCKER
# Disable LTO with gcc until gcc 79296 is fixed: # Disable LTO with gcc until gcc 79296 is fixed:
export CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -DPYBIND11_LTO_CXX_FLAGS=" export CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -DPYBIND11_LTO_CXX_FLAGS="
@ -155,7 +154,7 @@ install:
apt-get -qy --no-install-recommends $APT_GET_EXTRA install \ apt-get -qy --no-install-recommends $APT_GET_EXTRA install \
$PY_DEBUG python$PY-dev python$PY-pytest python$PY-scipy \ $PY_DEBUG python$PY-dev python$PY-pytest python$PY-scipy \
libeigen3-dev cmake make ${COMPILER_PACKAGES} && break; done" libeigen3-dev cmake make ${COMPILER_PACKAGES} && break; done"
else elif [ -z "$PYPY" ]; then
pip install numpy scipy pytest pip install numpy scipy pytest
wget -q -O eigen.tar.gz https://bitbucket.org/eigen/eigen/get/3.3.0.tar.gz wget -q -O eigen.tar.gz https://bitbucket.org/eigen/eigen/get/3.3.0.tar.gz