diff --git a/conda/meta.yaml b/conda/meta.yaml index 5712c89a4cf90bebae1872794ef07e84e0971707..a3ac4fbffa9cce0e8bd98109b2c2f268cfd71faa 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -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/ diff --git a/doc/conf.py b/doc/conf.py index 9c13991783ac83bd4b6cb87787d11bd9711efb56..1b3f487446fe6f6de7cd07b11151d918631d4d67 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -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)