Skip to content

Commit 2cc1916

Browse files
committed
Upgrade pypy to 5.8, use pre-built numpy/scipy wheels
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.
1 parent e45c211 commit 2cc1916

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

.travis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ matrix:
3737
env: PYTHON=3.6 CPP=14 CLANG
3838
# Test a PyPy 2.7 build
3939
- os: linux
40-
env: PYPY=5.7 PYTHON=2.7 CPP=11 GCC=4.8
40+
env: PYPY=5.8 PYTHON=2.7 CPP=11 GCC=4.8
4141
addons:
4242
apt:
4343
packages: [libblas-dev, liblapack-dev, gfortran]
@@ -120,9 +120,9 @@ before_install:
120120
SCRIPT_RUN_PREFIX="docker exec --tty $containerid"
121121
$SCRIPT_RUN_PREFIX sh -c 'for s in 0 15; do sleep $s; apt-get update && apt-get -qy dist-upgrade && break; done'
122122
else
123-
if [ "$PYPY" = "5.7" ]; then
124-
curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux64.tar.bz2 | tar xj
125-
PY_CMD=$(echo `pwd`/pypy2-v5.7.1-linux64/bin/pypy)
123+
if [ "$PYPY" = "5.8" ]; then
124+
curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-linux64.tar.bz2 | tar xj
125+
PY_CMD=$(echo `pwd`/pypy2-v5.8.0-linux64/bin/pypy)
126126
CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -DPYTHON_EXECUTABLE:FILEPATH=$PY_CMD"
127127
else
128128
PY_CMD=python$PYTHON
@@ -179,7 +179,8 @@ install:
179179
180180
export NPY_NUM_BUILD_JOBS=2
181181
echo "Installing pytest, numpy, scipy..."
182-
${PYPY:+travis_wait 30} $PY_CMD -m pip install --user --upgrade --quiet pytest numpy scipy
182+
${PYPY:+travis_wait 30} $PY_CMD -m pip install --user --upgrade pytest numpy scipy \
183+
${PYPY:+--extra-index-url https://imaginary.ca/trusty-pypi}
183184
echo "done."
184185
185186
wget -q -O eigen.tar.gz https://bitbucket.org/eigen/eigen/get/3.3.3.tar.gz

0 commit comments

Comments
 (0)