From 472fe148a872015a866138d8663f5bbe837b356e Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Thu, 3 Jun 2021 13:41:13 -0400 Subject: [PATCH] doc: use add_css_file(); not deprecated add_stylesheet() is deprecated and removed in Sphinx 4.x Signed-off-by: Quentin Young (cherry picked from commit d6ba203d2fb190e38956082429a34c747cf9de9d) --- doc/developer/conf.py | 7 +++++-- doc/user/conf.py | 17 +++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/doc/developer/conf.py b/doc/developer/conf.py index 20265f4aad..8f282c0790 100644 --- a/doc/developer/conf.py +++ b/doc/developer/conf.py @@ -395,8 +395,11 @@ def setup(app): # printfrr extensions app.add_object_type("frrfmt", "frrfmt", parse_node=parse_frrfmt) - # css overrides for HTML theme - app.add_stylesheet("overrides.css") + if "add_css_file" in dir(app): + app.add_css_file("overrides.css") + else: + app.add_stylesheet("overrides.css") + # load Pygments lexer for FRR config syntax # # NB: in Pygments 2.2+ this can be done with `load_lexer_from_file`, but we diff --git a/doc/user/conf.py b/doc/user/conf.py index e0aec40443..6db58b07c3 100644 --- a/doc/user/conf.py +++ b/doc/user/conf.py @@ -386,16 +386,17 @@ def setup(app): # node later on app.add_object_type("clicmd", "clicmd", indextemplate="pair: %s; configuration command") - # css overrides for HTML theme - # Note sphinx version differences - sver = vparse(sphinx.__version__) - - if sver < vparse("1.8.0"): - app.add_stylesheet("overrides.css") - app.add_javascript("overrides.js") + # I dont care how stupid this is + if "add_js_file" in dir(app): + app.add_js_file("overrides.js") else: + app.add_javascript("overrides.js") + + if "add_css_file" in dir(app): app.add_css_file("overrides.css") - app.add_js_file("overrides.js") + else: + app.add_stylesheet("overrides.css") + # load Pygments lexer for FRR config syntax # -- 2.39.5