@@ -143,8 +143,19 @@ matrix:
143143 # Test a PyPy 2.7 build
144144 - os : linux
145145 dist : trusty
146- env : PYPY=5.8 PYTHON=2.7 CPP=11 GCC=4.8
147- name : PyPy 5.8, Python 2.7, c++11, gcc 4.8
146+ env : PYPY=5.8.0 PYTHON=2.7 CPP=11 GCC=4.8
147+ name : PyPy 5.8.0, Python 2.7, c++11, gcc 4.8
148+ addons :
149+ apt :
150+ packages :
151+ - libblas-dev
152+ - liblapack-dev
153+ - gfortran
154+ # Test a PyPy 3.6 build
155+ - os : linux
156+ dist : trusty
157+ env : PYPY=7.3.0 PYTHON=3.6 CPP=11 GCC=4.8
158+ name : PyPy 7.3.0, Python 3.6, c++11, gcc 4.8
148159 addons :
149160 apt :
150161 packages :
@@ -211,9 +222,13 @@ before_install:
211222 SCRIPT_RUN_PREFIX="docker exec --tty $containerid"
212223 $SCRIPT_RUN_PREFIX sh -c 'for s in 0 15; do sleep $s; apt-get update && apt-get -qy dist-upgrade && break; done'
213224 else
214- if [ "$PYPY" = "5.8" ]; then
215- curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-linux64.tar.bz2 | tar xj
216- PY_CMD=$(echo `pwd`/pypy2-v5.8.0-linux64/bin/pypy)
225+ if [ "$PYPY" = "5.8.0" ]; then
226+ curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy{PYTHON:0:1}-v{PYPY}-linux64.tar.bz2 | tar xj
227+ PY_CMD=$(echo `pwd`/pypy${PYTHON:0:1}-v${PYPY}-linux64/bin/pypy)
228+ CMAKE_EXTRA_ARGS+=" -DPYTHON_EXECUTABLE:FILEPATH=$PY_CMD"
229+ elif [ -n "$PYPY" ]; then
230+ curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy${PYTHON:0:2}-v${PYPY}-linux64.tar.bz2 | tar xj
231+ PY_CMD=$(echo `pwd`/pypy${PYTHON:0:2}-v${PYPY}-linux64/bin/pypy)
217232 CMAKE_EXTRA_ARGS+=" -DPYTHON_EXECUTABLE:FILEPATH=$PY_CMD"
218233 else
219234 PY_CMD=python$PYTHON
0 commit comments