From 348d9d12af6907dcb3e172ce0fbe19efeb42224f3791ad71b07f6c53fd00da50 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 20 Jul 2024 02:01:57 +0000 Subject: [PATCH 1/2] - Clean up SPEC file. - Skip failing tests (gh#sphinx-doc/sphinx#12623) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-qthelp?expand=0&rev=15 --- .gitattributes | 23 ++++++++ .gitignore | 1 + _multibuild | 3 + python-sphinxcontrib-qthelp.changes | 54 +++++++++++++++++ python-sphinxcontrib-qthelp.rpmlintrc | 2 + python-sphinxcontrib-qthelp.spec | 83 +++++++++++++++++++++++++++ sphinxcontrib_qthelp-1.0.7.tar.gz | 3 + 7 files changed, 169 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _multibuild create mode 100644 python-sphinxcontrib-qthelp.changes create mode 100644 python-sphinxcontrib-qthelp.rpmlintrc create mode 100644 python-sphinxcontrib-qthelp.spec create mode 100644 sphinxcontrib_qthelp-1.0.7.tar.gz diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/python-sphinxcontrib-qthelp.changes b/python-sphinxcontrib-qthelp.changes new file mode 100644 index 0000000..0b9c3db --- /dev/null +++ b/python-sphinxcontrib-qthelp.changes @@ -0,0 +1,54 @@ +------------------------------------------------------------------- +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 + +- add sle15_python_module_pythons (jsc#PED-68) + +------------------------------------------------------------------- +Thu Apr 13 22:45:10 UTC 2023 - Matej Cepl + +- Make calling of %{sle15modernpython} optional. + +------------------------------------------------------------------- +Wed Jun 1 08:38:40 UTC 2022 - Markéta Machová + +- Added sphinx5.patch + * Fix build with the new Sphinx, sent upstream + +------------------------------------------------------------------- +Fri Mar 6 11:15:26 UTC 2020 - pgajdos@suse.com + +- version update to 1.0.3 + * Fix package metadata + +------------------------------------------------------------------- +Thu Jun 6 12:32:18 UTC 2019 - Tomáš Chvátal + +- Initial commit, needed by Sphinx 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 new file mode 100644 index 0000000..f9d9393 --- /dev/null +++ b/python-sphinxcontrib-qthelp.spec @@ -0,0 +1,83 @@ +# +# spec file for package python-sphinxcontrib-qthelp +# +# 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define skip_python2 1 +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif +%{?sle15_python_module_pythons} +Name: python-sphinxcontrib-qthelp%{psuffix} +Version: 1.0.7 +Release: 0 +Summary: Sphinx extension which outputs QtHelp +License: BSD-2-Clause +Group: Development/Languages/Python +URL: https://github.com/sphinx-doc/sphinxcontrib-qthelp +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 +BuildArch: noarch +%if %{with test} +BuildRequires: %{python_module Sphinx >= 5.0} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module sphinxcontrib-qthelp >= %{version}} +%endif +%python_subpackages + +%description +sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document. + +%prep +%setup -q -n sphinxcontrib_qthelp-%{version} +%autopatch -p1 + +%build +%pyproject_wheel + +%install +%if !%{with test} +%pyproject_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif + +%if %{with test} +# ignoring tests which fail (gh#sphinx-doc/sphinx#12623) +%check +# +%pytest -k 'not (test_qthelp_basic or test_qthelp_namespace or test_qthelp_title)' +%endif + +%if !%{with test} +%files %{python_files} +%doc README.rst CHANGES +%license LICENSE +%dir %{python_sitelib}/sphinxcontrib +%{python_sitelib}/sphinxcontrib/qthelp +%{python_sitelib}/sphinxcontrib_qthelp-%{version}*-info +%endif + +%changelog diff --git a/sphinxcontrib_qthelp-1.0.7.tar.gz b/sphinxcontrib_qthelp-1.0.7.tar.gz new file mode 100644 index 0000000..56b931d --- /dev/null +++ b/sphinxcontrib_qthelp-1.0.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:053dedc38823a80a7209a80860b16b722e9e0209e32fea98c90e4e6624588ed6 +size 16685 From c3dd6e8918818bc5369c56972814c6f4bb3500c446dc33439193d85cda1070f6 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 20 Jul 2024 16:11:34 +0000 Subject: [PATCH 2/2] - Update to 1.0.8: - Fix tests for Sphinx 7.4 and later - Enable tests again OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-qthelp?expand=0&rev=16 --- python-sphinxcontrib-qthelp.changes | 7 +++++++ python-sphinxcontrib-qthelp.spec | 6 ++---- sphinxcontrib_qthelp-1.0.7.tar.gz | 3 --- sphinxcontrib_qthelp-1.0.8.tar.gz | 3 +++ 4 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 sphinxcontrib_qthelp-1.0.7.tar.gz create mode 100644 sphinxcontrib_qthelp-1.0.8.tar.gz diff --git a/python-sphinxcontrib-qthelp.changes b/python-sphinxcontrib-qthelp.changes index 0b9c3db..f07fc56 100644 --- a/python-sphinxcontrib-qthelp.changes +++ b/python-sphinxcontrib-qthelp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/python-sphinxcontrib-qthelp.spec b/python-sphinxcontrib-qthelp.spec index f9d9393..e364123 100644 --- a/python-sphinxcontrib-qthelp.spec +++ b/python-sphinxcontrib-qthelp.spec @@ -27,7 +27,7 @@ %endif %{?sle15_python_module_pythons} Name: python-sphinxcontrib-qthelp%{psuffix} -Version: 1.0.7 +Version: 1.0.8 Release: 0 Summary: Sphinx extension which outputs QtHelp License: BSD-2-Clause @@ -65,10 +65,8 @@ sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document. %endif %if %{with test} -# ignoring tests which fail (gh#sphinx-doc/sphinx#12623) %check -# -%pytest -k 'not (test_qthelp_basic or test_qthelp_namespace or test_qthelp_title)' +%pytest %endif %if !%{with test} diff --git a/sphinxcontrib_qthelp-1.0.7.tar.gz b/sphinxcontrib_qthelp-1.0.7.tar.gz deleted file mode 100644 index 56b931d..0000000 --- a/sphinxcontrib_qthelp-1.0.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:053dedc38823a80a7209a80860b16b722e9e0209e32fea98c90e4e6624588ed6 -size 16685 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