diff --git a/python-sphinxcontrib-qthelp.changes b/python-sphinxcontrib-qthelp.changes index caca47f..f07fc56 100644 --- a/python-sphinxcontrib-qthelp.changes +++ b/python-sphinxcontrib-qthelp.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Sat Jul 20 16:09:47 UTC 2024 - Matej Cepl + +- 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 + +- Clean up SPEC file. +- Skip failing tests (gh#sphinx-doc/sphinx#12623) + +------------------------------------------------------------------- +Sun Jan 14 10:48:17 UTC 2024 - Dirk Müller + +- 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 + +- Clean up the SPEC file + +------------------------------------------------------------------- +Mon Aug 28 11:42:00 UTC 2023 - Markéta Machová + +- 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 diff --git a/python-sphinxcontrib-qthelp.rpmlintrc b/python-sphinxcontrib-qthelp.rpmlintrc new file mode 100644 index 0000000..20eb71a --- /dev/null +++ b/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") diff --git a/python-sphinxcontrib-qthelp.spec b/python-sphinxcontrib-qthelp.spec index 1ae2fa0..e364123 100644 --- a/python-sphinxcontrib-qthelp.spec +++ b/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 diff --git a/sphinx5.patch b/sphinx5.patch deleted file mode 100644 index 7d3b9e0..0000000 --- a/sphinx5.patch +++ /dev/null @@ -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 '' in qhp - assert 'Python' in qhp - assert '' in qhp -@@ -26,7 +26,7 @@ def test_qthelp_basic(app, status, warni - assert 'index.html' in qhp - assert '_static/basic.css' in qhp - -- qhcp = (app.outdir / 'Python.qhcp').text() -+ qhcp = (app.outdir / 'Python.qhcp').read_text() - assert 'Python documentation' in qhcp - assert 'qthelp://org.sphinx.python/doc/index.html' in qhcp - assert 'qthelp://org.sphinx.python/doc/index.html' 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 'org.sphinx.python' in qhp - -- qhcp = (app.outdir / 'Python.qhcp').text() -+ qhcp = (app.outdir / 'Python.qhcp').read_text() - assert 'qthelp://org.sphinx.python/doc/index.html' in qhcp - assert 'qthelp://org.sphinx.python/doc/index.html' 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 'org.sphinx-doc.sphinx' in qhp - -- qhcp = (app.outdir / 'Python.qhcp').text() -+ qhcp = (app.outdir / 'Python.qhcp').read_text() - assert 'qthelp://org.sphinx-doc.sphinx/doc/index.html' in qhcp - assert 'qthelp://org.sphinx-doc.sphinx/doc/index.html' 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 '
' in qhp - -- qhcp = (app.outdir / 'Python.qhcp').text() -+ qhcp = (app.outdir / 'Python.qhcp').read_text() - assert 'Python documentation' in qhcp - - # give a title -@@ -126,9 +126,9 @@ def test_qthelp_title(app, status, warni - app.config.html_short_title = 'Sphinx "short" title' - app.builder.build_all() - -- qhp = (app.outdir / 'Python.qhp').text() -+ qhp = (app.outdir / 'Python.qhp').read_text() - assert ('
' - in qhp) - -- qhcp = (app.outdir / 'Python.qhcp').text() -+ qhcp = (app.outdir / 'Python.qhcp').read_text() - assert 'Sphinx <b>"short"</b> title' in qhcp diff --git a/sphinxcontrib-qthelp-1.0.3.tar.gz b/sphinxcontrib-qthelp-1.0.3.tar.gz deleted file mode 100644 index 2927b7a..0000000 --- a/sphinxcontrib-qthelp-1.0.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72 -size 21658 diff --git a/sphinxcontrib_qthelp-1.0.8.tar.gz b/sphinxcontrib_qthelp-1.0.8.tar.gz new file mode 100644 index 0000000..1b1c0d2 --- /dev/null +++ b/sphinxcontrib_qthelp-1.0.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db3f8fa10789c7a8e76d173c23364bdf0ebcd9449969a9e6a3dd31b8b7469f03 +size 16778