Merge branch '1.17' into 1.18

3 files changed, 24 insertions, 4 deletions

diff --git a/paramiko/_version.py b/paramiko/_version.py
index 2dca25b2..7adb8add 100644
--- a/paramiko/_version.py
+++ b/paramiko/_version.py
@@ -1,2 +1,2 @@
-__version_info__ = (1, 17, 2)
+__version_info__ = (1, 17, 3)
 __version__ = '.'.join(map(str, __version_info__))
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 8d1ba3a2..de992850 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
 Changelog
 =========
 
+* :release:`1.17.3 <2016-12-09>`
 * :bug:`802 (1.17+)` (via :issue:`804`) Update our vendored Windows API module
   to address errors of the form ``AttributeError: 'module' object has no
   attribute 'c_ssize_t'``. Credit to Jason R. Coombs.
diff --git a/tasks.py b/tasks.py
index 90ee758c..61319aa9 100644
--- a/tasks.py
+++ b/tasks.py
@@ -4,7 +4,7 @@ from shutil import rmtree, copytree
 
 from invoke import Collection, task
 from invocations.docs import docs, www, sites
-from invocations.packaging import publish
+from invocations.packaging.release import ns as release_coll, publish
 
 
 # Until we move to spec-based testing
@@ -24,10 +24,12 @@ def coverage(ctx):
 
 
 # Until we stop bundling docs w/ releases. Need to discover use cases first.
+# TODO: would be nice to tie this into our own version of build() too, but
+# still have publish() use that build()...really need to try out classes!
 @task
 def release(ctx, sdist=True, wheel=True, sign=True, dry_run=False):
     """
-    Wraps invocations.packaging.release to add baked-in docs folder.
+    Wraps invocations.packaging.publish to add baked-in docs folder.
     """
     # Build docs first. Use terribad workaround pending invoke #146
     ctx.run("inv docs")
@@ -41,5 +43,22 @@ def release(ctx, sdist=True, wheel=True, sign=True, dry_run=False):
     # Remind
     print("\n\nDon't forget to update RTD's versions page for new minor releases!")
 
+# TODO: "replace one task with another" needs a better public API, this is
+# using unpublished internals & skips all the stuff add_task() does re:
+# aliasing, defaults etc.
+release_coll.tasks['publish'] = release
 
-ns = Collection(test, coverage, release, docs, www, sites)
+ns = Collection(test, coverage, release_coll, docs, www, sites)
+ns.configure({
+    'packaging': {
+        # NOTE: many of these are also set in kwarg defaults above; but having
+        # them here too means once we get rid of our custom release(), the
+        # behavior stays.
+        'sign': True,
+        'wheel': True,
+        'changelog_file': join(
+            www.configuration()['sphinx']['source'],
+            'changelog.rst',
+        ),
+    },
+})