aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2017-05-23 20:31:03 -0700
committerPaul Kehrer <paul.l.kehrer@gmail.com>2017-05-23 20:31:03 -0700
commit6091e11cae1e2ca43709266d0e3ba84ded12ddfc (patch)
tree070abc134d8afff90dcb4a09ed0c659b999a8a1d /.travis.yml
parent70e8f90b250ba65167943f67cb851495bc7b8add (diff)
downloadcryptography-6091e11cae1e2ca43709266d0e3ba84ded12ddfc.tar.gz
cryptography-6091e11cae1e2ca43709266d0e3ba84ded12ddfc.tar.bz2
cryptography-6091e11cae1e2ca43709266d0e3ba84ded12ddfc.zip
Bump the minimum PyPy/cffi version and simplify as a result (#3585)
* Bump the minimum PyPy/cffi version and simplify as a result * unused imports * grumble, fix
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml5
1 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 21a4d7a1..87e4304e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,8 +23,7 @@ matrix:
env: TOXENV=py35
- python: 3.6
env: TOXENV=py36
- - env: TOXENV=pypy-nocoverage PYPY_VERSION=2.6.1
- - env: TOXENV=pypy PYPY_VERSION=4.0.1
+ - env: TOXENV=pypy PYPY_VERSION=5.3
- env: TOXENV=pypy PYPY_VERSION=5.7.1
- python: 2.7
env: TOXENV=py27 OPENSSL=1.1.0e
@@ -65,7 +64,7 @@ matrix:
- language: generic
os: osx
osx_image: xcode8.3
- env: TOXENV=pypy-nocoverage CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 PYPY_VERSION=5.7.1
+ env: TOXENV=pypy CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 PYPY_VERSION=5.7.1
- language: generic
os: osx
osx_image: xcode8.3