Skip to content

Commit

Permalink
docs refine
Browse files Browse the repository at this point in the history
  • Loading branch information
revol.cai committed Mar 6, 2018
1 parent 2b8f455 commit 84002b0
Show file tree
Hide file tree
Showing 15 changed files with 295 additions and 61 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "docs/guzzle_sphinx_theme"]
path = docs/guzzle_sphinx_theme
url = https://github.com/guzzle/guzzle_sphinx_theme.git
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ lint: ## check style with flake8

test: ## run tests quickly with the default Python
py.test


test-all: ## run tests on every Python version with tox
tox
Expand All @@ -64,9 +64,9 @@ coverage: ## check code coverage quickly with the default Python
$(BROWSER) htmlcov/index.html

docs: ## generate Sphinx HTML documentation, including API docs
rm -f docs/etcd3.rst
rm -f docs/modules.rst
sphinx-apidoc -o docs/ etcd3
# rm -f docs/etcd3.rst
# rm -f docs/modules.rst
# sphinx-apidoc -o docs/ etcd3
$(MAKE) -C docs clean
$(MAKE) -C docs html
$(BROWSER) docs/_build/html/index.html
Expand Down
6 changes: 3 additions & 3 deletions docs/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/etcd3.rst
/etcd3.*.rst
/modules.rst
#/etcd3.rst
#/etcd3.*.rst
#/modules.rst
124 changes: 76 additions & 48 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
# All configuration values have a default; values that are commented out
# serve to show the default.

import sys
import os
import sys

# If extensions (or modules to document with autodoc) are in another
# directory, add these directories to sys.path here. If the directory is
# relative to the documentation root, use os.path.abspath to make it
# absolute, like shown here.
#sys.path.insert(0, os.path.abspath('.'))
# sys.path.insert(0, os.path.abspath('.'))

# Get the project root dir, which is the parent dir of this
cwd = os.getcwd()
Expand All @@ -36,7 +36,7 @@
# -- General configuration ---------------------------------------------

# If your documentation needs a minimal Sphinx version, state it here.
#needs_sphinx = '1.0'
# needs_sphinx = '1.0'

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
Expand All @@ -49,7 +49,7 @@
source_suffix = '.rst'

# The encoding of source files.
#source_encoding = 'utf-8-sig'
# source_encoding = 'utf-8-sig'

# The master toctree document.
master_doc = 'index'
Expand All @@ -69,74 +69,103 @@

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#language = None
# language = None

# There are two options for replacing |today|: either, you set today to
# some non-false value, then it is used:
#today = ''
# today = ''
# Else, today_fmt is used as the format for a strftime call.
#today_fmt = '%B %d, %Y'
# today_fmt = '%B %d, %Y'

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
exclude_patterns = ['_build']

# The reST default role (used for this markup: `text`) to use for all
# documents.
#default_role = None
# default_role = None

# If true, '()' will be appended to :func: etc. cross-reference text.
#add_function_parentheses = True
# add_function_parentheses = True

# If true, the current module name will be prepended to all description
# unit titles (such as .. function::).
#add_module_names = True
# add_module_names = True

# If true, sectionauthor and moduleauthor directives will be shown in the
# output. They are ignored by default.
#show_authors = False
# show_authors = False

# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'

# A list of ignored prefixes for module index sorting.
#modindex_common_prefix = []
# modindex_common_prefix = []

# If true, keep warnings as "system message" paragraphs in the built
# documents.
#keep_warnings = False
# keep_warnings = False


# -- Options for HTML output -------------------------------------------

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = 'default'
html_theme = 'guzzle_sphinx_theme'

# Add any paths that contain custom themes here, relative to this directory.
html_theme_path = ['guzzle_sphinx_theme/guzzle_sphinx_theme']

# Register the theme as an extension to generate a sitemap.xml
# extensions.append("guzzle_sphinx_theme") # need install

# Theme options are theme-specific and customize the look and feel of a
# theme further. For a list of options available for each theme, see the
# documentation.
#html_theme_options = {}
# Guzzle theme options (see theme.conf for more information)
html_theme_options = {
# Set the name of the project to appear in the sidebar
"project_nav_name": "etcd3-py",

# Add any paths that contain custom themes here, relative to this directory.
#html_theme_path = []
# Set the path to a special layout to include for the homepage
# "index_template": "special_index.html",

# Set your Disqus short name to enable comments
"disqus_comments_shortname": "etcd3-py",

# Set you GA account ID to enable tracking
"google_analytics_account": "UA-100695560-1",

# Path to a touch icon
# "touch_icon": "",

# Specify a base_url used to generate sitemap.xml links. If not
# specified, then no sitemap will be built.
# "base_url": "",

# Allow a separate homepage from the master_doc
"homepage": "index",

# Allow the project link to be overriden to a custom URL.
"projectlink": "https://github.com/Revolution1/etcd3-py",
}

# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
#html_title = None
# html_title = None

# A shorter title for the navigation bar. Default is the same as
# html_title.
#html_short_title = None
# html_short_title = None

# The name of an image file (relative to this directory) to place at the
# top of the sidebar.
#html_logo = None
# html_logo = None

