From ee6505fc6f56ad1a297b4fb2990000b49378da91 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 13 Sep 2023 13:22:48 +0100 Subject: [PATCH 1/3] pin version to match rtd ones --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6b104fb015..710a21d5a7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -Sphinx -sphinx-rtd-theme +sphinx==7.2.0 +sphinx-rtd-theme==1.3.0 From 1f8b6f6360ec6d3d0fcd5ed7156db5b3d225a561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Tue, 12 Sep 2023 18:41:59 +0100 Subject: [PATCH 2/3] Switch to path operations to silence Sphinx 8 deprecation warnings --- omero/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omero/conf.py b/omero/conf.py index 6b19c65d1a..d941b4e4f9 100755 --- a/omero/conf.py +++ b/omero/conf.py @@ -392,8 +392,8 @@ def copy_legacy_redirects(app, exception): ] if app.builder.name == 'html': for html_src_path in redirect_files: - target_path = app.outdir + '/' + html_src_path - src_path = app.srcdir + '/' + html_src_path + target_path = (app.outdir / html_src_path) + src_path = (app.srcdir / html_src_path) if os.path.isfile(src_path): target_dir = os.path.dirname(target_path) if not os.path.exists(target_dir): From 2fda9c8cd1c90c3ef2e37d1bdd446b8f1d1925d2 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 13 Sep 2023 13:36:16 +0100 Subject: [PATCH 3/3] bump sphinx to 7.2.5 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 710a21d5a7..beb55b6aa8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -sphinx==7.2.0 +sphinx==7.2.5 sphinx-rtd-theme==1.3.0