diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2017-05-20 22:35:10 -0700 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-05-20 22:35:10 -0700 |
| commit | ae59061ebb073cf2b2d50b4350fda870c8586564 (patch) | |
| tree | 3d19f1c9b8b690c051212eb1d5f9556d4c743693 /.travis.yml | |
| parent | f9b3b1592d1e0fb0e49b46d603cf0301f7d31cf3 (diff) | |
| download | cryptography-ae59061ebb073cf2b2d50b4350fda870c8586564.tar.gz cryptography-ae59061ebb073cf2b2d50b4350fda870c8586564.tar.bz2 cryptography-ae59061ebb073cf2b2d50b4350fda870c8586564.zip | |
Switch from 12.04 to 14.04 on travis (#3559)
* Switch from 12.04 to 14.04 on travis
* test?
* fix for pyenv
* sigh
* try removing this entirely
* one more try
* empty commit to retrigger travis
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 91635c7d..1816266d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ sudo: false +dist: trusty language: python @@ -9,7 +10,8 @@ cache: matrix: include: - - python: 2.6 # these are just to make travis's UI a bit prettier + # these are just to make travis's UI a bit prettier + - python: 2.6 env: TOXENV=py26 - python: 2.7 env: TOXENV=py27 @@ -21,12 +23,9 @@ matrix: env: TOXENV=py35 - python: 3.6 env: TOXENV=py36 - - python: 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.6.0 + - env: TOXENV=pypy-nocoverage PYPY_VERSION=2.6.1 + - env: TOXENV=pypy PYPY_VERSION=4.0.1 + - env: TOXENV=pypy PYPY_VERSION=5.6.0 - python: 2.7 env: TOXENV=py27 OPENSSL=1.1.0e - python: 3.5 |