Merge branch '1.10' into 1.11

Conflicts:
	fabfile.py
	paramiko/__init__.py

1 files changed, 22 insertions, 7 deletions

diff --git a/tasks.py b/tasks.py
index f8f4017d..c9844780 100644
--- a/tasks.py
+++ b/tasks.py
@@ -1,23 +1,27 @@
+from os import mkdir
 from os.path import join
+from shutil import rmtree, copytree
 
 from invoke import Collection, ctask as task
 from invocations import docs as _docs
+from invocations.packaging import publish
 
 
 d = 'sites'
 
 # Usage doc/API site (published as docs.paramiko.org)
-path = join(d, 'docs')
+docs_path = join(d, 'docs')
+docs_build = join(docs_path, '_build')
 docs = Collection.from_module(_docs, name='docs', config={
-    'sphinx.source': path,
-    'sphinx.target': join(path, '_build'),
+    'sphinx.source': docs_path,
+    'sphinx.target': docs_build,
 })
 
 # Main/about/changelog site ((www.)?paramiko.org)
-path = join(d, 'www')
+www_path = join(d, 'www')
 www = Collection.from_module(_docs, name='www', config={
-    'sphinx.source': path,
-    'sphinx.target': join(path, '_build'),
+    'sphinx.source': www_path,
+    'sphinx.target': join(www_path, '_build'),
 })
 
 
@@ -31,4 +35,15 @@ def coverage(ctx):
     ctx.run("coverage run --source=paramiko test.py --verbose")
 
 
-ns = Collection(test, coverage, docs=docs, www=www)
+# Until we stop bundling docs w/ releases. Need to discover use cases first.
+@task('docs') # Will invoke the API doc site build
+def release(ctx):
+    # Move the built docs into where Epydocs used to live
+    target = 'docs'
+    rmtree(target, ignore_errors=True)
+    copytree(docs_build, target)
+    # Publish
+    publish(ctx)
+
+
+ns = Collection(test, coverage, release, docs=docs, www=www)