Merge pull request #10 from stevepiercy/master

Change to using package pylons-sphinx-themes and remove git submodule

.gitmodules

-[submodule "docs/_themes"]
-	path = docs/_themes
-	url = git://github.com/Pylons/pylons_sphinx_theme.git

docs/Makefile

@@ -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
@@ -47,7 +47,7 @@ pickle:
 
 web: pickle
 
-htmlhelp: _themes
+htmlhelp:
 	mkdir -p _build/htmlhelp _build/doctrees
 	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
 	@echo
@@ -83,6 +83,3 @@ epub:
 	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) _build/epub
 	@echo
 	@echo "Build finished. The epub file is in _build/epub."
-
-_themes:
-	cd ..; git submodule update --init; cd docs

_themes @ de1ebd27

-Subproject commit de1ebd27d5a699e60e13947f479266e70020dd79

docs/conf.py

@@ -18,6 +18,7 @@
 #sys.path.append(os.path.abspath('some/directory'))
 
 import sys, os
+import pylons_sphinx_themes
 
 # General configuration
 # ---------------------
@@ -81,33 +82,17 @@ today_fmt = '%B %d, %Y'
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
-# Add and use Pylons theme
-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)
-    wd = os.getcwd()
-    parent = os.path.dirname(os.path.dirname(__file__))
-    sys.path.append(os.path.abspath(parent))
-    sys.path.append(os.path.abspath('_themes'))
-    os.chdir(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
 # -----------------------
 
 # Add and use Pylons theme
 sys.path.append(os.path.abspath('_themes'))
-html_theme_path = ['_themes']
+html_theme_path = pylons_sphinx_themes.get_html_themes_path()
 html_theme = 'pylons'
-html_theme_options = dict(github_url='http://github.com/Pylons/zodburi')
+html_theme_options = dict(
+    github_url='http://github.com/Pylons/zodburi',
+    canonical_url='http://docs.pylonsproject.org/projects/zodburi/en/latest/',
+)
 
 # 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

rtd.txt

-repoze.sphinx.autointerface
+ZEO==4.2.1
+-e .[docs]
\ No newline at end of file

setup.py

@@ -20,7 +20,11 @@ except:
 requires = ['ZODB', 'ZConfig', 'ZEO']
 tests_require = requires + ['mock']
 testing_extras = tests_require + ['nose', 'coverage']
-docs_extras = tests_require + ['Sphinx']
+docs_extras = tests_require + [
+    'Sphinx >= 1.3.1',
+    'repoze.sphinx.autointerface',
+    'pylons-sphinx-themes',
+]
 
 setup(name='zodburi',
       version='2.0',

tox.ini

@@ -29,3 +29,4 @@ commands =
     sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
 deps =
     Sphinx
+    pylons-sphinx-themes