Merge branch '1.13' into 1.14

1 files changed, 10 insertions, 3 deletions

diff --git a/tasks.py b/tasks.py
index 20ded03d..05654d3b 100644
--- a/tasks.py
+++ b/tasks.py
@@ -9,8 +9,14 @@ from invocations.packaging import publish
 
 # Until we move to spec-based testing
 @task
-def test(ctx):
-    ctx.run("python test.py --verbose", pty=True)
+def test(ctx, coverage=False, flags=""):
+    if "--verbose" not in flags.split():
+        flags += " --verbose"
+    runner = "python"
+    if coverage:
+        runner = "coverage run --source=paramiko"
+    ctx.run("{0} test.py {1}".format(runner, flags), pty=True)
+
 
 @task
 def coverage(ctx):
@@ -25,7 +31,8 @@ def release(ctx):
     # Move the built docs into where Epydocs used to live
     target = 'docs'
     rmtree(target, ignore_errors=True)
-    copytree(docs_build, target)
+    # TODO: make it easier to yank out this config val from the docs coll
+    copytree('sites/docs/_build', target)
     # Publish
     publish(ctx)
     # Remind