diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-04-22 16:03:52 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-04-22 15:03:52 -0500 |
| commit | ea5882af992a330f279d6aed4850f1ce7f5b2f61 (patch) | |
| tree | 5450a74e135fd6c6120277908bdb55d1daf39308 | |
| parent | 01c634c3cc9e76d4b66fa7904604f2a32d46ef5d (diff) | |
| download | cryptography-ea5882af992a330f279d6aed4850f1ce7f5b2f61.tar.gz cryptography-ea5882af992a330f279d6aed4850f1ce7f5b2f61.tar.bz2 cryptography-ea5882af992a330f279d6aed4850f1ce7f5b2f61.zip | |
Test with both old pypy and new pypy (#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
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rwxr-xr-x | .travis/install.sh | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index b796617b..2945075e 100644 --- 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 index e5b5f52d..db2e4202 100755 --- 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 |