summaryrefslogtreecommitdiffhomepage
path: root/.travis.yml
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2015-11-02 17:58:51 -0800
committerJeff Forcier <jeff@bitprophet.org>2015-11-02 17:58:51 -0800
commit0b36729682ce72401be6aa442cce59b814ed3c01 (patch)
tree9e7864040a54442fc344206b43a38ced77a7988c /.travis.yml
parente3ab8b1de45548f7e9c1fa49e9eac4069cf2346b (diff)
parent958faab321a9e2204bd7532b1fd33113e49796b3 (diff)
Merge branch '1.14' into 1.15
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 45fb1722..c2c20a60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,9 @@ sudo: false
python:
- "2.6"
- "2.7"
- - "3.2"
- "3.3"
- "3.4"
+ - "3.5"
install:
# Self-install for setup.py-driven deps
- pip install -e .
@@ -19,9 +19,7 @@ script:
# Run 'docs' first since its objects.inv is referred to by 'www'.
# Also force warnings to be errors since most of them tend to be actual
# problems.
- # Finally, skip them under Python 3.2 due to sphinx shenanigans
- - "[[ $TRAVIS_PYTHON_VERSION != 3.2 ]] && invoke docs -o -W || true"
- - "[[ $TRAVIS_PYTHON_VERSION != 3.2 ]] && invoke www -o -W || true"
+ - invoke docs -o -W www -o -W
notifications:
irc:
channels: "irc.freenode.org#paramiko"