Permalink
Browse files

updated docs for rtd, again

  • Loading branch information...
1 parent ec269d7 commit d9bf4aa019e79e3be255c1ad3a6c984740218cd6 @blaflamme blaflamme committed Dec 16, 2011
Showing with 22 additions and 9 deletions.
  1. +0 −3 .gitmodules
  2. +1 −1 pylons/docs/en/.gitignore
  3. +1 −3 pylons/docs/en/Makefile
  4. +0 −1 pylons/docs/en/_themes
  5. +19 −1 pylons/docs/en/conf.py
  6. +1 −0 rtd.txt
View
@@ -1,3 +0,0 @@
-[submodule "pylons/docs/en/_themes"]
- path = pylons/docs/en/_themes
- url = git://github.com/Pylons/pylons_sphinx_theme.git
@@ -1,2 +1,2 @@
_build
-
+_themes
View
@@ -25,7 +25,7 @@ help:
clean:
-rm -rf _build/*
-html: _themes
+html:
mkdir -p _build/html _build/doctrees
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
@echo
@@ -67,5 +67,3 @@ linkcheck:
@echo "Link check complete; look for any errors in the above output " \
"or in _build/linkcheck/output.txt."
-_themes:
- cd ../../..; git submodule update --init; cd pylons/docs/en
Submodule _themes deleted from 03e5e5
View
@@ -80,10 +80,28 @@
# -----------------------
# Add and use Pylons theme
+from subprocess import call, Popen, PIPE
+
+p = Popen('which git', shell=True, stdout=PIPE)
+git = p.stdout.read().strip()
+cwd = os.getcwd()
+_themes = os.path.join(cwd, '_themes')
+
+if not os.path.isdir(_themes):
+ call([git, 'clone', 'git://github.com/Pylons/pylons_sphinx_theme.git',
+ '_themes'])
+else:
+ os.chdir(_themes)
+ call([git, 'checkout', 'master'])
+ call([git, 'pull'])
+ os.chdir(cwd)
+
sys.path.append(os.path.abspath('_themes'))
html_theme_path = ['_themes']
html_theme = 'pylonsfw'
-html_theme_options = {'github_url':'http://github.com/Pylons/pylons'}
+html_theme_options = dict(
+ github_url='https://github.com/Pylons/pylons'
+ )
# The style sheet to use for HTML and HTML Help pages. A file of that name
# must exist either in Sphinx' static/ path, or in one of the custom paths
View
@@ -0,0 +1 @@
+repoze.sphinx.autointerface

0 comments on commit d9bf4aa

Please sign in to comment.