diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 14:26:52 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 14:27:21 -0700 |
| commit | 8b0e10df60bb8e3fac8f81959d7f3f39a8d0e000 (patch) | |
| tree | 4e0766b74d7688624f21766f2be0ff5d8e9cfae1 /.travis.yml | |
| parent | b0ffd7c9c8d0941ee95e6f133cb6697bfb6a9b99 (diff) | |
| parent | 24e022bdf656f272b4dafb76df1a7739965be2f9 (diff) | |
Merge branch 'master' into 372-int
Conflicts:
paramiko/channel.py
tests/test_util.py
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 |