diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-06-18 14:33:00 -1000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2017-06-18 20:32:59 -0400 |
| commit | e45151c2589ce7dea2987ee6f977092b84b7c803 (patch) | |
| tree | 3e85296e2e03793465be9d7c0d14a6ac2e083357 | |
| parent | 9e19428029f3bdbacb3d1807740217b78c230f33 (diff) | |
| download | cryptography-e45151c2589ce7dea2987ee6f977092b84b7c803.tar.gz cryptography-e45151c2589ce7dea2987ee6f977092b84b7c803.tar.bz2 cryptography-e45151c2589ce7dea2987ee6f977092b84b7c803.zip | |
update pythons and pypy, a little prep for pypy3 in CI again (#3702)
* update pythons and pypy, a little prep for pypy3 in CI again
* slightly renamed
* oops
* pypy renames all around
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rwxr-xr-x | .travis/install.sh | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 75c306f6..f84b4197 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,8 @@ matrix: env: TOXENV=py35 - python: 3.6 env: TOXENV=py36 - - env: TOXENV=pypy PYPY_VERSION=5.3 - - env: TOXENV=pypy PYPY_VERSION=5.7.1 + - env: TOXENV=pypy PYPY_VERSION=pypy2-5.3 + - env: TOXENV=pypy PYPY_VERSION=pypy2.7-5.8.0 - python: 2.7 env: TOXENV=py27 OPENSSL=1.1.0f - python: 3.5 @@ -72,7 +72,7 @@ matrix: - language: generic os: osx osx_image: xcode8.3 - env: TOXENV=pypy CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 PYPY_VERSION=5.7.1 + env: TOXENV=pypy CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 PYPY_VERSION=pypy2.7-5.8.0 - language: generic os: osx osx_image: xcode8.3 diff --git a/.travis/install.sh b/.travis/install.sh index 130d30f7..ecdecea4 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -26,20 +26,20 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then pyenv global 3.3.6 ;; py34) - pyenv install 3.4.5 - pyenv global 3.4.5 + pyenv install 3.4.6 + pyenv global 3.4.6 ;; py35) - pyenv install 3.5.2 - pyenv global 3.5.2 + pyenv install 3.5.3 + pyenv global 3.5.3 ;; py36) - pyenv install 3.6.0 - pyenv global 3.6.0 + pyenv install 3.6.1 + pyenv global 3.6.1 ;; pypy*) - pyenv install "pypy-$PYPY_VERSION" - pyenv global "pypy-$PYPY_VERSION" + pyenv install "$PYPY_VERSION" + pyenv global "$PYPY_VERSION" ;; pypy3) pyenv install pypy3-2.4.0 @@ -62,8 +62,8 @@ else PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" - pyenv install "pypy-$PYPY_VERSION" - pyenv global "pypy-$PYPY_VERSION" + pyenv install "$PYPY_VERSION" + pyenv global "$PYPY_VERSION" fi # download, compile, and install if it's not already present via travis |