- replace git submodule with new pylons-sphinx-themes package. See #1614, #...

Steve Piercy

2015-04-17 14899f490366a9d93746c42237e3c641f6b5c819

- replace git submodule with new pylons-sphinx-themes package. See #1614, #1596

 .gitmodules

File was deleted

 docs/Makefile

@@ -25,7 +25,7 @@
clean:
    -rm -rf _build/*

html: themes
html:
    mkdir -p _build/html _build/doctrees
    $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
    @echo
@@ -47,7 +47,7 @@

web: pickle

htmlhelp: themes
htmlhelp:
    mkdir -p _build/htmlhelp _build/doctrees
    $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
    @echo
@@ -88,6 +88,3 @@
    $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) _build/epub
    @echo
    @echo "Build finished. The epub file is in _build/epub."

themes:
    cd ..; git submodule update --init --recursive; cd docs;

 docs/_themes

File was deleted

 docs/conf.py

@@ -20,6 +20,7 @@
warnings.simplefilter('ignore', DeprecationWarning)

import pkg_resources
import pylons_sphinx_themes

# skip raw nodes
from sphinx.writers.text import TextTranslator
@@ -137,26 +138,8 @@
# -----------------------

# Add and use Pylons theme
if 'sphinx-build' in ' '.join(sys.argv):  # protect against dumb importers
    from subprocess import call, Popen, PIPE
    cwd = os.getcwd()
    p = Popen('which git', shell=True, stdout=PIPE)
    here = os.path.abspath(os.path.dirname(__file__))
    parent = os.path.abspath(os.path.dirname(here))
    _themes = os.path.join(here, '_themes')
    git = p.stdout.read().strip()
    try:
        os.chdir(parent)
        if not os.listdir(_themes):
            call([git, 'submodule', '--init'])
        else:
            call([git, 'submodule', 'update'])
        sys.path.append(_themes)
    finally:
        os.chdir(cwd)

html_theme_path = ['_themes']
html_theme = 'pyramid'
html_theme_path = pylons_sphinx_themes.get_html_themes_path()
html_theme_options = dict(
    github_url='https://github.com/Pylons/pyramid',
    in_progress='false',

 rtd.txt

@@ -2,3 +2,4 @@
repoze.sphinx.autointerface
repoze.lru
pylons_sphinx_latesturl
pylons-sphinx-themes

 setup.py

@@ -59,6 +59,7 @@
    'Sphinx >= 1.2.3',
    'docutils',
    'repoze.sphinx.autointerface',
    'pylons-sphinx-themes >= 0.3',
    ]

testing_extras = tests_require + [