From 49b4172b077a3a5d6bee29a11ce74c040ef4c2237245a3c420cfc013cbffd637 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 14 Dec 2023 08:09:54 +0000 Subject: [PATCH] Accepting request 1132894 from home:ojkastl_buildservice:Branch_devel_languages_python update to 1.9.1 OBS-URL: https://build.opensuse.org/request/show/1132894 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ansi2html?expand=0&rev=14 --- ...html.py-use-sys.executable-instead-o.patch | 33 ------------------- 1.8.0.tar.gz | 3 -- python-ansi2html.changes | 16 +++++++++ python-ansi2html.spec | 23 +++++++------ v1.9.1.tar.gz | 3 ++ 5 files changed, 30 insertions(+), 48 deletions(-) delete mode 100644 0001-tests-test_ansi2html.py-use-sys.executable-instead-o.patch delete mode 100644 1.8.0.tar.gz create mode 100644 v1.9.1.tar.gz diff --git a/0001-tests-test_ansi2html.py-use-sys.executable-instead-o.patch b/0001-tests-test_ansi2html.py-use-sys.executable-instead-o.patch deleted file mode 100644 index e962dc6..0000000 --- a/0001-tests-test_ansi2html.py-use-sys.executable-instead-o.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 01aa299300788591e91dd7290c455240056607a0 Mon Sep 17 00:00:00 2001 -From: Johannes Kastl -Date: Tue, 9 May 2023 14:00:51 +0200 -Subject: [PATCH] tests/test_ansi2html.py: use sys.executable instead of - hardcoded python3 - -Signed-off-by: Johannes Kastl ---- - tests/test_ansi2html.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/test_ansi2html.py b/tests/test_ansi2html.py -index 04b5d22..2e88a8f 100644 ---- a/tests/test_ansi2html.py -+++ b/tests/test_ansi2html.py -@@ -22,6 +22,7 @@ - # . - - import textwrap -+import sys - from io import StringIO - from os.path import abspath, dirname, join - from subprocess import PIPE, Popen, run -@@ -499,5 +500,5 @@ class TestAnsi2HTML: - assert process.returncode == 0 - - def test_command_module(self) -> None: -- result = run(["python3", "-m", "ansi2html", "--version"], check=True) -+ result = run([sys.executable, "-m", "ansi2html", "--version"], check=True) - assert result.returncode == 0 --- -2.40.1 - diff --git a/1.8.0.tar.gz b/1.8.0.tar.gz deleted file mode 100644 index 78ce9ed..0000000 --- a/1.8.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df2ce11830d161c804b15a4251bbd116c01b7d4af87d13d1453c99c066c62284 -size 40064 diff --git a/python-ansi2html.changes b/python-ansi2html.changes index 22d9b33..1c74d42 100644 --- a/python-ansi2html.changes +++ b/python-ansi2html.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Dec 13 08:54:07 UTC 2023 - Johannes Kastl + +- update to 1.9.1 (skipping non-existent release 1.9.0): + * Bugfixes + - Enable testing with py312 (#230) @ssbarnea + - Fix project description (#229) @ssbarnea + - Fix RTD builds (#228) @ssbarnea + - tests/test_ansi2html.py: use sys.executable instead of + hardcoded python3 (#214) @johanneskastl + - Replace optparse with argparse (#205) @ssbarnea + - Replace sphinx with mkdocs (#204) @ssbarnea +- remove patch + 0001-tests-test_ansi2html.py-use-sys.executable-instead-o.patch +- change upstream to pycontribs/ansi2html + ------------------------------------------------------------------- Tue May 9 12:02:38 UTC 2023 - Johannes Kastl diff --git a/python-ansi2html.spec b/python-ansi2html.spec index b8c4818..fbcc158 100644 --- a/python-ansi2html.spec +++ b/python-ansi2html.spec @@ -18,35 +18,33 @@ %{?sle15_python_module_pythons} Name: python-ansi2html -Version: 1.8.0 +Version: 1.9.1 Release: 0 Summary: Python module to convert text with ANSI color codes to HTML or LaTeX License: LGPL-3.0-or-later Group: Development/Languages/Python -URL: https://github.com/ralphbean/ansi2html/ -Source: https://github.com/ralphbean/ansi2html/archive/%{version}.tar.gz -# PATCH-FIX-UPSTREAM -# 0001-tests-test_ansi2html.py-use-sys.executable-instead-o.patch -# gh#pycontribs/ansi2html#210 kastl@b1-systems.de -Patch0: 0001-tests-test_ansi2html.py-use-sys.executable-instead-o.patch +URL: https://github.com/pycontribs/ansi2html/ +Source: https://github.com/pycontribs/ansi2html/archive/v%{version}.tar.gz BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-six Requires(post): update-alternatives Requires(postun):update-alternatives BuildArch: noarch %python_subpackages %description -A module to convert text with ANSI color codes to HTML or to LaTeX. +Convert text with ANSI color codes to HTML or to LaTeX. + +Inspired by and developed off of the work of pixelbeat and blackjack. + +Read the [docs](https://ansi2html.readthedocs.io/) for more informations. %prep %setup -q -n ansi2html-%{version} -%patch0 -p1 %build %pyproject_wheel @@ -71,8 +69,9 @@ sed -i 's:from mock:from unittest.mock:' tests/test_ansi2html.py %files %{python_files} %license LICENSE -%doc README.rst CHANGELOG.rst +%doc README.md %python_alternative %{_bindir}/ansi2html -%{python_sitelib}/* +%{python_sitelib}/ansi2html/ +%{python_sitelib}/ansi2html-*.dist-info/ %changelog diff --git a/v1.9.1.tar.gz b/v1.9.1.tar.gz new file mode 100644 index 0000000..194265d --- /dev/null +++ b/v1.9.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08395451ee39e661ad6e5449ff8334cf30bb9844755c666764c5d6bb08d758c5 +size 40326