git.iko.soy/typeable/servant
on master help sign in
Update doc deps
commit4b247ee8016460c7795ea141020042a0c4337dcf authorOleg Grenrus <oleg.grenrus@iki.fi> dateFri 6 Jul 2018, 11:45 (8 years ago) parentbd8c5b9
3 files changed+67−406
doc/Makefile+10−206 doc/conf.py+54−175 doc/requirements.txt+3−25
doc/Makefile+10−206
@@ -1,216 +1,20 @@
1−# Makefile for Sphinx documentation
1+# Minimal makefile for Sphinx documentation
22#
33
44# You can set these variables from the command line.
55SPHINXOPTS =
66SPHINXBUILD = sphinx-build
7−PAPER =
7+SPHINXPROJ = Servant
8+SOURCEDIR = .
89BUILDDIR = _build
910
10−# User-friendly check for sphinx-build
11−ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
12−$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
13−endif
14−
15−# Internal variables.
16−PAPEROPT_a4 = -D latex_paper_size=a4
17−PAPEROPT_letter = -D latex_paper_size=letter
18−ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
19−# the i18n builder cannot share the environment and doctrees with the others
20−I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
21−
22−.PHONY: help
11+# Put it first so that "make" without argument is like "make help".
2312help:
24− @echo "Please use \`make <target>' where <target> is one of"
25− @echo " html to make standalone HTML files"
26− @echo " dirhtml to make HTML files named index.html in directories"
27− @echo " singlehtml to make a single large HTML file"
28− @echo " pickle to make pickle files"
29− @echo " json to make JSON files"
30− @echo " htmlhelp to make HTML files and a HTML help project"
31− @echo " qthelp to make HTML files and a qthelp project"
32− @echo " applehelp to make an Apple Help Book"
33− @echo " devhelp to make HTML files and a Devhelp project"
34− @echo " epub to make an epub"
35− @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
36− @echo " latexpdf to make LaTeX files and run them through pdflatex"
37− @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
38− @echo " text to make text files"
39− @echo " man to make manual pages"
40− @echo " texinfo to make Texinfo files"
41− @echo " info to make Texinfo files and run them through makeinfo"
42− @echo " gettext to make PO message catalogs"
43− @echo " changes to make an overview of all changed/added/deprecated items"
44− @echo " xml to make Docutils-native XML files"
45− @echo " pseudoxml to make pseudoxml-XML files for display purposes"
46− @echo " linkcheck to check all external links for integrity"
47− @echo " doctest to run all doctests embedded in the documentation (if enabled)"
48− @echo " coverage to run coverage check of the documentation (if enabled)"
49−
50−.PHONY: clean
51−clean:
52− rm -rf $(BUILDDIR)/*
53−
54−.PHONY: html
55−html:
56− $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
57− @echo
58− @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
59−
60−.PHONY: dirhtml
61−dirhtml:
62− $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
63− @echo
64− @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
65−
66−.PHONY: singlehtml
67−singlehtml:
68− $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
69− @echo
70− @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
71−
72−.PHONY: pickle
73−pickle:
74− $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
75− @echo
76− @echo "Build finished; now you can process the pickle files."
77−
78−.PHONY: json
79−json:
80− $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
81− @echo
82− @echo "Build finished; now you can process the JSON files."
83−
84−.PHONY: htmlhelp
85−htmlhelp:
86− $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
87− @echo
88− @echo "Build finished; now you can run HTML Help Workshop with the" \
89− ".hhp project file in $(BUILDDIR)/htmlhelp."
90−
91−.PHONY: qthelp
92−qthelp:
93− $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
94− @echo
95− @echo "Build finished; now you can run "qcollectiongenerator" with the" \
96− ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
97− @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/generics-eot.qhcp"
98− @echo "To view the help file:"
99− @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/generics-eot.qhc"
100−
101−.PHONY: applehelp
102−applehelp:
103− $(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
104− @echo
105− @echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
106− @echo "N.B. You won't be able to view it unless you put it in" \
107− "~/Library/Documentation/Help or install it in your application" \
108− "bundle."
109−
110−.PHONY: devhelp
111−devhelp:
112− $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
113− @echo
114− @echo "Build finished."
115− @echo "To view the help file:"
116− @echo "# mkdir -p $$HOME/.local/share/devhelp/generics-eot"
117− @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/generics-eot"
118− @echo "# devhelp"
119−
120−.PHONY: epub
121−epub:
122− $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
123− @echo
124− @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
125−
126−.PHONY: latex
127−latex:
128− $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
129− @echo
130− @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
131− @echo "Run \`make' in that directory to run these through (pdf)latex" \
132− "(use \`make latexpdf' here to do that automatically)."
133−
134−.PHONY: latexpdf
135−latexpdf:
136− $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
137− @echo "Running LaTeX files through pdflatex..."
138− $(MAKE) -C $(BUILDDIR)/latex all-pdf
139− @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
140−
141−.PHONY: latexpdfja
142−latexpdfja:
143− $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
144− @echo "Running LaTeX files through platex and dvipdfmx..."
145− $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
146− @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
147−
148−.PHONY: text
149−text:
150− $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
151− @echo
152− @echo "Build finished. The text files are in $(BUILDDIR)/text."
153−
154−.PHONY: man
155−man:
156− $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
157− @echo
158− @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
159−
160−.PHONY: texinfo
161−texinfo:
162− $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
163− @echo
164− @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
165− @echo "Run \`make' in that directory to run these through makeinfo" \
166− "(use \`make info' here to do that automatically)."
167−
168−.PHONY: info
169−info:
170− $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
171− @echo "Running Texinfo files through makeinfo..."
172− make -C $(BUILDDIR)/texinfo info
173− @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
174−
175−.PHONY: gettext
176−gettext:
177− $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
178− @echo
179− @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
180−
181−.PHONY: changes
182−changes:
183− $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
184− @echo
185− @echo "The overview file is in $(BUILDDIR)/changes."
186−
187−.PHONY: linkcheck
188−linkcheck:
189− $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
190− @echo
191− @echo "Link check complete; look for any errors in the above output " \
192− "or in $(BUILDDIR)/linkcheck/output.txt."
193−
194−.PHONY: doctest
195−doctest:
196− $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
197− @echo "Testing of doctests in the sources finished, look at the " \
198− "results in $(BUILDDIR)/doctest/output.txt."
199−
200−.PHONY: coverage
201−coverage:
202− $(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
203− @echo "Testing of coverage in the sources finished, look at the " \
204− "results in $(BUILDDIR)/coverage/python.txt."
13+ @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
20514
206−.PHONY: xml
207−xml:
208− $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
209− @echo
210− @echo "Build finished. The XML files are in $(BUILDDIR)/xml."
15+.PHONY: help Makefile
21116
212−.PHONY: pseudoxml
213−pseudoxml:
214− $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
215− @echo
216− @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
17+# Catch-all target: route all unknown targets to Sphinx using the new
18+# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
19+%: Makefile
20+ @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
doc/conf.py+54−175
@@ -1,7 +1,7 @@
11# -*- coding: utf-8 -*-
22#
3−# servant documentation build configuration file, created by
4−# sphinx-quickstart on Mon Nov 23 13:24:36 2015.
3+# Servant documentation build configuration file, created by
4+# sphinx-quickstart on Fri Jul 6 11:38:51 2018.
55#
66# This file is execfile()d with the current directory set to its
77# containing dir.
@@ -12,20 +12,21 @@
1212# All configuration values have a default; values that are commented out
1313# serve to show the default.
1414
15−import sys
16−import os
17−import shlex
18−from recommonmark.parser import CommonMarkParser
19−
2015# If extensions (or modules to document with autodoc) are in another directory,
2116# add these directories to sys.path here. If the directory is relative to the
2217# documentation root, use os.path.abspath to make it absolute, like shown here.
23−#sys.path.insert(0, os.path.abspath('.'))
18+#
19+# import os
20+# import sys
21+# sys.path.insert(0, os.path.abspath('.'))
22+from recommonmark.parser import CommonMarkParser
23+
2424
2525# -- General configuration ------------------------------------------------
2626
2727# If your documentation needs a minimal Sphinx version, state it here.
28−#needs_sphinx = '1.0'
28+#
29+# needs_sphinx = '1.0'
2930
3031# Add any Sphinx extension module names here, as strings. They can be
3132# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
@@ -37,17 +38,15 @@ templates_path = ['_templates']
3738
3839# The suffix(es) of source filenames.
3940# You can specify multiple suffix as a list of string:
40−source_suffix = ['.md', '.rst', '.lhs']
41−
42−# The encoding of source files.
43−#source_encoding = 'utf-8-sig'
41+#
42+source_suffix = ['.rst', '.md', '.lhs']
4443
4544# The master toctree document.
4645master_doc = 'index'
4746
4847# General information about the project.
49−project = u'servant'
50−copyright = u'2016, Servant Contributors'
48+project = u'Servant'
49+copyright = u'2018, Servant Contributors'
5150author = u'Servant Contributors'
5251
5352# The version info for the project you're documenting, acts as replacement for
@@ -55,9 +54,9 @@ author = u'Servant Contributors'
5554# built documents.
5655#
5756# The short X.Y version.
58−# version = 'latest'
57+# version = u'0.14'
5958# The full version, including alpha/beta/rc tags.
60−# release = 'latest'
59+# release = u'0.14'
6160
6261# The language for content autogenerated by Sphinx. Refer to documentation
6362# for a list of supported languages.
@@ -66,45 +65,14 @@ author = u'Servant Contributors'
6665# Usually you set "language" from the command line for these cases.
6766language = None
6867
69−# There are two options for replacing |today|: either, you set today to some
70−# non-false value, then it is used:
71−#today = ''
72−# Else, today_fmt is used as the format for a strftime call.
73−#today_fmt = '%B %d, %Y'
74−
7568# List of patterns, relative to source directory, that match files and
7669# directories to ignore when looking for source files.
77−exclude_patterns = ['_build', 'venv']
78−
79−# The reST default role (used for this markup: `text`) to use for all
80−# documents.
81−#default_role = None
82−
83−# If true, '()' will be appended to :func: etc. cross-reference text.
84−#add_function_parentheses = True
85−
86−# If true, the current module name will be prepended to all description
87−# unit titles (such as .. function::).
88−#add_module_names = True
89−
90−# If true, sectionauthor and moduleauthor directives will be shown in the
91−# output. They are ignored by default.
92−#show_authors = False
70+# This patterns also effect to html_static_path and html_extra_path
71+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
9372
9473# The name of the Pygments (syntax highlighting) style to use.
9574pygments_style = 'sphinx'
9675
97−def setup(app):
98− from sphinx.highlighting import lexers
99− from pygments.lexers import HaskellLexer
100− lexers['haskell ignore'] = HaskellLexer(stripnl=False)
101−
102−# A list of ignored prefixes for module index sorting.
103−#modindex_common_prefix = []
104−
105−# If true, keep warnings as "system message" paragraphs in the built documents.
106−#keep_warnings = False
107−
10876# If true, `todo` and `todoList` produce output, else they produce nothing.
10977todo_include_todos = False
11078
@@ -113,157 +81,77 @@ todo_include_todos = False
11381
11482# The theme to use for HTML and HTML Help pages. See the documentation for
11583# a list of builtin themes.
84+#
11685html_theme = 'sphinx_rtd_theme'
11786
11887# Theme options are theme-specific and customize the look and feel of a theme
11988# further. For a list of options available for each theme, see the
12089# documentation.
121−#html_theme_options = {}
122−
123−# Add any paths that contain custom themes here, relative to this directory.
124−#html_theme_path = []
125−
126−# The name for this set of Sphinx documents. If None, it defaults to
127−# "<project> v<release> documentation".
128−#html_title = None
129−
130−# A shorter title for the navigation bar. Default is the same as html_title.
131−#html_short_title = None
132−
133−# The name of an image file (relative to this directory) to place at the top
134−# of the sidebar.
135−#html_logo = None
136−
137−# The name of an image file (within the static path) to use as favicon of the
138−# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
139−# pixels large.
140−#html_favicon = None
90+#
91+# html_theme_options = {}
14192
14293# Add any paths that contain custom static files (such as style sheets) here,
14394# relative to this directory. They are copied after the builtin static files,
14495# so a file named "default.css" will overwrite the builtin "default.css".
14596html_static_path = ['_static']
14697
147−# Add any extra paths that contain custom files (such as robots.txt or
148−# .htaccess) here, relative to this directory. These files are copied
149−# directly to the root of the documentation.
150−#html_extra_path = []
151−
152−# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
153−# using the given strftime format.
154−#html_last_updated_fmt = '%b %d, %Y'
155−
156−# If true, SmartyPants will be used to convert quotes and dashes to
157−# typographically correct entities.
158−#html_use_smartypants = True
159−
160−# Custom sidebar templates, maps document names to template names.
161−#html_sidebars = {}
162−
163−# Additional templates that should be rendered to pages, maps page names to
164−# template names.
165−#html_additional_pages = {}
166−
167−# If false, no module index is generated.
168−#html_domain_indices = True
169−
170−# If false, no index is generated.
171−#html_use_index = True
172−
173−# If true, the index is split into individual pages for each letter.
174−#html_split_index = False
175−
176−# If true, links to the reST sources are added to the pages.
177−#html_show_sourcelink = True
178−
179−# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
180−#html_show_sphinx = True
181−
182−# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
183−#html_show_copyright = True
184−
185−# If true, an OpenSearch description file will be output, and all pages will
186−# contain a <link> tag referring to it. The value of this option must be the
187−# base URL from which the finished HTML is served.
188−#html_use_opensearch = ''
189−
190−# This is the file name suffix for HTML files (e.g. ".xhtml").
191−#html_file_suffix = None
192−
193−# Language to be used for generating the HTML full-text search index.
194−# Sphinx supports the following languages:
195−# 'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
196−# 'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
197−#html_search_language = 'en'
98+# Custom sidebar templates, must be a dictionary that maps document names
99+# to template names.
100+#
101+# This is required for the alabaster theme
102+# refs: http://alabaster.readthedocs.io/en/latest/installation.html#sidebars
103+html_sidebars = {
104+ '**': [
105+ 'relations.html', # needs 'show_related': True theme option to display
106+ 'searchbox.html',
107+ ]
108+}
198109
199−# A dictionary with options for the search language support, empty by default.
200−# Now only 'ja' uses this config value
201−#html_search_options = {'type': 'default'}
202110
203−# The name of a javascript file (relative to the configuration directory) that
204−# implements a search results scorer. If empty, the default will be used.
205−#html_search_scorer = 'scorer.js'
111+# -- Options for HTMLHelp output ------------------------------------------
206112
207113# Output file base name for HTML help builder.
208−htmlhelp_basename = 'servantdoc'
114+htmlhelp_basename = 'Servantdoc'
115+
209116
210117# -- Options for LaTeX output ---------------------------------------------
211118
212119latex_elements = {
213−# The paper size ('letterpaper' or 'a4paper').
214−#'papersize': 'letterpaper',
120+ # The paper size ('letterpaper' or 'a4paper').
121+ #
122+ # 'papersize': 'letterpaper',
215123
216−# The font size ('10pt', '11pt' or '12pt').
217−#'pointsize': '10pt',
124+ # The font size ('10pt', '11pt' or '12pt').
125+ #
126+ # 'pointsize': '10pt',
218127
219−# Additional stuff for the LaTeX preamble.
220−#'preamble': '',
128+ # Additional stuff for the LaTeX preamble.
129+ #
130+ # 'preamble': '',
221131
222−# Latex figure (float) alignment
223−#'figure_align': 'htbp',
132+ # Latex figure (float) alignment
133+ #
134+ # 'figure_align': 'htbp',
224135}
225136
226137# Grouping the document tree into LaTeX files. List of tuples
227138# (source start file, target name, title,
228139# author, documentclass [howto, manual, or own class]).
229140latex_documents = [
230− (master_doc, 'servant.tex', u'servant Documentation',
141+ (master_doc, 'Servant.tex', u'Servant Documentation',
231142 u'Servant Contributors', 'manual'),
232143]
233144
234−# The name of an image file (relative to this directory) to place at the top of
235−# the title page.
236−#latex_logo = None
237−
238−# For "manual" documents, if this is true, then toplevel headings are parts,
239−# not chapters.
240−#latex_use_parts = False
241−
242−# If true, show page references after internal links.
243−#latex_show_pagerefs = False
244−
245−# If true, show URL addresses after external links.
246−#latex_show_urls = False
247−
248−# Documents to append as an appendix to all manuals.
249−#latex_appendices = []
250−
251−# If false, no module index is generated.
252−#latex_domain_indices = True
253−
254145
255146# -- Options for manual page output ---------------------------------------
256147
257148# One entry per manual page. List of tuples
258149# (source start file, name, description, authors, manual section).
259150man_pages = [
260− (master_doc, 'servant', u'servant Documentation',
151+ (master_doc, 'servant', u'Servant Documentation',
261152 [author], 1)
262153]
263154
264−# If true, show URL addresses after external links.
265−#man_show_urls = False
266−
267155
268156# -- Options for Texinfo output -------------------------------------------
269157
@@ -271,24 +159,15 @@ man_pages = [
271159# (source start file, target name, title, author,
272160# dir menu entry, description, category)
273161texinfo_documents = [
274− (master_doc, 'servant', u'servant Documentation',
275− author, 'servant', 'One line description of project.',
276− 'Miscellaneous'),
162+ (master_doc, 'Servant', u'Servant Documentation',
163+ author, 'Servant', 'One line description of project.',
164+ 'Miscellaneous'),
277165]
278166
279−# Documents to append as an appendix to all manuals.
280−#texinfo_appendices = []
281−
282−# If false, no module index is generated.
283−#texinfo_domain_indices = True
284−
285−# How to display URL addresses: 'footnote', 'no', or 'inline'.
286−#texinfo_show_urls = 'footnote'
287−
288−# If true, do not generate a @detailmenu in the "Top" node's menu.
289−#texinfo_no_detailmenu = False
167+# -- Markdown -------------------------------------------------------------
290168
291169source_parsers = {
292170 '.md': CommonMarkParser,
293171 '.lhs': CommonMarkParser,
294172}
173+
doc/requirements.txt+3−25
@@ -1,25 +1,3 @@
1−alabaster==0.7.7
2−argh==0.26.1
3−Babel==2.2.0
4−backports-abc==0.4
5−backports.ssl-match-hostname==3.5.0.1
6−certifi==2015.11.20.1
7−CommonMark==0.5.4
8−docutils==0.12
9−Jinja2==2.8
10−livereload==2.4.1
11−MarkupSafe==0.23
12−pathtools==0.1.2
13−Pygments==2.2.0
14−pytz==2015.7
15−PyYAML==3.11
16−recommonmark==0.4.0
17−singledispatch==3.4.0.3
18−six==1.10.0
19−snowballstemmer==1.2.1
20−Sphinx==1.3.6
21−sphinx-autobuild==0.5.2
22−sphinx-rtd-theme==0.1.9
23−tornado==4.3
24−watchdog==0.8.3
25−wheel==0.26.0
1+recommonmark=0.4.0
2+Sphinx==1.7.5
3+sphinx_rtd_theme>=0.4.0