summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-08-26 00:04:24 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-08-26 00:04:24 -0700
commit1bafe0a1b9fc8e0d4b1c025c5a11b96c525f26f1 (patch)
tree441714ccefad49fc523e5d7c89006595531f2e1e
parent28b7db145fed32840f8d2edea8fdce27dc00ca26 (diff)
parentc916ad664cccf4bdcb936d7f4bffd656cefbe621 (diff)
Merge branch '1.14'
-rw-r--r--dev-requirements.txt2
-rw-r--r--tasks.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt
index e9052898..432c45fd 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -2,7 +2,7 @@
tox>=1.4,<1.5
# For newer tasks like building Sphinx docs.
# NOTE: Requires Python >=2.6
-invoke>=0.7.0
+invoke>=0.7.0,<0.8
invocations>=0.5.0
sphinx>=1.1.3
alabaster>=0.6.0
diff --git a/tasks.py b/tasks.py
index 38282b8e..94bf0aa2 100644
--- a/tasks.py
+++ b/tasks.py
@@ -36,8 +36,10 @@ def coverage(ctx):
# Until we stop bundling docs w/ releases. Need to discover use cases first.
-@task('docs') # Will invoke the API doc site build
+@task
def release(ctx):
+ # Build docs first. Use terribad workaround pending invoke #146
+ ctx.run("inv docs")
# Move the built docs into where Epydocs used to live
target = 'docs'
rmtree(target, ignore_errors=True)