summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2018-03-21 14:49:42 +0100
committerAlex Gaynor <alex.gaynor@gmail.com>2018-03-21 09:49:42 -0400
commit1ae7cb68cd285fe822c84d8e3198aff9716cf4e8 (patch)
tree8b280f24b25c1f1d2b9e0478655d3fddbaf1468e /.travis.yml
parent993c4e4afc4274019bdb835b64191afeed6c13b7 (diff)
downloadpyopenssl-git-1ae7cb68cd285fe822c84d8e3198aff9716cf4e8.tar.gz
Raise minimum cryptography version to 2.2.1, drop python 2.6 (#742)
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml9
1 files changed, 1 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 9dc734c..6a5f3f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,9 +20,7 @@ matrix:
os: osx
osx_image: xcode8.3
env: TOXENV=py27 OPENSSL=1.1.0
- - python: "2.6" # these are just to make travis's UI a bit prettier
- env: TOXENV=py26
- - python: "2.7"
+ - python: "2.7" # these are just to make travis's UI a bit prettier
env: TOXENV=py27
- python: "3.4"
env: TOXENV=py34
@@ -33,8 +31,6 @@ matrix:
- env: TOXENV=pypy
# Also run the tests against cryptography master.
- - python: "2.6"
- env: TOXENV=py26-cryptographyMaster
- python: "2.7"
env: TOXENV=py27-cryptographyMaster
- python: "3.4"
@@ -46,8 +42,6 @@ matrix:
- env: TOXENV=pypy-cryptographyMaster
# And current minimum cryptography version.
- - python: "2.6"
- env: TOXENV=py26-cryptographyMinimum
- python: "2.7"
env: TOXENV=py27-cryptographyMinimum
- python: "3.4"
@@ -82,7 +76,6 @@ matrix:
# Let the cryptography master builds fail because they might be caused by
# cryptography changes that are beyond our control.
allow_failures:
- - env: TOXENV=py26-cryptographyMaster
- env: TOXENV=py27-cryptographyMaster
- env: TOXENV=py34-cryptographyMaster
- env: TOXENV=py35-cryptographyMaster