From 8855e8767c1328a88afcec7c626f6009c0e0d01f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Jul 2022 12:10:01 +0000 Subject: [PATCH 1/4] Bump sphinx-tabs from 3.3.1 to 3.4.1 Bumps [sphinx-tabs](https://github.com/executablebooks/sphinx-tabs) from 3.3.1 to 3.4.1. - [Release notes](https://github.com/executablebooks/sphinx-tabs/releases) - [Changelog](https://github.com/executablebooks/sphinx-tabs/blob/master/CHANGELOG.md) - [Commits](https://github.com/executablebooks/sphinx-tabs/compare/v3.3.1...v3.4.1) --- updated-dependencies: - dependency-name: sphinx-tabs dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 602c6d3c1..d8abce9da 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -11,7 +11,7 @@ Pallets-Sphinx-Themes==2.0.2 Sphinx==4.5.0 sphinx-issues==3.0.1 sphinx-jinja==2.0.2 -sphinx-tabs==3.3.1 +sphinx-tabs==3.4.1 sphinxcontrib-programoutput==0.17 sphinx-autobuild==2021.3.14 sphinx-notfound-page==0.8 From 89a7ffbd34dc9b494904e2f17d1a34c743216fd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Jul 2022 12:10:01 +0000 Subject: [PATCH 2/4] Bump sphinx from 4.5.0 to 5.0.2 Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 4.5.0 to 5.0.2. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/5.x/CHANGES) - [Commits](https://github.com/sphinx-doc/sphinx/compare/v4.5.0...v5.0.2) --- updated-dependencies: - dependency-name: sphinx dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index d8abce9da..ec30fdc01 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -8,7 +8,7 @@ splinter==0.18.1 selenium==4.3.0 twine==4.0.1 Pallets-Sphinx-Themes==2.0.2 -Sphinx==4.5.0 +Sphinx==5.0.2 sphinx-issues==3.0.1 sphinx-jinja==2.0.2 sphinx-tabs==3.4.1 From eb5bea16ff31436a16d31f53f980611f052bd1e8 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Tue, 5 Jul 2022 17:05:06 +0200 Subject: [PATCH 3/4] [fix] sphinx 5.x: add `nav.contents` everywhere that `div.topic` is used Previously, docutils produced `div.topic` for the contents directive, the latest version produces `nav.contents`. This means that those tables of contents change appearance when switching to docutils 0.18 [1][2]. [1] https://github.com/sphinx-doc/sphinx/pull/10535/commits/5806f0a [2] https://github.com/sphinx-doc/sphinx/issues/10534 Signed-off-by: Markus Heiser --- docs/_themes/searxng/static/searxng.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_themes/searxng/static/searxng.css b/docs/_themes/searxng/static/searxng.css index 1ab8489ec..a214bc9d1 100644 --- a/docs/_themes/searxng/static/searxng.css +++ b/docs/_themes/searxng/static/searxng.css @@ -40,7 +40,7 @@ p.sidebar-title, .sidebar p { /* admonitions */ -div.admonition, div.topic, div.toctree-wrapper { +div.admonition, div.topic, nav.contents, div.toctree-wrapper { background-color: #fafafa; margin: 8px 0px; padding: 1em; From d3226b3df582cfc8291d045df26886dc7c481be3 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Tue, 5 Jul 2022 17:10:19 +0200 Subject: [PATCH 4/4] [fix] Sphinx 5.x: will warn about missleading extlink definitions This patch fixes the WARNING messages that pops up since Sphinx 5.x: WARNING: extlinks: Sphinx-6.0 will require a caption string to contain exactly one '%s' and all other '%' need to be escaped as '%%'. [1] https://www.sphinx-doc.org/en/master/usage/extensions/extlinks.html Signed-off-by: Markus Heiser --- docs/conf.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index e2bbd1285..44d1c2ad9 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -88,26 +88,26 @@ def setup(app): extlinks = {} # upstream links -extlinks['wiki'] = ('https://github.com/searxng/searxng/wiki/%s', ' ') -extlinks['pull'] = ('https://github.com/searxng/searxng/pull/%s', 'PR ') -extlinks['pull-searx'] = ('https://github.com/searx/searx/pull/%s', 'PR ') +extlinks['wiki'] = ('https://github.com/searxng/searxng/wiki/%s', ' %s') +extlinks['pull'] = ('https://github.com/searxng/searxng/pull/%s', 'PR %s') +extlinks['pull-searx'] = ('https://github.com/searx/searx/pull/%s', 'PR %s') # links to custom brand -extlinks['origin'] = (GIT_URL + '/blob/' + GIT_BRANCH + '/%s', 'git://') -extlinks['patch'] = (GIT_URL + '/commit/%s', '#') -extlinks['docs'] = (DOCS_URL + '/%s', 'docs: ') -extlinks['pypi'] = ('https://pypi.org/project/%s', 'PyPi: ') -extlinks['man'] = ('https://manpages.debian.org/jump?q=%s', '') +extlinks['origin'] = (GIT_URL + '/blob/' + GIT_BRANCH + '/%s', 'git://%s') +extlinks['patch'] = (GIT_URL + '/commit/%s', '#%s') +extlinks['docs'] = (DOCS_URL + '/%s', 'docs: %s') +extlinks['pypi'] = ('https://pypi.org/project/%s', 'PyPi: %s') +extlinks['man'] = ('https://manpages.debian.org/jump?q=%s', '%s') #extlinks['role'] = ( # 'https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-%s', '') extlinks['duref'] = ( - 'https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html#%s', '') + 'https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html#%s', '%s') extlinks['durole'] = ( - 'https://docutils.sourceforge.io/docs/ref/rst/roles.html#%s', '') + 'https://docutils.sourceforge.io/docs/ref/rst/roles.html#%s', '%s') extlinks['dudir'] = ( - 'https://docutils.sourceforge.io/docs/ref/rst/directives.html#%s', '') + 'https://docutils.sourceforge.io/docs/ref/rst/directives.html#%s', '%s') extlinks['ctan'] = ( - 'https://ctan.org/pkg/%s', 'CTAN: ') + 'https://ctan.org/pkg/%s', 'CTAN: %s') extensions = [ 'sphinx.ext.imgmath',