Merge branch 'master' of github.com:Pylons/zodburi

docs/conf.py

@@ -19,17 +19,6 @@
 
 import sys, os
 
-parent = os.path.dirname(os.path.dirname(__file__))
-sys.path.append(os.path.abspath(parent))
-wd = os.getcwd()
-os.chdir(parent)
-os.system('%s setup.py test -q' % sys.executable)
-os.chdir(wd)
-
-for item in os.listdir(parent):
-    if item.endswith('.egg'):
-        sys.path.append(os.path.join(parent, item))
-
 # General configuration
 # ---------------------
 
@@ -97,27 +86,19 @@ if 'sphinx-build' in ' '.join(sys.argv): # protect against dumb importers
     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'))
-
+    wd = os.getcwd()
     parent = os.path.dirname(os.path.dirname(__file__))
     sys.path.append(os.path.abspath(parent))
-    wd = os.getcwd()
+    sys.path.append(os.path.abspath('_themes'))
     os.chdir(parent)
-    sys.path.append(parent)
+    git = p.stdout.read().strip()
+    call([git, 'submodule', 'update', '--init', 'docs/_themes'])
+    os.system('%s setup.py test -q' % sys.executable)
+    os.chdir(wd)
 
+    for item in os.listdir(parent):
+        if item.endswith('.egg'):
+            sys.path.append(os.path.join(parent, item))
 
 # Options for HTML output
 # -----------------------