diff --git a/docs/Makefile b/docs/Makefile index e67568e54..ee806cd40 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,7 +1,7 @@ # Global variables # You can set these variables from the command line. POETRY = poetry -SPHINXOPTS = +SPHINXOPTS = -j auto SPHINXBUILD = $(POETRY) run sphinx-build PAPER = BUILDDIR = _build @@ -13,11 +13,6 @@ PAPEROPT_letter = -D latex_paper_size=letter ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SOURCEDIR) TESTSPHINXOPTS = $(ALLSPHINXOPTS) -W --keep-going -# Windows variables -ifeq ($(OS),Windows_NT) - POETRY = $(APPDATA)\Python\Scripts\poetry -endif - .PHONY: all all: dirhtml diff --git a/docs/pyproject.toml b/docs/pyproject.toml index 404887e74..bd13b16f5 100644 --- a/docs/pyproject.toml +++ b/docs/pyproject.toml @@ -5,16 +5,16 @@ version = "0.1" authors = ["ScyllaDB Documentation Contributors"] [tool.poetry.dependencies] -python = "^3.7" -pyyaml = "6.0" +python = "^3.9" +pyyaml = "6.0.1" pygments = "2.15.1" recommonmark = "0.7.1" sphinx-autobuild = "2021.3.14" -Sphinx = "4.3.2" +Sphinx = "7.2.6" redirects_cli ="~0.1.2" -sphinx-scylladb-theme = "~1.5.1" -sphinx-multiversion-scylla = "~0.2.11" -sphinx-sitemap = "2.5.0" +sphinx-scylladb-theme = "~1.6.1" +sphinx-multiversion-scylla = "~0.3.1" +sphinx-sitemap = "2.5.1" [build-system] requires = ["poetry>=0.12"] diff --git a/docs/source/conf.py b/docs/source/conf.py index 9418de5ee..931d64283 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -7,7 +7,7 @@ sys.path.insert(0, os.path.abspath("..")) -# -- General configuration ------------------------------------------------ +# -- Global variables # Build documentation for the following tags and branches TAGS = [] @@ -19,6 +19,8 @@ # Set which versions are deprecated DEPRECATED_VERSIONS = [] +# -- General configuration + # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. @@ -65,7 +67,7 @@ .. |mon_root| replace:: `Scylla Monitoring Stack `__ """.format(current_version=current_version, current_branch=current_branch) -# -- Options for not found extension -------------------------------------- +# -- Options for not found extension # Template used to render the 404.html generated by this extension. notfound_template = '404.html' @@ -73,7 +75,7 @@ # Prefix added to all the URLs generated in the 404 page. notfound_urls_prefix = '' -# -- Options for multiversion -------------------------------------------- +# -- Options for multiversion # Whitelist pattern for tags smv_tag_whitelist = multiversion_regex_builder(TAGS) @@ -90,11 +92,11 @@ # Format for versioned output directories inside the build directory smv_outputdir_format = '{ref.name}' -# -- Options for sitemap extension --------------------------------------- +# -- Options for sitemap extension sitemap_url_scheme = "/stable/{link}" -# -- Options for HTML output --------------------------------------------- +# -- Options for HTML output # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. @@ -105,7 +107,6 @@ # 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 = { 'conf_py_path': 'docs/source/', 'hide_version_dropdown': ['master'],