Permalink
Browse files

Path-related fixes, all tasks I tried seem to work now (a lot of warn…

…ings from Sphinx though, and no dry run)
  • Loading branch information...
1 parent bc2a9fa commit 81a07429cd8f80e3a192faf28456f907dc55a411 @rkruppe rkruppe committed Sep 23, 2012
Showing with 19 additions and 14 deletions.
  1. +6 −1 .gitignore
  2. +7 −7 pavement.py
  3. BIN paver-minilib.zip
  4. +5 −5 paver/doctools.py
  5. +1 −1 paver/tasks.py
View
@@ -3,7 +3,7 @@
*.egg-info
*~
/build
-/dist
+dist
/nbproject/
pip-log.txt
/.project
@@ -16,3 +16,8 @@ pip-log.txt
.tox
*\$py\.class*
.pip-download-cache
+/docs/build/
+/docs/samples/started/newway/paver-minilib.zip
+/docs/samples/started/newway/setup.py
+MANIFEST
+/paver/docs/
View
@@ -66,7 +66,7 @@ def html():
"""Build Paver's documentation and install it into paver/docs"""
builtdocs = path("docs") / options.sphinx.builddir / "html"
destdir = path("paver") / "docs"
- destdir.rmtree()
+ destdir.rmtree_p()
builtdocs.move(destdir)
@task
@@ -96,10 +96,10 @@ def bootstrap():
def clean():
"""Cleans up this paver directory. Removes the virtualenv traces and
the build directory."""
- path("build").rmtree()
- path("bin").rmtree()
- path("lib").rmtree()
- path(".Python").remove()
+ path("build").rmtree_p()
+ path("bin").rmtree_p()
+ path("lib").rmtree_p()
+ path(".Python").remove_p()
@task
@needs("uncog")
@@ -176,6 +176,6 @@ def publish_docs(options):
finally:
- safe_clone.rmtree()
- docs_repo.rmtree()
+ safe_clone.rmtree_p()
+ docs_repo.rmtree_p()
os.remove(git)
View
Binary file not shown.
View
@@ -26,15 +26,15 @@ def _get_paths():
raise BuildFailure("Sphinx documentation root (%s) does not exist."
% docroot)
builddir = docroot / opts.get("builddir", ".build")
- builddir.mkdir()
+ builddir.mkdir_p()
srcdir = docroot / opts.get("sourcedir", "")
if not srcdir.exists():
raise BuildFailure("Sphinx source file dir (%s) does not exist"
% srcdir)
htmldir = builddir / "html"
- htmldir.mkdir()
+ htmldir.mkdir_p()
doctrees = builddir / "doctrees"
- doctrees.mkdir()
+ doctrees.mkdir_p()
return Bunch(locals())
@task
@@ -66,8 +66,8 @@ def doc_clean():
options list."""
options.order('sphinx', add_rest=True)
paths = _get_paths()
- paths.builddir.rmtree()
- paths.builddir.mkdir()
+ paths.builddir.rmtree_p()
+ paths.builddir.mkdir_p()
_sectionmarker = re.compile(r'\[\[\[section\s+(.+)\]\]\]')
_endmarker = re.compile(r'\[\[\[endsection\s*.*\]\]\]')
View
@@ -14,7 +14,7 @@
from six import print_
from six.moves import xrange
-VERSION = "1.2.0.dev1"
+VERSION = "1.2.0.dev2"
class PavementError(Exception):
"""Exception that represents a problem in the pavement.py file

0 comments on commit 81a0742

Please sign in to comment.