Test with both old pypy and new pypy (pyca#2875)

* Test with both old pypy and new pypy * use an old as heck pypy * revert * dont try to coverage pypy2.6.1 * ALL THE PYPYS
InvalidInterrupt · Apr 22, 2016 · ea5882a · ea5882a
1 parent 01c634c
commit ea5882a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,11 @@ matrix:
         - python: 3.5
           env: TOXENV=py35
         - python: pypy
-          env: TOXENV=pypy
+          env: TOXENV=pypy-nocoverage PYPY_VERSION=2.6.1
+        - python: pypy
+          env: TOXENV=pypy PYPY_VERSION=4.0.1
+        - python: pypy
+          env: TOXENV=pypy PYPY_VERSION=5.1
         - python: 2.7
           env: TOXENV=py27 OPENSSL=1.0.0
         - python: 3.5
@@ -37,7 +41,7 @@ matrix:
         - python: 3.5
           env: TOXENV=py35 OPENSSL=0.9.8
         - python: pypy
-          env: TOXENV=pypy OPENSSL=0.9.8
+          env: TOXENV=pypy OPENSSL=0.9.8 PYPY_VERSION=5.1
         - python: 2.7
           env: TOXENV=docs
           addons:
@@ -69,7 +73,7 @@ matrix:
         - language: generic
           os: osx
           osx_image: xcode7.1
-          env: TOXENV=pypy-nocoverage CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1
+          env: TOXENV=pypy-nocoverage CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 PYPY_VERSION=5.1
         - language: generic
           os: osx
           osx_image: xcode7.1

diff --git a/.travis/install.sh b/.travis/install.sh
@@ -32,8 +32,8 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
             pyenv global 3.5.1
             ;;
         pypy*)
-            pyenv install pypy-4.0.1
-            pyenv global pypy-4.0.1
+            pyenv install pypy-$PYPY_VERSION
+            pyenv global pypy-$PYPY_VERSION
             ;;
         pypy3)
             pyenv install pypy3-2.4.0
@@ -54,8 +54,8 @@ else
         PYENV_ROOT="$HOME/.pyenv"
         PATH="$PYENV_ROOT/bin:$PATH"
         eval "$(pyenv init -)"
-        pyenv install pypy-4.0.1
-        pyenv global pypy-4.0.1
+        pyenv install pypy-$PYPY_VERSION
+        pyenv global pypy-$PYPY_VERSION
     fi
     if [[ "${OPENSSL}" == "0.9.8" ]]; then
         # We use 0.9.8l rather than zh because we have some branches for