diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 15:59:05 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 15:59:05 -0700 |
| commit | 752507a2978b0c6091ee737cd37ba1cb690926a2 (patch) | |
| tree | 2610670fc4edd07ae96851c4947a3c69d360cb88 /.travis.yml | |
| parent | b076c10d00ee2cb4d465291a4ef0a4be9f048d9a (diff) | |
| parent | de391e88e0a7e75cd977f162a883aa5ffdbdc591 (diff) | |
Merge branch 'master' into 267-int
Conflicts:
paramiko/client.py
paramiko/transport.py
sites/www/changelog.rst
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 7042570f..3f6f7331 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ python: - "2.7" - "3.2" - "3.3" + - "3.4" install: # Self-install for setup.py-driven deps - pip install -e . @@ -17,8 +18,9 @@ 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. - - invoke docs -o -W - - invoke www -o -W + # 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" notifications: irc: channels: "irc.freenode.org#paramiko" @@ -26,7 +28,6 @@ notifications: - "%{repository}@%{branch}: %{message} (%{build_url})" on_success: change on_failure: change - use_notice: true email: false after_success: - coveralls |