Fix travis testing

pybind · Mar 26, 2020 · 6e62cc2 · 6e62cc2
1 parent efe2d69
commit 6e62cc2
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -223,12 +223,15 @@ before_install:
     $SCRIPT_RUN_PREFIX sh -c 'for s in 0 15; do sleep $s; apt-get update && apt-get -qy dist-upgrade && break; done'
   else
     if [ "$PYPY" = "5.8.0" ]; then
-      curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy{PYTHON:0:1}-v{PYPY}-linux64.tar.bz2 | tar xj
+      curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy${PYTHON:0:1}-v${PYPY}-linux64.tar.bz2 | tar xj
       PY_CMD=$(echo `pwd`/pypy${PYTHON:0:1}-v${PYPY}-linux64/bin/pypy)
       CMAKE_EXTRA_ARGS+=" -DPYTHON_EXECUTABLE:FILEPATH=$PY_CMD"
     elif [ -n "$PYPY" ]; then
-      curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy${PYTHON:0:2}-v${PYPY}-linux64.tar.bz2 | tar xj
-      PY_CMD=$(echo `pwd`/pypy${PYTHON:0:2}-v${PYPY}-linux64/bin/pypy)
+      curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy${PYTHON:0:3}-v${PYPY}-linux64.tar.bz2 | tar xj
+      PY_CMD=$(echo `pwd`/pypy${PYTHON:0:3}-v${PYPY}-linux64/bin/pypy)
+      if [ "${PYTHON:0:1}" = "3" ]; then
+        PY_CMD="${PY_CMD}3"
+      fi
       CMAKE_EXTRA_ARGS+=" -DPYTHON_EXECUTABLE:FILEPATH=$PY_CMD"
     else
       PY_CMD=python$PYTHON