diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-02-20 21:24:59 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-02-20 21:24:59 -0800 |
| commit | 12ef90ee3d423460f72c754aff14996075ab6006 (patch) | |
| tree | ac375fe1034b843a6a53731ce79cf1de51f2d1f2 | |
| parent | f1ce6e2c9e0a3c23b142cdf0456b87e3a7383a7b (diff) | |
| parent | f1985e632862689502d8757e61a0e51bbbb6dee9 (diff) | |
Merge branch '2.1'
| -rw-r--r-- | paramiko/_version.py | 2 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 4 | ||||
| -rw-r--r-- | tasks.py | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/paramiko/_version.py b/paramiko/_version.py index cf6d810b..2ad47eb4 100644 --- a/paramiko/_version.py +++ b/paramiko/_version.py @@ -1,2 +1,2 @@ -__version_info__ = (2, 1, 1) +__version_info__ = (2, 1, 2) __version__ = '.'.join(map(str, __version_info__)) diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 1f7fa62c..2704bf3d 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,10 @@ Changelog ========= +* :release:`2.1.2 <2017-02-20>` +* :release:`2.0.5 <2017-02-20>` +* :release:`1.18.2 <2017-02-20>` +* :release:`1.17.4 <2017-02-20>` * :bug:`853 (1.17+)` Tweak how `RSAKey.__str__ <paramiko.rsakey.RSAKey>` behaves so it doesn't cause ``TypeError`` under Python 3. Thanks to Francisco Couzo for the report. @@ -32,7 +32,7 @@ def release(ctx, sdist=True, wheel=True, sign=True, dry_run=False): Wraps invocations.packaging.publish to add baked-in docs folder. """ # Build docs first. Use terribad workaround pending invoke #146 - ctx.run("inv docs") + ctx.run("inv docs", pty=True, hide=False) # Move the built docs into where Epydocs used to live target = 'docs' rmtree(target, ignore_errors=True) |