summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2019-12-23 14:07:56 -0600
committerMichael Merickel <michael@merickel.org>2019-12-23 14:07:56 -0600
commite46d009954e89be393d748b9e97b1202ece3eafe (patch)
treec1b2565b27da44efefdab57294f78025ebad53e1 /.travis.yml
parent570243fcf3f9bb7b3da78404b0598011791ac882 (diff)
parent912dc539ca793959d7465995f906279dad21ccc9 (diff)
downloadpyramid-e46d009954e89be393d748b9e97b1202ece3eafe.tar.gz
pyramid-e46d009954e89be393d748b9e97b1202ece3eafe.tar.bz2
pyramid-e46d009954e89be393d748b9e97b1202ece3eafe.zip
Merge branch 'master' into luhn-authenticated-userid
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml8
1 files changed, 2 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index c4860d2de..c762c085b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,6 @@ sudo: false
matrix:
include:
- - python: 3.4
- env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
- python: 3.6
@@ -14,7 +12,7 @@ matrix:
env: TOXENV=pypy3
- python: 3.6
env: TOXENV=py36-cover,coverage
- - python: 3.5
+ - python: 3.6
env: TOXENV=docs
- python: 3.6
env: TOXENV=lint
@@ -22,12 +20,10 @@ matrix:
env: TOXENV=py37
dist: xenial
sudo: true
- - python: 3.8-dev
+ - python: 3.8
env: TOXENV=py38
dist: xenial
sudo: true
- allow_failures:
- - env: TOXENV=py38
install:
- travis_retry pip install tox