diff --git a/.gitignore b/.gitignore index 9028428..2359c93 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ tests/artifacts /ansi2html-1.5.1.tar.gz /ansi2html-1.6.0.tar.gz /ansi2html-1.6.0 +/ansi2html-1.7.0.tar.gz diff --git a/0000-replace-mock.patch b/0000-replace-mock.patch index a8a35c3..7f8fefe 100644 --- a/0000-replace-mock.patch +++ b/0000-replace-mock.patch @@ -1,22 +1,23 @@ ---- a/tests/test_ansi2html.py -+++ b/tests/test_ansi2html.py -@@ -27,7 +27,7 @@ from io import StringIO - from os.path import abspath, dirname, join +diff -Naur a/tests/test_ansi2html.py b/tests/test_ansi2html.py +--- a/tests/test_ansi2html.py 2022-01-31 02:47:37.000000000 -0600 ++++ b/tests/test_ansi2html.py 2022-07-04 10:52:52.501422154 -0500 +@@ -27,7 +27,7 @@ from subprocess import run + from typing import List -from mock import patch +from unittest.mock import patch from ansi2html import Ansi2HTMLConverter from ansi2html.converter import ( ---- a/tox.ini -+++ b/tox.ini -@@ -10,8 +10,6 @@ setenv = - PYTHONWARNINGS=error::FutureWarning - # Aim to replace with below once other issues are fixed: +diff -Naur a/tox.ini b/tox.ini +--- a/tox.ini 2022-01-31 02:47:37.000000000 -0600 ++++ b/tox.ini 2022-07-04 10:53:05.854315113 -0500 +@@ -13,7 +13,6 @@ # PYTHONWARNINGS=error --deps = + COVERAGE_FILE = {env:COVERAGE_FILE:{toxworkdir}/.coverage.{envname}} + deps = - mock + pytest + pytest-cov sitepackages = False - commands = - python -m unittest tests/test_ansi2html.py diff --git a/gating.yaml b/gating.yaml index 752bf3e..c2182c7 100644 --- a/gating.yaml +++ b/gating.yaml @@ -4,9 +4,3 @@ product_versions: decision_context: bodhi_update_push_stable rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/python-ansi2html.spec b/python-ansi2html.spec index 51960e1..c9067f5 100644 --- a/python-ansi2html.spec +++ b/python-ansi2html.spec @@ -4,8 +4,8 @@ %global srcname ansi2html Name: python-%{srcname} -Version: 1.6.0 -Release: 6%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: Python module that converts text with ANSI color to HTML # While the project was previously licensed as GPLv3+, it is now LGPLv3. # See https://github.com/pycontribs/ansi2html/issues/72 for more info. @@ -13,9 +13,10 @@ Summary: Python module that converts text with ANSI color to HTML # However, the project never removed the GPLv3+ headers from some of the files. License: LGPLv3 URL: http://github.com/pycontribs/%{srcname} -Source0: %{pypi_source} +Source: %{pypi_source} # See https://fedoraproject.org/wiki/Changes/DeprecatePythonMock for more info. -Patch0: 0000-replace-mock.patch +Patch: 0000-replace-mock.patch +Patch: 0001-fix-broken-Makefile.patch BuildArch: noarch @@ -67,6 +68,10 @@ install -Dpm 644 man/%{srcname}.1 %{buildroot}%{_mandir}/man1/%{srcname}.1 %{_mandir}/man1/%{srcname}.1* %changelog +* Mon Jul 04 2022 Maxwell G - 1.7.0-1 +- Update to 1.7.0. +- Resolves: rhbz#2103659. + * Mon Jun 13 2022 Python Maint - 1.6.0-6 - Rebuilt for Python 3.11 diff --git a/sources b/sources index 6ef9f59..45e8438 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ansi2html-1.6.0.tar.gz) = 35e5fb6cee96fe41a658c005734a58b08bc05e8ad5903ad18684c316bdad351a70c534b4162416225bc2ca774d01b4ac1bb8a8dad3170d0738aa7b3daf46b3c0 +SHA512 (ansi2html-1.7.0.tar.gz) = bcae0de9874899bd8440853b8279f3b2c4ed46e24bf807221ddc9d1bfa39647e2efd178aefc2fd39bad27b53890270b6ff7c150a0b8e74581b8323ef7a16c977