From 7f96f7e3e59e693a095030f9f5071391562d0fa8 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sat, 12 Mar 2022 10:54:30 +0100 Subject: [PATCH] [interim fix] of sphinx-tabs and sphinx-jinja The myst-parser requires >= docutils v.0.17 what ends in a dependency hell where plugins sphinx-tabs and sphinx-jinja we use are involved. This patch can be reverted when [1], [2] and [3] are solved and new releases are available. [1] https://github.com/searxng/searxng/pull/954 [2] https://github.com/executablebooks/sphinx-tabs/issues/152 [3] https://github.com/executablebooks/sphinx-tabs/pull/153 Signed-off-by: Markus Heiser --- docs/_themes/searxng/static/searxng.css | 2 +- docs/conf.py | 2 +- requirements-dev.txt | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/_themes/searxng/static/searxng.css b/docs/_themes/searxng/static/searxng.css index 64f6d4700eb..1ab8489ecaf 100644 --- a/docs/_themes/searxng/static/searxng.css +++ b/docs/_themes/searxng/static/searxng.css @@ -14,7 +14,7 @@ p.version-warning { background-color: #004b6b; } -div.sidebar { +aside.sidebar { background-color: whitesmoke; border-color: lightsteelblue; border-radius: 3pt; diff --git a/docs/conf.py b/docs/conf.py index 89d6bb8f682..1dd5693cab9 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -116,7 +116,7 @@ def source_read(app, docname, source): "sphinx.ext.intersphinx", "pallets_sphinx_themes", "sphinx_issues", # https://github.com/sloria/sphinx-issues/blob/master/README.rst - "sphinxcontrib.jinja", # https://github.com/tardyp/sphinx-jinja + "sphinx_jinja", # https://github.com/tardyp/sphinx-jinja "sphinxcontrib.programoutput", # https://github.com/NextThought/sphinxcontrib-programoutput 'linuxdoc.kernel_include', # Implementation of the 'kernel-include' reST-directive. 'linuxdoc.rstFlatTable', # Implementation of the 'flat-table' reST-directive. diff --git a/requirements-dev.txt b/requirements-dev.txt index 6b4efa2f8c9..3b25cd7029e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -8,10 +8,11 @@ splinter==0.17.0 selenium==4.1.2 twine==3.8.0 Pallets-Sphinx-Themes==2.0.2 +docutils>=0.17 Sphinx==4.4.0 sphinx-issues==3.0.1 -sphinx-jinja==1.4.0 -sphinx-tabs==3.2.0 +sphinx-jinja @ git+http://github.com/return42/sphinx-jinja.git +sphinx-tabs @ git+https://github.com/executablebooks/sphinx-tabs sphinxcontrib-programoutput==0.17 sphinx-autobuild==2021.3.14 myst-parser==0.17.0