Sync from SUSE:SLFO:Main python-sphinxcontrib-qthelp revision f85677de43be18784df4faa778f57a40

python-sphinxcontrib-qthelp.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Sat Jul 20 16:09:47 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
+
+- Update to 1.0.8:
+  - Fix tests for Sphinx 7.4 and later
+- Enable tests again
+
+-------------------------------------------------------------------
+Fri Jul 19 23:59:01 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
+
+- Clean up SPEC file.
+- Skip failing tests (gh#sphinx-doc/sphinx#12623)
+
+-------------------------------------------------------------------
+Sun Jan 14 10:48:17 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- update to 1.0.7:
+  * Remove Sphinx as a required dependency, as circular
+    dependencies may cause failure with package managers that
+    expect a directed acyclic graph (DAG) of dependencies.
+
+-------------------------------------------------------------------
+Tue Aug 29 19:07:11 UTC 2023 - Matej Cepl <mcepl@suse.com>
+
+- Clean up the SPEC file
+
+-------------------------------------------------------------------
+Mon Aug 28 11:42:00 UTC 2023 - Markéta Machová <mmachova@suse.com>
+
+- Update to 1.0.6
+  * Drop support for Python 3.5, 3.6, 3.7, and 3.8
+  * Raise minimum required Sphinx version to 5.0
+  * Fix tests for Sphinx 7.1 and below
+- Drop upstreamed sphinx5.patch
+
 -------------------------------------------------------------------
 Fri Apr 21 12:36:59 UTC 2023 - Dirk Müller <dmueller@suse.com>
 

python-sphinxcontrib-qthelp.rpmlintrc

@@ -0,0 +1,2 @@
+addFilter("hidden-file-or-dir /usr/lib/python.*/sphinxcontrib/qthelp/locales/.tx")
+addFilter("file-not-in-%lang /usr/lib/python.*/site-packages/sphinxcontrib/qthelp/locales/.*\.mo")

python-sphinxcontrib-qthelp.spec

@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package python-sphinxcontrib-qthelp
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,25 +25,24 @@
 %define psuffix %{nil}
 %bcond_with test
 %endif
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %{?sle15_python_module_pythons}
 Name:           python-sphinxcontrib-qthelp%{psuffix}
-Version:        1.0.3
+Version:        1.0.8
 Release:        0
 Summary:        Sphinx extension which outputs QtHelp
 License:        BSD-2-Clause
 Group:          Development/Languages/Python
 URL:            https://github.com/sphinx-doc/sphinxcontrib-qthelp
-Source:         https://files.pythonhosted.org/packages/source/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM https://github.com/sphinx-doc/sphinxcontrib-qthelp/pull/14 Fix tests with Sphinx 5.0
-Patch0:         sphinx5.patch
-BuildRequires:  %{python_module setuptools}
+Source0:        https://files.pythonhosted.org/packages/source/s/sphinxcontrib_qthelp/sphinxcontrib_qthelp-%{version}.tar.gz
+Source99:       python-sphinxcontrib-qthelp.rpmlintrc
+BuildRequires:  %{python_module flit-core}
+BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-Requires:       python-Sphinx
 BuildArch:      noarch
 %if %{with test}
-BuildRequires:  %{python_module Sphinx}
+BuildRequires:  %{python_module Sphinx >= 5.0}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module sphinxcontrib-qthelp >= %{version}}
 %endif
@@ -53,15 +52,15 @@ BuildRequires:  %{python_module sphinxcontrib-qthelp >= %{version}}
 sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document.
 
 %prep
-%setup -q -n sphinxcontrib-qthelp-%{version}
+%setup -q -n sphinxcontrib_qthelp-%{version}
 %autopatch -p1
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
 %if !%{with test}
-%python_install
+%pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 %endif
 
@@ -74,7 +73,9 @@ sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document.
 %files %{python_files}
 %doc README.rst CHANGES
 %license LICENSE
-%{python_sitelib}/*
+%dir %{python_sitelib}/sphinxcontrib
+%{python_sitelib}/sphinxcontrib/qthelp
+%{python_sitelib}/sphinxcontrib_qthelp-%{version}*-info
 %endif
 
 %changelog

sphinx5.patch

@@ -1,73 +0,0 @@
-Index: sphinxcontrib-qthelp-1.0.3/tests/test_qthelp.py
-===================================================================
---- sphinxcontrib-qthelp-1.0.3.orig/tests/test_qthelp.py
-+++ sphinxcontrib-qthelp-1.0.3/tests/test_qthelp.py
-@@ -17,7 +17,7 @@ from sphinx.testing.util import etree_pa
- def test_qthelp_basic(app, status, warning):
-     app.builder.build_all()
- 
--    qhp = (app.outdir / 'Python.qhp').text()
-+    qhp = (app.outdir / 'Python.qhp').read_text()
-     assert '<customFilter name="Python ">' in qhp
-     assert '<filterAttribute>Python</filterAttribute>' in qhp
-     assert '<filterAttribute></filterAttribute>' in qhp
-@@ -26,7 +26,7 @@ def test_qthelp_basic(app, status, warni
-     assert '<file>index.html</file>' in qhp
-     assert '<file>_static/basic.css</file>' in qhp
- 
--    qhcp = (app.outdir / 'Python.qhcp').text()
-+    qhcp = (app.outdir / 'Python.qhcp').read_text()
-     assert '<title>Python  documentation</title>' in qhcp
-     assert '<homePage>qthelp://org.sphinx.python/doc/index.html</homePage>' in qhcp
-     assert '<startPage>qthelp://org.sphinx.python/doc/index.html</startPage>' in qhcp
-@@ -91,10 +91,10 @@ def test_qthelp_namespace(app, status, w
-     # default namespace
-     app.builder.build_all()
- 
--    qhp = (app.outdir / 'Python.qhp').text()
-+    qhp = (app.outdir / 'Python.qhp').read_text()
-     assert '<namespace>org.sphinx.python</namespace>' in qhp
- 
--    qhcp = (app.outdir / 'Python.qhcp').text()
-+    qhcp = (app.outdir / 'Python.qhcp').read_text()
-     assert '<homePage>qthelp://org.sphinx.python/doc/index.html</homePage>' in qhcp
-     assert '<startPage>qthelp://org.sphinx.python/doc/index.html</startPage>' in qhcp
- 
-@@ -102,10 +102,10 @@ def test_qthelp_namespace(app, status, w
-     app.config.qthelp_namespace = 'org.sphinx-doc.sphinx'
-     app.builder.build_all()
- 
--    qhp = (app.outdir / 'Python.qhp').text()
-+    qhp = (app.outdir / 'Python.qhp').read_text()
-     assert '<namespace>org.sphinx-doc.sphinx</namespace>' in qhp
- 
--    qhcp = (app.outdir / 'Python.qhcp').text()
-+    qhcp = (app.outdir / 'Python.qhcp').read_text()
-     assert '<homePage>qthelp://org.sphinx-doc.sphinx/doc/index.html</homePage>' in qhcp
-     assert '<startPage>qthelp://org.sphinx-doc.sphinx/doc/index.html</startPage>' in qhcp
- 
-@@ -115,10 +115,10 @@ def test_qthelp_title(app, status, warni
-     # default title
-     app.builder.build_all()
- 
--    qhp = (app.outdir / 'Python.qhp').text()
-+    qhp = (app.outdir / 'Python.qhp').read_text()
-     assert '<section title="Python  documentation" ref="index.html">' in qhp
- 
--    qhcp = (app.outdir / 'Python.qhcp').text()
-+    qhcp = (app.outdir / 'Python.qhcp').read_text()
-     assert '<title>Python  documentation</title>' in qhcp
- 
-     # give a title
-@@ -126,9 +126,9 @@ def test_qthelp_title(app, status, warni
-     app.config.html_short_title = 'Sphinx <b>"short"</b> title'
-     app.builder.build_all()
- 
--    qhp = (app.outdir / 'Python.qhp').text()
-+    qhp = (app.outdir / 'Python.qhp').read_text()
-     assert ('<section title="Sphinx &lt;b&gt;&#34;full&#34;&lt;/b&gt; title" ref="index.html">'
-             in qhp)
- 
--    qhcp = (app.outdir / 'Python.qhcp').text()
-+    qhcp = (app.outdir / 'Python.qhcp').read_text()
-     assert '<title>Sphinx &lt;b&gt;&#34;short&#34;&lt;/b&gt; title</title>' in qhcp