@@ -192,8 +192,6 @@ matrix:
192192 make pytest -j 2"
193193 set +ex
194194 allow_failures :
195- - name : PyPy 7.3, Python 2.7, c++11, gcc 4.8
196- - name : PyPy 7.3, Python 3.6, c++11, gcc 5
197195 - name : Python 3.9 beta, c++17, gcc 7 (w/o numpy/scipy)
198196cache :
199197 directories :
@@ -236,15 +234,9 @@ before_install:
236234 SCRIPT_RUN_PREFIX="docker exec --tty $containerid"
237235 $SCRIPT_RUN_PREFIX sh -c 'for s in 0 15; do sleep $s; apt-get update && apt-get -qy dist-upgrade && break; done'
238236 else
239- <<<<<<< HEAD
240- if [ "$PYPY" = "5.8.0" ]; then
241- curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-linux64.tar.bz2 | tar xj
242- PY_CMD=$(echo `pwd`/pypy2-v5.8.0-linux64/bin/pypy)
243- =======
244237 if [ -n "$PYPY" ]; then
245238 curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy$PYTHON-v$PYPY-linux64.tar.bz2 | tar xj
246239 PY_CMD=$(echo `pwd`/pypy$PYTHON-v$PYPY-linux64/bin/pypy$PY)
247- >>>>>>> 8c0cd94465fbc1dbc34217e5a614edc784f0913e
248240 CMAKE_EXTRA_ARGS+=" -DPYTHON_EXECUTABLE:FILEPATH=$PY_CMD"
249241 elif [ -n "$PYPY" ]; then
250242 curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy${PYTHON:0:3}-v${PYPY}-linux64.tar.bz2 | tar xj
@@ -291,19 +283,12 @@ install:
291283 fi
292284
293285 local PIP_CMD=""
294- <<<<<<< HEAD
295- export NPY_NUM_BUILD_JOBS=2
296- if [ -n "$PYPY" ]; then
297- echo Installing "pytest"
298- $PY_CMD -m pip install --user --upgrade pytest
299- =======
300286 if [ -n "$PYPY" ]; then
301287 # For expediency, install only versions that are available on the extra index.
302288 travis_wait 30 \
303289 $PY_CMD -m pip install --user --upgrade --extra-index-url https://antocuni.github.io/pypy-wheels/manylinux2010 \
304290 numpy scipy
305291 $PY_CMD -m pip install --user --upgrade pytest
306- >>>>>>> 8c0cd94465fbc1dbc34217e5a614edc784f0913e
307292 else
308293 echo "Installing pytest, numpy, scipy..."
309294 $PY_CMD -m pip install --user --upgrade pytest numpy scipy
0 commit comments