Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-14 09:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade pypy to 5.8, use pre-built numpy/scipy wheels

Browse Source 
numpy 1.13.0 fails with pypy 5.7.1, so this upgrades to 5.8.0.  I've
also uploaded pre-built .whl files to imaginary.ca (checked every 4
hours and rebuilt if needed), and list that as an extra pypi location
under the pypy pip install to avoid the long travis pypy build times for
a new release or branch.
This commit is contained in:
Jason Rhinelander 2017-06-11 21:20:03 -04:00
parent e45c211497
commit 2cc1916eaf
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@ -37,7 +37,7 @@ matrix:
env: PYTHON=3.6 CPP=14 CLANG env: PYTHON=3.6 CPP=14 CLANG
# Test a PyPy 2.7 build # Test a PyPy 2.7 build
- os: linux - os: linux
env: PYPY=5.7 PYTHON=2.7 CPP=11 GCC=4.8 env: PYPY=5.8 PYTHON=2.7 CPP=11 GCC=4.8
addons: addons:
apt: apt:
packages: [libblas-dev, liblapack-dev, gfortran] packages: [libblas-dev, liblapack-dev, gfortran]
@ -120,9 +120,9 @@ before_install:
SCRIPT_RUN_PREFIX="docker exec --tty $containerid" SCRIPT_RUN_PREFIX="docker exec --tty $containerid"
$SCRIPT_RUN_PREFIX sh -c 'for s in 0 15; do sleep $s; apt-get update && apt-get -qy dist-upgrade && break; done' $SCRIPT_RUN_PREFIX sh -c 'for s in 0 15; do sleep $s; apt-get update && apt-get -qy dist-upgrade && break; done'
else else
if [ "$PYPY" = "5.7" ]; then if [ "$PYPY" = "5.8" ]; then
curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux64.tar.bz2 | tar xj curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-linux64.tar.bz2 | tar xj
PY_CMD=$(echo `pwd`/pypy2-v5.7.1-linux64/bin/pypy) PY_CMD=$(echo `pwd`/pypy2-v5.8.0-linux64/bin/pypy)
CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -DPYTHON_EXECUTABLE:FILEPATH=$PY_CMD" CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -DPYTHON_EXECUTABLE:FILEPATH=$PY_CMD"
else else
PY_CMD=python$PYTHON PY_CMD=python$PYTHON
@ -179,7 +179,8 @@ install:
export NPY_NUM_BUILD_JOBS=2 export NPY_NUM_BUILD_JOBS=2
echo "Installing pytest, numpy, scipy..." echo "Installing pytest, numpy, scipy..."
${PYPY:+travis_wait 30} $PY_CMD -m pip install --user --upgrade --quiet pytest numpy scipy ${PYPY:+travis_wait 30} $PY_CMD -m pip install --user --upgrade pytest numpy scipy \
${PYPY:+--extra-index-url https://imaginary.ca/trusty-pypi}
echo "done." echo "done."
wget -q -O eigen.tar.gz https://bitbucket.org/eigen/eigen/get/3.3.3.tar.gz wget -q -O eigen.tar.gz https://bitbucket.org/eigen/eigen/get/3.3.3.tar.gz