diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | docs/.gitignore | 1 | ||||
| -rw-r--r-- | docs/Makefile | 8 | ||||
| m--------- | docs/_themes | 0 | ||||
| -rw-r--r-- | docs/conf.py | 32 |
5 files changed, 24 insertions, 20 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 45397942b..000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "docs/_themes"] - path = docs/_themes - url = git://github.com/Pylons/pylons_sphinx_theme.git diff --git a/docs/.gitignore b/docs/.gitignore index 30d731d4a..da7abd0c0 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -1,3 +1,4 @@ +_themes _build diff --git a/docs/Makefile b/docs/Makefile index 373d549af..bb381fc53 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -23,9 +23,9 @@ help: @echo " linkcheck to check all external links for integrity" clean: - -rm -rf _build/* _themes + -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 @@ -84,5 +84,3 @@ epub: @echo @echo "Build finished. The epub file is in _build/epub." -_themes: - cd ..; git submodule update --init; cd docs diff --git a/docs/_themes b/docs/_themes deleted file mode 160000 -Subproject d0c25c1398f7c975db6fc174ef957764242ccb8 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. |