From 774a8b9b363d20178de15ea9ceb6fe2f3aa6524e1e3f21857f7f883e5c96dc9b 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 --- python-sphinxcontrib-htmlhelp.changes | 5 +++++ python-sphinxcontrib-htmlhelp.rpmlintrc | 2 ++ python-sphinxcontrib-htmlhelp.spec | 11 ++++++----- 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 python-sphinxcontrib-htmlhelp.rpmlintrc diff --git a/python-sphinxcontrib-htmlhelp.changes b/python-sphinxcontrib-htmlhelp.changes index 1d3163a..856e822 100644 --- a/python-sphinxcontrib-htmlhelp.changes +++ b/python-sphinxcontrib-htmlhelp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 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 index d17e81f..25218fd 100644 --- a/python-sphinxcontrib-htmlhelp.spec +++ b/python-sphinxcontrib-htmlhelp.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package python-sphinxcontrib-htmlhelp # # Copyright (c) 2024 SUSE LLC # @@ -16,7 +16,6 @@ # -%{?sle15_python_module_pythons} %define skip_python2 1 %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" @@ -26,14 +25,16 @@ %define psuffix %{nil} %bcond_with test %endif +%{?sle15_python_module_pythons} Name: python-sphinxcontrib-htmlhelp%{psuffix} Version: 2.0.5 Release: 0 -Summary: Sphinx contrib extension to generate html help files +Summary: Sphinx extension to generate HTML help files License: BSD-2-Clause Group: Development/Languages/Python URL: https://github.com/sphinx-doc/sphinxcontrib-htmlhelp -Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib_htmlhelp/sphinxcontrib_htmlhelp-%{version}.tar.gz +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} @@ -49,7 +50,7 @@ BuildRequires: %{python_module sphinxcontrib-htmlhelp >= %{version}} %python_subpackages %description -Html help generating extension. +sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files. %prep %autosetup -p1 -n sphinxcontrib_htmlhelp-%{version} From efd42eaf2f4e6d4ac2bcd4f2a6c98fe98d8582ef4450f7384b33a326cd87c06a 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 11d8acb316b659d0c07337f91e0b64a2159e20e41a3c8c6261f9dca891876ee7 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