# The name of an image file (within the static path) to use as favicon
# of the docs. This file should be a Windows icon file (.ico) being
# 16x16 or 32x32 pixels large.
#html_favicon = None
# html_favicon = None

# Add any paths that contain custom static files (such as style sheets)
# here, relative to this directory. They are copied after the builtin
Expand All @@ -146,62 +175,61 @@

# If not '', a 'Last updated on:' timestamp is inserted at every page
# bottom, using the given strftime format.
#html_last_updated_fmt = '%b %d, %Y'
# html_last_updated_fmt = '%b %d, %Y'

# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
#html_use_smartypants = True
# html_use_smartypants = True

# Custom sidebar templates, maps document names to template names.
#html_sidebars = {}
# html_sidebars = {}

# Additional templates that should be rendered to pages, maps page names
# to template names.
#html_additional_pages = {}
# html_additional_pages = {}

# If false, no module index is generated.
#html_domain_indices = True
# html_domain_indices = True

# If false, no index is generated.
#html_use_index = True
# html_use_index = True

# If true, the index is split into individual pages for each letter.
#html_split_index = False
# html_split_index = False

# If true, links to the reST sources are added to the pages.
#html_show_sourcelink = True
# html_show_sourcelink = True

# If true, "Created using Sphinx" is shown in the HTML footer.
# Default is True.
#html_show_sphinx = True
# html_show_sphinx = True

# If true, "(C) Copyright ..." is shown in the HTML footer.
# Default is True.
#html_show_copyright = True
# html_show_copyright = True

# If true, an OpenSearch description file will be output, and all pages
# will contain a <link> tag referring to it. The value of this option
# must be the base URL from which the finished HTML is served.
#html_use_opensearch = ''
# html_use_opensearch = ''

# This is the file name suffix for HTML files (e.g. ".xhtml").
#html_file_suffix = None
# html_file_suffix = None

# Output file base name for HTML help builder.
htmlhelp_basename = 'etcd3doc'


# -- Options for LaTeX output ------------------------------------------

latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#'papersize': 'letterpaper',
# 'papersize': 'letterpaper',

# The font size ('10pt', '11pt' or '12pt').
#'pointsize': '10pt',
# 'pointsize': '10pt',

# Additional stuff for the LaTeX preamble.
#'preamble': '',
# 'preamble': '',
}

# Grouping the document tree into LaTeX files. List of tuples
Expand All @@ -215,23 +243,23 @@

# The name of an image file (relative to this directory) to place at
# the top of the title page.
#latex_logo = None
# latex_logo = None

# For "manual" documents, if this is true, then toplevel headings
# are parts, not chapters.
#latex_use_parts = False
# latex_use_parts = False

# If true, show page references after internal links.
#latex_show_pagerefs = False
# latex_show_pagerefs = False

# If true, show URL addresses after external links.
#latex_show_urls = False
# latex_show_urls = False

# Documents to append as an appendix to all manuals.
#latex_appendices = []
# latex_appendices = []

# If false, no module index is generated.
#latex_domain_indices = True
# latex_domain_indices = True


# -- Options for manual page output ------------------------------------
Expand All @@ -245,7 +273,7 @@
]

# If true, show URL addresses after external links.
#man_show_urls = False
# man_show_urls = False


# -- Options for Texinfo output ----------------------------------------
Expand All @@ -263,13 +291,13 @@
]

# Documents to append as an appendix to all manuals.
#texinfo_appendices = []
# texinfo_appendices = []

# If false, no module index is generated.
#texinfo_domain_indices = True
# texinfo_domain_indices = True

# How to display URL addresses: 'footnote', 'no', or 'inline'.
#texinfo_show_urls = 'footnote'
# texinfo_show_urls = 'footnote'

# If true, do not generate a @detailmenu in the "Top" node's menu.
#texinfo_no_detailmenu = False
# texinfo_no_detailmenu = False
66 changes: 66 additions & 0 deletions docs/etcd3.apis.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
etcd3\.apis
===================

etcd3\.apis\.auth
------------------------

.. automodule:: etcd3.apis.auth
:members:
:undoc-members:
:show-inheritance:

etcd3\.apis\.base
------------------------

.. automodule:: etcd3.apis.base
:members:
:undoc-members:
:show-inheritance:

etcd3\.apis\.cluster
---------------------------

.. automodule:: etcd3.apis.cluster
:members:
:undoc-members:
:show-inheritance:

etcd3\.apis\.extra
-------------------------

.. automodule:: etcd3.apis.extra
:members:
:undoc-members:
:show-inheritance:

etcd3\.apis\.kv
----------------------

.. automodule:: etcd3.apis.kv
:members:
:undoc-members:
:show-inheritance:

etcd3\.apis\.lease
-------------------------

.. automodule:: etcd3.apis.lease
:members:
:undoc-members:
:show-inheritance:

etcd3\.apis\.maintenance
-------------------------------

.. automodule:: etcd3.apis.maintenance
:members:
:undoc-members:
:show-inheritance:

etcd3\.apis\.watch
-------------------------

.. automodule:: etcd3.apis.watch
:members:
:undoc-members:
:show-inheritance:

0 comments on commit 84002b0

Please sign in to comment.