aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJon Wayne Parrott <jonwayne@google.com>2016-08-09 11:25:31 -0700
committerGitHub <noreply@github.com>2016-08-09 11:25:31 -0700
commit2e8d1bea6464476d4e34801e59695adc95fd6b9e (patch)
tree9479eff936216092f126658af5ac0c0aa8779b67 /.travis.yml
parent248dc6c58d534f33517f94f048899a9ed5c5732e (diff)
downloadoauth2client-2e8d1bea6464476d4e34801e59695adc95fd6b9e.tar.gz
Drop support for Python 2.6 (#590)
* Drop support for Python 2.6 * Re-organize Travis matrix
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml38
1 files changed, 22 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml
index a8c01fa..9ab2f44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,35 @@
language: python
-python: 2.7
sudo: false
-# TODO(issue 532): Fix syntax when 3.5 is natively available upstream
+
matrix:
include:
- - python: 3.5
- env:
- - TOX_ENV=py35
+ - python: 2.7
+ env: TOX_ENV=flake8
+ - python: 2.7
+ env: TOX_ENV=docs
+ - python: 2.7
+ env: TOX_ENV=gae
+ - python: 2.7
+ env: TOX_ENV=py27
+ - python: 3.3
+ env: TOX_ENV=py33
+ - python: 3.4
+ env: TOX_ENV=py34
+ - python: 3.5
+ env: TOX_ENV=py35
+ - python: pypy
+ env: TOX_ENV=pypy
+ - python: 2.7
+ env: TOX_ENV=system-tests
+ - python: 3.4
+ env: TOX_ENV=system-tests3
env:
- matrix:
- - TOX_ENV=py26
- - TOX_ENV=py27
- - TOX_ENV=py33
- - TOX_ENV=py34
- - TOX_ENV=pypy
- - TOX_ENV=docs
- - TOX_ENV=system-tests
- - TOX_ENV=system-tests3
- - TOX_ENV=gae
- - TOX_ENV=flake8
global:
- GAE_PYTHONPATH=${HOME}/.cache/google_appengine
cache:
directories:
- ${HOME}/.cache
+ - ${HOME}/.pyenv
install:
- ./scripts/install.sh
script: