Fix compatibility with Sphinx 9+

[skip changelog]

.gitignore

@@ -7,3 +7,4 @@
 /sphinxcontrib-websupport-1.1.2.tar.gz
 /sphinxcontrib-websupport-1.2.1.tar.gz
 /sphinxcontrib-websupport-1.2.4.tar.gz
+/sphinxcontrib_websupport-1.2.7.tar.gz

91.patch

@@ -0,0 +1,88 @@
+From 93a6da5b7f6a782eef16e9dc9ade1558f7e7c982 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Sat, 31 Jan 2026 15:27:46 +0300
+Subject: [PATCH] Support Sphinx 9
+
+---
+ sphinxcontrib/websupport/builder.py        | 13 +++++--------
+ tests/roots/test-root/root/markup.txt      |  2 +-
+ tests/roots/test-searchadapters/markup.txt |  4 ++--
+ 3 files changed, 8 insertions(+), 11 deletions(-)
+
+diff --git a/sphinxcontrib/websupport/builder.py b/sphinxcontrib/websupport/builder.py
+index a00d0ff..f5d6f0f 100644
+--- a/sphinxcontrib/websupport/builder.py
++++ b/sphinxcontrib/websupport/builder.py
+@@ -9,8 +9,6 @@ import posixpath
+ import shutil
+ from typing import TYPE_CHECKING, Any
+ 
+-from docutils.io import StringOutput
+-
+ from sphinx.jinja2glue import BuiltinTemplateLoader
+ from sphinx.util.osutil import os_path, relative_uri, ensuredir, copyfile
+ from sphinxcontrib.serializinghtml import PickleHTMLBuilder
+@@ -79,7 +77,6 @@ class WebSupportBuilder(PickleHTMLBuilder):
+         self.globalcontext['no_search_suffix'] = True
+ 
+     def write_doc(self, docname: str, doctree: nodes.document) -> None:
+-        destination = StringOutput(encoding='utf-8')
+         doctree.settings = self.docsettings
+ 
+         self.secnumbers = self.env.toc_secnumbers.get(docname, {})
+@@ -87,12 +84,12 @@ class WebSupportBuilder(PickleHTMLBuilder):
+         self.imgpath = '/' + posixpath.join(self.virtual_staticdir, self.imagedir)
+         self.dlpath = '/' + posixpath.join(self.virtual_staticdir, '_downloads')
+         self.current_docname = docname
+-        self.docwriter.write(doctree, destination)
+-        self.docwriter.assemble_parts()
+-        body = self.docwriter.parts['fragment']
+-        metatags = self.docwriter.clean_meta
++        visitor = self.create_translator(doctree, self)
++        doctree.walkabout(visitor)
++        body = ''.join(visitor.fragment)
++        clean_meta = ''.join(visitor.meta[2:])
+ 
+-        ctx = self.get_doc_context(docname, body, metatags)
++        ctx = self.get_doc_context(docname, body, clean_meta)
+         self.handle_page(docname, ctx, event_arg=doctree)
+ 
+     def write_doc_serialized(self, docname: str, doctree: nodes.Node) -> None:
+diff --git a/tests/roots/test-root/root/markup.txt b/tests/roots/test-root/root/markup.txt
+index 714dabe..668e6bd 100644
+--- a/tests/roots/test-root/root/markup.txt
++++ b/tests/roots/test-root/root/markup.txt
+@@ -369,7 +369,7 @@ Index markup
+    pair: entry; pair
+    double: entry; double
+    triple: index; entry; triple
+-   keyword: with
++   pair: keyword; with
+    see: from; to
+    seealso: fromalso; toalso
+ 
+diff --git a/tests/roots/test-searchadapters/markup.txt b/tests/roots/test-searchadapters/markup.txt
+index 77f245a..e0fb6c2 100644
+--- a/tests/roots/test-searchadapters/markup.txt
++++ b/tests/roots/test-searchadapters/markup.txt
+@@ -377,7 +377,7 @@ Index markup
+    pair: entry; pair
+    double: entry; double
+    triple: index; entry; triple
+-   keyword: with
++   pair: keyword; with
+    see: from; to
+    seealso: fromalso; toalso
+ 
+@@ -386,7 +386,7 @@ Invalid index markup...
+ .. index::
+    single:
+    pair:
+-   keyword:
++   pair: keyword;
+ 
+ .. index::
+    !Main, !Other
+-- 
+2.52.0
+

changelog

@@ -0,0 +1,122 @@
+* Tue Jan 30 2024 Karolina Surma <ksurma@redhat.com> - 1.2.7-1
+- Update to 1.2.7
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jul 03 2023 Python Maint <python-maint@redhat.com> - 1.2.4-13
+- Rebuilt for Python 3.12
+
+* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 1.2.4-12
+- Bootstrap for Python 3.12
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jun 14 2022 Python Maint <python-maint@redhat.com> - 1.2.4-9
+- Rebuilt for Python 3.11
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.2.4-8
+- Bootstrap for Python 3.11
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.2.4-5
+- Rebuilt for Python 3.10
+
+* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1.2.4-4
+- Bootstrap for Python 3.10
+
+* Wed Mar 10 2021 Miro Hrončok <mhroncok@redhat.com> - 1.2.4-3
+- Update runtime and buildtime dependencies
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Aug 18 2020 Miro Hrončok <mhroncok@redhat.com> - 1.2.4-1
+- Update to 1.2.4
+- Fixes rhbz#1800626
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.2.1-2
+- Rebuilt for Python 3.9
+
+* Tue Apr 14 2020 Javier Peña <jpena@redhat.com> - 1.2.1-1
+- Update to upstream 1.2.1 (bz#1823520)
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.2-4
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.2-3
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon May 20 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.2-1
+- Update to 1.1.2 (#1711650)
+
+* Wed Mar 27 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.1~dev20190321-1
+- Update to 1.1.1.dev20190321 (#1691429)
+- Support Sphinx 2.0 (#1690793)
+
+* Wed Mar 06 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.0-1
+- Update to 1.1.0
+- Subpackage python2-sphinxcontrib-websupport has been removed
+  See https://fedoraproject.org/wiki/Changes/Sphinx2
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-12.20180316git
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jul 16 2018 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-11.20180316git
+- Remove unused dependency on xapian
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-10.20180316git
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-9.20180316git
+- Rebuilt for Python 3.7
+
+* Wed May 16 2018 Javier Peña <jpena@redhat.com> - 1.0.1-8.20180316git
+- Update to commit ebe84efc1a869da8d5689c706cdcf6ea864f0d9b
+- Fix build with Sphinx 1.7 (bz#1578132)
+
+* Wed Feb 28 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.0.1-7.20171013git
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-6.20171013git
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Dec 18 2017 Javier Peña <jpena@redhat.com> - 1.0.1-5.20171013git
+- Fixed Source0 URL (bz#1526646)
+
+* Fri Oct 13 2017 Javier Peña <jpena@redhat.com> - 1.0.1-4.20171013git
+- Updated to latest git commit to fix build in Rawhide
+
+* Wed Oct 11 2017 Troy Dawson <tdawson@redhat.com> - 1.0.1-3
+- Cleanup spec file conditionals
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Jun 30 2017 Javier Peña <jpena@redhat.com> - 1.0.1-1
+- Initial package.

python-sphinxcontrib-websupport.spec

@@ -1,164 +1,55 @@
 %bcond_without optional_tests
-%global pypi_name sphinxcontrib-websupport
 
-Name:           python-%{pypi_name}
-Version:        1.2.4
-Release:        7%{?dist}
+Name:           python-sphinxcontrib-websupport
+Version:        1.2.7
+Release:        %autorelease
 Summary:        Sphinx API for Web Apps
 
-License:        BSD
-URL:            http://sphinx-doc.org/
-Source0:        %{pypi_source}
+License:        BSD-2-Clause
+URL:            https://github.com/sphinx-doc/sphinxcontrib-websupport
+Source:         %{pypi_source sphinxcontrib_websupport}
+# Compatibility with Sphinx 9+
+Patch:          https://github.com/sphinx-doc/sphinxcontrib-websupport/pull/91.patch
 BuildArch:      noarch
 
 %description
 sphinxcontrib-websupport provides a Python API to easily integrate Sphinx
 documentation into your Web application.
 
-%package -n     python3-%{pypi_name}
+%package -n     python3-sphinxcontrib-websupport
 Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{pypi_name}}
 BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-jinja2
-BuildRequires:  python3-pytest
-BuildRequires:  python3-six
-BuildRequires:  python3-sphinx
-BuildRequires:  python3-sphinxcontrib-serializinghtml >= 1.1.3
 
 %if %{with optional_tests}
-# Optional tests deps, can be individually skipped,
-# but sqlalchemy is required for both whoosh and xapian tests
-BuildRequires:  python3-sqlalchemy
-BuildRequires:  python3-whoosh
+# Optional tests dep, undeclared upstream, can be skipped if needed
 BuildRequires:  python3-xapian
 %endif
 
-# Undeclared but used runtime dependencies
-# https://github.com/sphinx-doc/sphinxcontrib-websupport/pull/46
-Requires:       python3-jinja2
-Requires:       python3-sphinx
-
-Recommends:     python3-sqlalchemy
-Recommends:     python3-whoosh
-
-%description -n python3-%{pypi_name}
+%description -n python3-sphinxcontrib-websupport
 sphinxcontrib-websupport provides a Python API to easily integrate Sphinx
 documentation into your Web application.
 
+%pyproject_extras_subpkg -n python3-sphinxcontrib-websupport whoosh
+
 %prep
-%autosetup -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
+%autosetup -n sphinxcontrib_websupport-%{version} -p1
+
+%generate_buildrequires
+%pyproject_buildrequires -t
 
 %build
-%py3_build
+%pyproject_wheel
 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files sphinxcontrib
 
 %check
-%pytest -v -rs
+%tox
 
-%files -n python3-%{pypi_name}
+%files -n python3-sphinxcontrib-websupport -f %{pyproject_files}
 %license LICENSE
 %doc README.rst
-%dir %{python3_sitelib}/sphinxcontrib
-%{python3_sitelib}/sphinxcontrib/websupport/
-%{python3_sitelib}/sphinxcontrib_websupport-*.pth
-%{python3_sitelib}/sphinxcontrib_websupport-*.egg-info/
 
 %changelog
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.2.4-5
-- Rebuilt for Python 3.10
-
-* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1.2.4-4
-- Bootstrap for Python 3.10
-
-* Wed Mar 10 2021 Miro Hrončok <mhroncok@redhat.com> - 1.2.4-3
-- Update runtime and buildtime dependencies
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Aug 18 2020 Miro Hrončok <mhroncok@redhat.com> - 1.2.4-1
-- Update to 1.2.4
-- Fixes rhbz#1800626
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.2.1-2
-- Rebuilt for Python 3.9
-
-* Tue Apr 14 2020 Javier Peña <jpena@redhat.com> - 1.2.1-1
-- Update to upstream 1.2.1 (bz#1823520)
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.2-4
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.2-3
-- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon May 20 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.2-1
-- Update to 1.1.2 (#1711650)
-
-* Wed Mar 27 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.1~dev20190321-1
-- Update to 1.1.1.dev20190321 (#1691429)
-- Support Sphinx 2.0 (#1690793)
-
-* Wed Mar 06 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.0-1
-- Update to 1.1.0
-- Subpackage python2-sphinxcontrib-websupport has been removed
-  See https://fedoraproject.org/wiki/Changes/Sphinx2
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-12.20180316git
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jul 16 2018 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-11.20180316git
-- Remove unused dependency on xapian
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-10.20180316git
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-9.20180316git
-- Rebuilt for Python 3.7
-
-* Wed May 16 2018 Javier Peña <jpena@redhat.com> - 1.0.1-8.20180316git
-- Update to commit ebe84efc1a869da8d5689c706cdcf6ea864f0d9b
-- Fix build with Sphinx 1.7 (bz#1578132)
-
-* Wed Feb 28 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.0.1-7.20171013git
-- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-6.20171013git
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Dec 18 2017 Javier Peña <jpena@redhat.com> - 1.0.1-5.20171013git
-- Fixed Source0 URL (bz#1526646)
-
-* Fri Oct 13 2017 Javier Peña <jpena@redhat.com> - 1.0.1-4.20171013git
-- Updated to latest git commit to fix build in Rawhide
-
-* Wed Oct 11 2017 Troy Dawson <tdawson@redhat.com> - 1.0.1-3
-- Cleanup spec file conditionals
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Jun 30 2017 Javier Peña <jpena@redhat.com> - 1.0.1-1
-- Initial package.
-
+%autochangelog

sources

@@ -1 +1 @@
-SHA512 (sphinxcontrib-websupport-1.2.4.tar.gz) = d1ccfb6a9ecfa6adbdf2298f4ded345cacefbc5a450b8dafc6faadbcd0dd79a8dbefcab4d1cedf34c65fc271aab754392bea8ab8ae82852323784a9e1717914c
+SHA512 (sphinxcontrib_websupport-1.2.7.tar.gz) = daa5ecf6fd3fb6df6a9a3b60668d42d50d93454dc3c2703a1dd43d75220b326e90c5e0ae2cca27afe62e41ae03e7144e6b4cfe70096b857af74c8981fadba9ca