Merge branch '2.1'

paramiko · Feb 21, 2017 · 12ef90e · 12ef90e
2 parents f1ce6e2 + f1985e6
commit 12ef90e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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.

diff --git a/tasks.py b/tasks.py
@@ -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)