diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2015-11-02 17:58:51 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2015-11-02 17:58:51 -0800 |
| commit | 0b36729682ce72401be6aa442cce59b814ed3c01 (patch) | |
| tree | 9e7864040a54442fc344206b43a38ced77a7988c | |
| parent | e3ab8b1de45548f7e9c1fa49e9eac4069cf2346b (diff) | |
| parent | 958faab321a9e2204bd7532b1fd33113e49796b3 (diff) | |
Merge branch '1.14' into 1.15
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | dev-requirements.txt | 4 | ||||
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 1 |
4 files changed, 6 insertions, 6 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" diff --git a/dev-requirements.txt b/dev-requirements.txt index 059572cf..90cfd477 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,8 +1,8 @@ # Older junk tox>=1.4,<1.5 # For newer tasks like building Sphinx docs. -invoke>=0.10 -invocations>=0.9.2 +invoke>=0.11.1 +invocations>=0.11.0 sphinx>=1.1.3 alabaster>=0.6.1 releases>=0.5.2 @@ -87,6 +87,7 @@ setup( 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', ], **kw ) diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 6870a16a..fdcf9f09 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,7 @@ Changelog ========= +* :release:`1.13.4 <2015-11-02>` * :bug:`366` Fix `~paramiko.sftp_attributes.SFTPAttributes` so its string representation doesn't raise exceptions on empty/initialized instances. Patch by Ulrich Petri. |