updated doc theme workflow

1 files changed, 20 insertions, 12 deletions

diff --git a/docs/conf.py b/docs/conf.py
index 4a39f5d64..6443ed17e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -38,7 +38,6 @@ LaTeXTranslator.visit_inline = nothing
 LaTeXTranslator.depart_inline = nothing
 
 book = os.environ.get('BOOK')
-rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it
@@ -48,11 +47,6 @@ sys.path.append(os.path.abspath(parent))
 wd = os.getcwd()
 os.chdir(parent)
 os.system('%s setup.py test -q' % sys.executable)
-if rtd:
-    from subprocess import Popen, PIPE
-    p = Popen('which git', shell=True, stdout=PIPE)
-    git = p.stdout.read().strip()
-    os.system('{0} submodule update --init; {0} submodule foreach git pull origin master;'.format(git))
 os.chdir(wd)
 
 for item in os.listdir(parent):
@@ -147,15 +141,29 @@ if book:
 # -----------------------
 
 # 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 = 'pyramid'
-
-html_theme_options = {
-    'github_url': 'https://github.com/Pylons/pyramid',
-    'in_progress': True
-}
-
+html_theme_options = dict(
+    github_url='https://github.com/Pylons/pyramid_tutorials',
+    in_progress='true'
+    )
 # 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
 # given in html_static_path.