Skip to content
Snippets Groups Projects
Commit 59a85d75 authored by Samuel GAIST's avatar Samuel GAIST
Browse files

Merge branch 'fix_sphinx_warning' into 'master'

Fix extra links to follow latest format

See merge request !90
parents 13c93508 47dcb77c
No related branches found
No related tags found
1 merge request!90Fix extra links to follow latest format
Pipeline #100674 passed
......@@ -65,11 +65,11 @@ test:
- conda inspect objects -p $PREFIX {{ name }} # [osx]
requires:
- bob.extension
- ddt
- nose
- coverage
- sphinx
- sphinx_rtd_theme
- ddt {{ ddt }}
- nose {{ nose }}
- coverage {{ coverage }}
- sphinx {{ sphinx }}
- sphinx_rtd_theme {{ sphinx_rtd_theme }}
about:
home: https://www.idiap.ch/software/beat/
......
......@@ -12,7 +12,6 @@ import sphinx_rtd_theme
# For inter-documentation mapping:
from bob.extension.utils import link_documentation
from bob.extension.utils import load_requirements
# -- General configuration -----------------------------------------------------
......@@ -241,14 +240,11 @@ if "BOB_DOCUMENTATION_SERVER" not in os.environ:
"BOB_DOCUMENTATION_SERVER"
] = "https://www.idiap.ch/software/beat/docs/beat/%(name)s/%(version)s/|https://www.idiap.ch/software/beat/docs/beat/%(name)s/master/"
sphinx_requirements = "extra-intersphinx.txt"
if os.path.exists(sphinx_requirements):
intersphinx_mapping = link_documentation(
additional_packages=["python", "numpy"] + load_requirements(sphinx_requirements)
)
else:
intersphinx_mapping = link_documentation()
intersphinx_mapping = link_documentation()
# Adds simplejson, pyzmq links
intersphinx_mapping["http://simplejson.readthedocs.io/en/stable/"] = None
intersphinx_mapping["http://pyzmq.readthedocs.io/en/stable/"] = None
intersphinx_mapping["simplejson"] = (
"http://simplejson.readthedocs.io/en/stable/",
None,
)
intersphinx_mapping["pyzmq"] = ("http://pyzmq.readthedocs.io/en/stable/", None)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment