Skip to content

Commit

Permalink
Upgrade to Jinja2 v3.1.3 as per #395.
Browse files Browse the repository at this point in the history 
The version of Sphinx we were using is simply not compatible
with Jinja2 > v3.0.3, so given that we had to upset the delicate
balance of requirements anyway, the goal of this PR is now to
bring all docs infrastructure for CI/CD as well as dependencies
and indeed the docs themselves to the latest version.

Signed-off-by: Ben Smith <[email protected]>
  • Loading branch information
@benjsmi @denyeart
benjsmi authored and denyeart committed Jan 16, 2024
1 parent 17d1889 commit 170d68e
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 174 deletions.
47 changes: 23 additions & 24 deletions docs/requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,38 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#


alabaster==0.7.13
Babel==2.12.1
certifi==2023.7.22
charset-normalizer==3.2.0
alabaster==0.7.16
Babel==2.14.0
certifi==2023.11.17
charset-normalizer==3.3.2
commonmark==0.9.1
docutils==0.17.1
idna==3.4
docutils==0.20.1
idna==3.6
imagesize==1.4.1
importlib-metadata==6.7.0
Jinja2==3.0.3
Jinja2==3.1.3
markdown-it-py==3.0.0
MarkupSafe==2.1.3
packaging==23.1
Pygments==2.15.1
mdit-py-plugins==0.4.0
mdurl==0.1.2
myst-parser==2.0.0
packaging==23.2
Pygments==2.17.2
python-markdown-math==0.2
pytz==2023.3
PyYAML==6.0.1
readthedocs-sphinx-ext==2.2.5
recommonmark==0.7.1
requests==2.31.0
six==1.16.0
snowballstemmer==2.2.0
Sphinx==1.8.6
sphinx-rtd-theme==0.1.9
sphinxcontrib-applehelp==1.0.2
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-htmlhelp==2.0.0
Sphinx==7.2.6
sphinx-rtd-theme==2.0.0
sphinxcontrib-applehelp==1.0.8
sphinxcontrib-devhelp==1.0.6
sphinxcontrib-htmlhelp==2.0.5
sphinxcontrib-jquery==4.1
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
sphinxcontrib-qthelp==1.0.7
sphinxcontrib-serializinghtml==1.1.10
sphinxcontrib-websupport==1.2.4
typing_extensions==4.7.1
urllib3==1.26.18
urllib3==2.1.0
zipp==3.15.0
207 changes: 58 additions & 149 deletions docs/source/conf.py
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,12 @@
# -*- coding: utf-8 -*-
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
# hyperledger-fabric-ca documentation build configuration file, created by
# sphinx-quickstart on Tue May 23 17:35:49 2017.
#
# This file is execfile()d with the current directory set to its
# containing dir.
#
# Note that not all possible configuration values are present in this
# autogenerated file.
# Configuration file for the Sphinx documentation builder.
#
# All configuration values have a default; values that are commented out
# serve to show the default.
# For the full list of built-in configuration values, see the documentation:
# https://www.sphinx-doc.org/en/master/usage/configuration.html

# 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.
#
import os
import sys
sys.path.insert(0, os.path.abspath('.'))
Expand All @@ -30,98 +17,70 @@
"{BRANCH}": "main"
}

# -- General configuration ------------------------------------------------

# If your documentation needs a minimal Sphinx version, state it here.
#
# needs_sphinx = '1.0'
# -- Project information -----------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
project = u'Hyperledger Fabric CA Docs'
copyright = u'2017-2024, Hyperledger Foundation'
author = u'Hyperledger Foundation'
release = u'main'
version = u'main'

extensions = ['sphinx.ext.autodoc',
'sphinx.ext.doctest',
'sphinx.ext.intersphinx',
'sphinx.ext.todo',
'sphinx.ext.imgmath',
'sphinx.ext.ifconfig',
'sphinx.ext.viewcode']
# -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
# 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.
#

# recommonmark is a python utility that allows markdown to be used within
# Sphinx projects.
# Installed version as per directive in docs/requirement.txt
from recommonmark.parser import CommonMarkParser

