From: Cedric Ollivier Date: Mon, 27 Mar 2023 15:58:38 +0000 (+0000) Subject: Merge "Remove lfdocs_conf" X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=087aeb2a54d3d573bc095fdf3a0afcf36a2fd86e;hp=0a758cc0a5a8c91346f1c237cc50d25e091df7bd;p=releng.git Merge "Remove lfdocs_conf" --- diff --git a/docs/conf.py b/docs/conf.py index 86ab8c577..6cfaf6985 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1 +1,10 @@ -from docs_conf.conf import * # flake8: noqa +project = 'Releng' +extensions = [ + 'sphinx.ext.autosectionlabel' +] +html_theme = "piccolo_theme" +autosectionlabel_prefix_document = True +autosectionlabel_maxdepth = 4 +numfig = True +numfig_format = {'figure': 'Figure %s', 'table': 'Table %s', + 'code-block': 'Listing %s', 'section': 'Section %s'} diff --git a/docs/conf.yaml b/docs/conf.yaml deleted file mode 100644 index 749a4b1cf..000000000 --- a/docs/conf.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -project_cfg: opnfv -project: releng diff --git a/test-requirements.txt b/test-requirements.txt index 1c487293e..ea58b2475 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +1,3 @@ -lfdocs-conf sphinxcontrib-httpdomain -sphinx-opnfv-theme jenkins-job-builder +piccolo-theme diff --git a/tox.ini b/tox.ini index 713d5622d..23f7c1a84 100644 --- a/tox.ini +++ b/tox.ini @@ -8,10 +8,11 @@ envlist = jjb,docs skipsdist = True [testenv] -basepython = python3 +basepython = python3.10 usedevelop = False deps = -chttps://opendev.org/openstack/requirements/raw/branch/stable/zed/upper-constraints.txt + -cupper-constraints.txt -r{toxinidir}/test-requirements.txt [testenv:jjb] diff --git a/upper-constraints.txt b/upper-constraints.txt new file mode 100644 index 000000000..4f2659c82 --- /dev/null +++ b/upper-constraints.txt @@ -0,0 +1,6 @@ +sphinxcontrib-needs===0.7.9 +sphinxcontrib.plantuml===0.24 +sphinx_toolbox==3.2.0 +sphinxcontrib.nwdiag===2.0.0 +sphinxcontrib-swaggerdoc===0.1.7 +sphinx-rtd-theme===1.0.0