From f3ac627ca99a00384bfb5c66a8eb13a7d50d7536 Mon Sep 17 00:00:00 2001 From: Carsten Grohmann Date: Thu, 8 Sep 2022 21:43:13 +0200 Subject: [PATCH 1/2] Add compatibility code for different locations of Sphinx NoUri The location of this exception has changed with Sphinx 3.0 according to the "Deprecated API". --- docs/sphinx/availability.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/sphinx/availability.py b/docs/sphinx/availability.py index 4ee8b578..bfbe352f 100644 --- a/docs/sphinx/availability.py +++ b/docs/sphinx/availability.py @@ -10,7 +10,10 @@ and lists them along with a backlink to the original location. from docutils import nodes from sphinx.locale import _ -from sphinx.environment import NoUri +try: + from sphinx.errors import NoUri # since Sphinx 3.0 +except ImportError: + from sphinx.environment import NoUri # till Sphinx 3.0 from sphinx.util.nodes import set_source_info from docutils.parsers.rst import Directive From f143e4e17c86f396aace5005963a762e37c19ad1 Mon Sep 17 00:00:00 2001 From: Carsten Grohmann Date: Thu, 8 Sep 2022 22:09:31 +0200 Subject: [PATCH 2/2] Use add_js_file() instead of add_javascript() add_javascript() is deprecated and has been removed in Sphinx 4. The new add_js_file() function has been available since at least Sphinx 1.8.5. --- docs/sphinx/availability.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/sphinx/availability.py b/docs/sphinx/availability.py index bfbe352f..3dabee03 100644 --- a/docs/sphinx/availability.py +++ b/docs/sphinx/availability.py @@ -184,11 +184,11 @@ def depart_availability_node(self, node): # ----------------------------------------------------------------------- # def setup(app): - app.add_javascript('javascript/header.js') - app.add_javascript('javascript/sidebar.js') - app.add_javascript('javascript/jquery.collapse.js') - app.add_javascript('javascript/jquery.cookie.js') - app.add_javascript('javascript/toggle_visibility.js') + app.add_js_file('javascript/header.js') + app.add_js_file('javascript/sidebar.js') + app.add_js_file('javascript/jquery.collapse.js') + app.add_js_file('javascript/jquery.cookie.js') + app.add_js_file('javascript/toggle_visibility.js') app.add_config_value('availability_include_availabilities', False, False)