From 0aada59a4af09aeca83acc04f0ae1553a796cee55583ae7bd76ecfce1562a558 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 19 Jul 2024 23:59:10 +0000 Subject: [PATCH 1/3] - Clean up SPEC file. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-htmlhelp?expand=0&rev=20 --- .gitattributes | 23 +++++++ .gitignore | 1 + _multibuild | 3 + python-sphinxcontrib-htmlhelp.changes | 67 ++++++++++++++++++++ python-sphinxcontrib-htmlhelp.rpmlintrc | 2 + python-sphinxcontrib-htmlhelp.spec | 81 +++++++++++++++++++++++++ sphinxcontrib_htmlhelp-2.0.5.tar.gz | 3 + 7 files changed, 180 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _multibuild create mode 100644 python-sphinxcontrib-htmlhelp.changes create mode 100644 python-sphinxcontrib-htmlhelp.rpmlintrc create mode 100644 python-sphinxcontrib-htmlhelp.spec create mode 100644 sphinxcontrib_htmlhelp-2.0.5.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-htmlhelp.changes b/python-sphinxcontrib-htmlhelp.changes new file mode 100644 index 0000000..856e822 --- /dev/null +++ b/python-sphinxcontrib-htmlhelp.changes @@ -0,0 +1,67 @@ +------------------------------------------------------------------- +Fri Jul 19 23:59:01 UTC 2024 - Matej Cepl + +- Clean up SPEC file. + +------------------------------------------------------------------- +Sun Jan 14 10:47:30 UTC 2024 - Dirk Müller + +- update to 2.0.5: + * 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 18:06:26 UTC 2023 - Matej Cepl + +- Clean up the SPEC file + +------------------------------------------------------------------- +Mon Aug 28 11:32:57 UTC 2023 - Markéta Machová + +- Update to 2.0.4 + * Drop support for Python 3.8 + * Raise minimum required Sphinx version to 5.0 + * Fix tests for Sphinx 7.1 and below + +------------------------------------------------------------------- +Fri Apr 21 12:36:54 UTC 2023 - Dirk Müller + +- add sle15_python_module_pythons (jsc#PED-68) + +------------------------------------------------------------------- +Thu Apr 13 22:45:08 UTC 2023 - Matej Cepl + +- Make calling of %{sle15modernpython} optional. + +------------------------------------------------------------------- +Mon Mar 6 21:09:03 UTC 2023 - Dirk Müller + +- update to 2.0.1: + * Drop support for Python 3.7 and lower + * Fix deprecation warnings from Sphinx 6.1 +- drop sphinx5.patch (upstream) + +------------------------------------------------------------------- +Mon May 30 10:38:17 UTC 2022 - Markéta Machová + +- Add upstream patch sphinx5.patch to fix build with the new Sphinx + +------------------------------------------------------------------- +Sun Jun 6 12:12:35 UTC 2021 - Dirk Müller + +- update to 2.0.0: + * Drop python-3.5 support + * Remove deprecated method: ``HTMLHelpBuilder.open_file()`` + * #6685: htmlhelp builder should generate HTML4 docs instead of HTML5 + +------------------------------------------------------------------- +Fri Feb 28 21:59:51 UTC 2020 - Dirk Mueller + +- update to 1.0.3: + * #6685: htmlhelp builder should generate HTML4 docs instead of HTML5 + +------------------------------------------------------------------- +Thu Jun 6 12:10:43 UTC 2019 - Tomáš Chvátal + +- Initial commit, needed by Sphinx diff --git a/python-sphinxcontrib-htmlhelp.rpmlintrc b/python-sphinxcontrib-htmlhelp.rpmlintrc new file mode 100644 index 0000000..b2b55f2 --- /dev/null +++ b/python-sphinxcontrib-htmlhelp.rpmlintrc @@ -0,0 +1,2 @@ +addFilter("hidden-file-or-dir /usr/lib/python.*/sphinxcontrib/htmlhelp/locales/\.tx") +addFilter("file-not-in-%lang /usr/lib/python.*/site-packages/sphinxcontrib/htmlhelp/locales/.*\.mo") diff --git a/python-sphinxcontrib-htmlhelp.spec b/python-sphinxcontrib-htmlhelp.spec new file mode 100644 index 0000000..25218fd --- /dev/null +++ b/python-sphinxcontrib-htmlhelp.spec @@ -0,0 +1,81 @@ +# +# spec file for package python-sphinxcontrib-htmlhelp +# +# 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-htmlhelp%{psuffix} +Version: 2.0.5 +Release: 0 +Summary: Sphinx extension to generate HTML help files +License: BSD-2-Clause +Group: Development/Languages/Python +URL: https://github.com/sphinx-doc/sphinxcontrib-htmlhelp +Source0: https://files.pythonhosted.org/packages/source/s/sphinxcontrib_htmlhelp/sphinxcontrib_htmlhelp-%{version}.tar.gz +Source99: python-sphinxcontrib-htmlhelp.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 html5lib} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module sphinxcontrib-htmlhelp >= %{version}} +%endif +%python_subpackages + +%description +sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files. + +%prep +%autosetup -p1 -n sphinxcontrib_htmlhelp-%{version} + +%build +%pyproject_wheel + +%install +%if !%{with test} +%pyproject_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif + +%if %{with test} +%check +%pytest +%endif + +%if !%{with test} +%files %{python_files} +%doc README.rst CHANGES +%license LICENSE +%dir %{python_sitelib}/sphinxcontrib +%{python_sitelib}/sphinxcontrib/htmlhelp +%{python_sitelib}/sphinxcontrib_htmlhelp-%{version}*-info +%endif + +%changelog diff --git a/sphinxcontrib_htmlhelp-2.0.5.tar.gz b/sphinxcontrib_htmlhelp-2.0.5.tar.gz new file mode 100644 index 0000000..ad2e1df --- /dev/null +++ b/sphinxcontrib_htmlhelp-2.0.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0dc87637d5de53dd5eec3a6a01753b1ccf99494bd756aafecd74b4fa9e729015 +size 21925 From 7e31077bf51b485338c498ec6a96bc2a9ced9dfbbf3e55889cb01d0f02c795c1 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 20 Jul 2024 00:42:40 +0000 Subject: [PATCH 2/3] - Skip failing tests (gh#sphinx-doc/sphinx#12623) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-htmlhelp?expand=0&rev=21 --- python-sphinxcontrib-htmlhelp.changes | 1 + python-sphinxcontrib-htmlhelp.spec | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/python-sphinxcontrib-htmlhelp.changes b/python-sphinxcontrib-htmlhelp.changes index 856e822..62e0c2c 100644 --- a/python-sphinxcontrib-htmlhelp.changes +++ b/python-sphinxcontrib-htmlhelp.changes @@ -2,6 +2,7 @@ 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:47:30 UTC 2024 - Dirk Müller diff --git a/python-sphinxcontrib-htmlhelp.spec b/python-sphinxcontrib-htmlhelp.spec index 25218fd..318cec5 100644 --- a/python-sphinxcontrib-htmlhelp.spec +++ b/python-sphinxcontrib-htmlhelp.spec @@ -66,7 +66,8 @@ sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files. %if %{with test} %check -%pytest +# ignoring tests which fail (gh#sphinx-doc/sphinx#12623) +%pytest -k 'not (test_htmlhelp_hhc or test_build_htmlhelp)' %endif %if !%{with test} From 85618a9453bb198c8944434c84beaea375ec49b3bd7c05bae93c6316f7807a22 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 20 Jul 2024 16:16:20 +0000 Subject: [PATCH 3/3] - Update to 2.0.6: - Fix tests for Sphinx 7.4 and later. - Enable tests again OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-htmlhelp?expand=0&rev=22 --- python-sphinxcontrib-htmlhelp.changes | 7 +++++++ python-sphinxcontrib-htmlhelp.spec | 5 ++--- sphinxcontrib_htmlhelp-2.0.5.tar.gz | 3 --- sphinxcontrib_htmlhelp-2.0.6.tar.gz | 3 +++ 4 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 sphinxcontrib_htmlhelp-2.0.5.tar.gz create mode 100644 sphinxcontrib_htmlhelp-2.0.6.tar.gz diff --git a/python-sphinxcontrib-htmlhelp.changes b/python-sphinxcontrib-htmlhelp.changes index 62e0c2c..eb10956 100644 --- a/python-sphinxcontrib-htmlhelp.changes +++ b/python-sphinxcontrib-htmlhelp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Jul 20 16:15:23 UTC 2024 - Matej Cepl + +- Update to 2.0.6: + - 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-htmlhelp.spec b/python-sphinxcontrib-htmlhelp.spec index 318cec5..348b62c 100644 --- a/python-sphinxcontrib-htmlhelp.spec +++ b/python-sphinxcontrib-htmlhelp.spec @@ -27,7 +27,7 @@ %endif %{?sle15_python_module_pythons} Name: python-sphinxcontrib-htmlhelp%{psuffix} -Version: 2.0.5 +Version: 2.0.6 Release: 0 Summary: Sphinx extension to generate HTML help files License: BSD-2-Clause @@ -66,8 +66,7 @@ sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files. %if %{with test} %check -# ignoring tests which fail (gh#sphinx-doc/sphinx#12623) -%pytest -k 'not (test_htmlhelp_hhc or test_build_htmlhelp)' +%pytest %endif %if !%{with test} diff --git a/sphinxcontrib_htmlhelp-2.0.5.tar.gz b/sphinxcontrib_htmlhelp-2.0.5.tar.gz deleted file mode 100644 index ad2e1df..0000000 --- a/sphinxcontrib_htmlhelp-2.0.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0dc87637d5de53dd5eec3a6a01753b1ccf99494bd756aafecd74b4fa9e729015 -size 21925 diff --git a/sphinxcontrib_htmlhelp-2.0.6.tar.gz b/sphinxcontrib_htmlhelp-2.0.6.tar.gz new file mode 100644 index 0000000..d5847f9 --- /dev/null +++ b/sphinxcontrib_htmlhelp-2.0.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6597da06185f0e3b4dc952777a04200611ef563882e0c244d27a15ee22afa73 +size 21957