Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-ansi2html for
openSUSE:Factory checked in at 2025-06-18 15:57:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ansi2html (Old)
and /work/SRC/openSUSE:Factory/.python-ansi2html.new.19631 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ansi2html"
Wed Jun 18 15:57:42 2025 rev:9 rq:1286460 version:1.9.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-ansi2html/python-ansi2html.changes
2024-06-24 20:58:13.539099372 +0200
+++
/work/SRC/openSUSE:Factory/.python-ansi2html.new.19631/python-ansi2html.changes
2025-06-18 16:01:41.049920924 +0200
@@ -1,0 +2,12 @@
+Tue Jun 17 20:29:28 UTC 2025 - Matej Cepl <mc...@cepl.eu>
+
+- Add opensuse-test.patch making the tests work even with
+ versioned executables in the testing environment (i.e., before
+ the alts scriptlets kick in).
+
+-------------------------------------------------------------------
+Mon Jun 16 12:20:51 UTC 2025 - Markéta Machová <mmach...@suse.com>
+
+- Convert to libalternatives
+
+-------------------------------------------------------------------
New:
----
opensuse-test.patch
----------(New B)----------
New:
- Add opensuse-test.patch making the tests work even with
versioned executables in the testing environment (i.e., before
----------(New E)----------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ansi2html.spec ++++++
--- /var/tmp/diff_new_pack.IVtSvY/_old 2025-06-18 16:01:41.673946486 +0200
+++ /var/tmp/diff_new_pack.IVtSvY/_new 2025-06-18 16:01:41.673946486 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-ansi2html
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,7 @@
#
+%bcond_without libalternatives
%{?sle15_python_module_pythons}
Name: python-ansi2html
Version: 1.9.2
@@ -25,14 +26,19 @@
Group: Development/Languages/Python
URL: https://github.com/pycontribs/ansi2html/
Source:
https://github.com/pycontribs/ansi2html/archive/v%{version}.tar.gz
+# PATCH-FIX-OPENSUSE opensuse-test.patch bsc#[0-9]+ mc...@suse.com
+# Make tests work with versioned executables before alts kick in
+# If any other test fails, because the executable is not
+# "ansi2html", replace it with self.cmd_exe
+Patch0: opensuse-test.patch
BuildRequires: %{python_module pip}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module wheel}
+BuildRequires: alts
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires: alts
BuildArch: noarch
%python_subpackages
@@ -44,7 +50,7 @@
Read the [docs](https://ansi2html.readthedocs.io/) for more informations.
%prep
-%setup -q -n ansi2html-%{version}
+%autosetup -p1 -n ansi2html-%{version}
%build
%pyproject_wheel
@@ -57,15 +63,13 @@
%check
# https://github.com/pycontribs/ansi2html/issues/169
sed -i 's:from mock:from unittest.mock:' tests/test_ansi2html.py
+export PATH=$PATH:%{buildroot}%{_bindir}
# ansi2html not available (update alternatives); solvable
# but it runs just ansi2html --version
-%pytest -k 'not test_command_script'
+%pytest
-%post
-%python_install_alternative ansi2html
-
-%postun
-%python_uninstall_alternative ansi2html
+%pre
+%python_libalternatives_reset_alternative ansi2html
%files %{python_files}
%license LICENSE
++++++ opensuse-test.patch ++++++
---
tests/test_ansi2html.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Index: ansi2html-1.9.2/tests/test_ansi2html.py
===================================================================
--- ansi2html-1.9.2.orig/tests/test_ansi2html.py 2024-06-22
19:22:24.000000000 +0200
+++ ansi2html-1.9.2/tests/test_ansi2html.py 2025-06-17 22:27:11.354092953
+0200
@@ -50,6 +50,7 @@
class TestAnsi2HTML:
maxDiff = None
+ cmd_exe = "ansi2html-" + '.'.join([str(x) for x in sys.version_info[:2]])
def test_linkify(self) -> None:
ansi = "http://threebean.org#foobar";
@@ -465,7 +466,7 @@
assert target in html
def test_command_script(self) -> None:
- result = run(["ansi2html", "--version"], check=True)
+ result = run([self.cmd_exe, "--version"], check=True)
assert result.returncode == 0
def test_command_input_output_encoding(self) -> None:
@@ -480,7 +481,7 @@
with Popen(
[
- "ansi2html",
+ self.cmd_exe,
"--inline",
f"--input-encoding={input_encoding}",
f"--output-encoding={output_encoding}",
