diff --git a/docs/conf.py b/docs/conf.py index 5d538a74..6efd7625 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -38,26 +38,26 @@ jinja_contexts = { extlinks = {} # upstream links -extlinks['wiki'] = ('https://github.com/searx/searx/wiki/%s', ' ') -extlinks['pull'] = ('https://github.com/searx/searx/pull/%s', 'PR ') +extlinks['wiki'] = ('https://github.com/searx/searx/wiki/%s', '%s') +extlinks['pull'] = ('https://github.com/searx/searx/pull/%s', 'PR %s') # links to custom brand -extlinks['origin'] = (brand.GIT_URL + '/blob/' + brand.GIT_BRANCH + '/%s', 'git://') -extlinks['patch'] = (brand.GIT_URL + '/commit/%s', '#') -extlinks['search'] = (brand.SEARX_URL + '/%s', '#') -extlinks['docs'] = (brand.DOCS_URL + '/%s', 'docs: ') -extlinks['pypi'] = ('https://pypi.org/project/%s', 'PyPi: ') -extlinks['man'] = ('https://manpages.debian.org/jump?q=%s', '') +extlinks['origin'] = (brand.GIT_URL + '/blob/' + brand.GIT_BRANCH + '/%s', 'Origin: %s') +extlinks['patch'] = (brand.GIT_URL + '/commit/%s', 'path %s') +extlinks['search'] = (brand.SEARX_URL + '/%s', 'URL: %s') +extlinks['docs'] = (brand.DOCS_URL + '/%s', 'docs: %s') +extlinks['pypi'] = ('https://pypi.org/project/%s', 'PyPi: %s') +extlinks['man'] = ('https://manpages.debian.org/jump?q=%s', 'man: %s') #extlinks['role'] = ( # 'https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-%s', '') extlinks['duref'] = ( - 'https://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#%s', '') + 'https://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#%s', '%s') extlinks['durole'] = ( - 'https://docutils.sourceforge.net/docs/ref/rst/roles.html#%s', '') + 'https://docutils.sourceforge.net/docs/ref/rst/roles.html#%s', '%s') extlinks['dudir'] = ( - 'https://docutils.sourceforge.net/docs/ref/rst/directives.html#%s', '') + 'https://docutils.sourceforge.net/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', @@ -67,7 +67,7 @@ extensions = [ "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 86a331a6..9dd71d66 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -9,11 +9,11 @@ transifex-client==0.12.5; python_version == '3.10' selenium==4.3.0 twine==4.0.1 Pallets-Sphinx-Themes==2.0.2 -docutils==0.16 -Sphinx==4.4.0 +docutils==0.18 +Sphinx==5.1.1 sphinx-issues==3.0.1 -sphinx-jinja==1.4.0 -sphinx-tabs==3.2.0 +sphinx-jinja==2.0.2 +sphinx-tabs==3.4.1 sphinxcontrib-programoutput==0.17 sphinx-autobuild==2021.3.14 linuxdoc==20211220 diff --git a/requirements.txt b/requirements.txt index c70c10db..96e9becf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ flask==2.2.1 jinja2==3.1.2 langdetect==1.0.9 lxml==4.9.1 -pygments==2.8.0 +pygments==2.12.0 python-dateutil==2.8.2 pyyaml==6.0 requests[socks]==2.28.1