source_parsers = {
'.md': CommonMarkParser,
# source_parsers = {
# '.md': 'recommonmark.parser.CommonMarkParser',
# }

# The file extensions of source files. Sphinx considers the files with this suffix as sources.
# The value can be a dictionary mapping file extensions to file types. For example:
source_suffix = {
'.rst': 'restructuredtext',
'.md': 'markdown'
}

# The suffix(es) of source filenames.
# You can specify multiple suffix as a list of string:
source_suffix = ['.rst', '.md']

# The main toctree document.
master_doc = 'index'

# General information about the project.
project = u'hyperledger-fabric-cadocs'
copyright = u'2017-2023, hyperledger'
author = u'hyperledger'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = u'main'
# The full version, including alpha/beta/rc tags.
release = u'main'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This patterns also effect to html_static_path and html_extra_path
exclude_patterns = []
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']

# Used to be "master_doc"
# The main toctree document
root_doc = 'index'

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

# If true, `todo` and `todoList` produce output, else they produce nothing.
todo_include_todos = True

extensions = ['sphinx.ext.autodoc',
'sphinx.ext.doctest',
'sphinx.ext.intersphinx',
'sphinx.ext.todo',
'sphinx.ext.imgmath',
'sphinx.ext.ifconfig',
'sphinx.ext.viewcode',
'myst_parser']

# -- 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 = 'sphinx_rtd_theme'

html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]

html_add_permalinks = True

# 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.
# -- Special API Accesses -------------------------------------------------
# They create an instance of the Sphinx object, documented here
# https://www.sphinx-doc.org/en/master/extdev/appapi.html#sphinx.application.Sphinx
# and pass it to us as "app" in this setup function.
#
# html_theme_options = {}

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
# We then call it to perform special/specific customizations.

def placeholderReplace(app, docname, source):
result = source[0]
Expand All @@ -130,74 +89,24 @@ def placeholderReplace(app, docname, source):
source[0] = result

def setup(app):
app.add_stylesheet('css/custom.css')
## The next commented line is how you would actually import and use the custom.css.
## It's actually always been overridden by the parameters from the RTD
## theme, so we've never actually seen it. BHS kept it here in case we
## with to use it, but chances are, we should just throw it out.
##
## The changes are minimal and suboptimal in BHS's opinion.
# app.add_css_file('custom.css')
app.add_config_value('placeholder_replacements', {}, True)
app.connect('source-read', placeholderReplace)

# -- Options for HTMLHelp output ------------------------------------------

# Output file base name for HTML help builder.
htmlhelp_basename = 'hyperledger-fabric-cadocs'
# -- Options for HTML output -------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output

html_theme = 'sphinx_rtd_theme'

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

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

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

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

# Latex figure (float) alignment
#
# 'figure_align': 'htbp',
}

# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, 'hyperledger-fabric-cadocs.tex', u'hyperledger-fabric-ca Documentation',
u'hyperledger', 'manual'),
]


# -- Options for manual page output ---------------------------------------

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
(master_doc, 'hyperledger-fabric-cadocs', u'hyperledger-fabric-ca Documentation',
[author], 1)
]


# -- Options for Texinfo output -------------------------------------------

# Grouping the document tree into Texinfo files. List of tuples
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
(master_doc, 'hyperledger-fabric-cadocs', u'hyperledger-fabric-ca Documentation',
author, 'hyperledger-fabric-ca', 'One line description of project.',
'Miscellaneous'),
]

# Bibliographic Dublin Core info.
epub_title = project
epub_author = author
epub_publisher = author
epub_copyright = copyright
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]

# A list of files that should not be packed into the epub file.
epub_exclude_files = ['search.html']
html_static_path = ['_static']

# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'https://docs.python.org/': None}
html_add_permalinks = True
2 changes: 1 addition & 1 deletion docs/source/index.rst
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Welcome to Hyperledger Fabric CA (Certificate Authority)
=======================================================
==========================================================

This build of the docs is from the "|version|" branch

Expand Down

0 comments on commit 170d68e

Please sign in to comment.