diff --git a/.gitignore b/.gitignore index 01923b9..85f2448 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /python-coloredlogs-10.0.tar.gz +/python-coloredlogs-14.0.tar.gz diff --git a/python-coloredlogs-10.0-test-timezone.patch b/python-coloredlogs-10.0-test-timezone.patch deleted file mode 100644 index c0369e7..0000000 --- a/python-coloredlogs-10.0-test-timezone.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 36c65aee6f2d46c5fda7cdf5993d472fe12d6943 Mon Sep 17 00:00:00 2001 -From: Scott K Logan -Date: Mon, 18 Mar 2019 14:53:06 -0700 -Subject: [PATCH] Handle negative-offset timezones in tests - ---- - coloredlogs/tests.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/coloredlogs/tests.py b/coloredlogs/tests.py -index 38f2d97..4140b90 100644 ---- a/coloredlogs/tests.py -+++ b/coloredlogs/tests.py -@@ -367,7 +367,7 @@ def test_support_for_milliseconds_directive(self): - stream = StringIO() - install(reconfigure=True, stream=stream, datefmt='%Y-%m-%dT%H:%M:%S.%f%z') - logging.info("This should be timestamped according to #45.") -- assert re.match(r'^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}\+\d{4}\s', stream.getvalue()) -+ assert re.match(r'^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}[+-]\d{4}\s', stream.getvalue()) - - def test_plain_text_output_format(self): - """Inspect the plain text output of coloredlogs.""" diff --git a/python-coloredlogs.rpmlintrc b/python-coloredlogs.rpmlintrc new file mode 100644 index 0000000..2d662d0 --- /dev/null +++ b/python-coloredlogs.rpmlintrc @@ -0,0 +1,5 @@ +# SPELLING ERRORS +addFilter(r'spelling-error .*en_US\)? (Formatter)( ->|$)') + +# MANUAL PAGES +addFilter(r'no-manual-page-for-binary coloredlogs$') diff --git a/python-coloredlogs.spec b/python-coloredlogs.spec index 635b13c..d2d0c4e 100644 --- a/python-coloredlogs.spec +++ b/python-coloredlogs.spec @@ -1,17 +1,14 @@ %global srcname coloredlogs Name: python-%{srcname} -Version: 10.0 -Release: 11%{?dist} +Version: 14.0 +Release: 1%{?dist} Summary: Colored terminal output for Python's logging module License: MIT URL: https://%{srcname}.readthedocs.io Source0: https://github.com/xolox/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -# Submitted upstream as xolox/python-coloredlogs#69 -Patch0: %{name}-10.0-test-timezone.patch - BuildArch: noarch %description @@ -31,22 +28,22 @@ HTML documentation for the '%{srcname}' Python module. %package -n python%{python3_pkgversion}-%{srcname} Summary: %{summary} -BuildRequires: python%{python3_pkgversion}-capturer +BuildRequires: python%{python3_pkgversion}-capturer >= 2.4 BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-humanfriendly +BuildRequires: python%{python3_pkgversion}-humanfriendly >= 7.1 BuildRequires: python%{python3_pkgversion}-mock BuildRequires: python%{python3_pkgversion}-pytest BuildRequires: python%{python3_pkgversion}-setuptools -BuildRequires: python%{python3_pkgversion}-verboselogs +BuildRequires: python%{python3_pkgversion}-verboselogs >= 1.7 %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} -%if %{undefined python_disable_dependency_generator} -Requires: python%{python3_pkgversion}-humanfriendly -%endif # python_disable_dependency_generator +%if %{undefined __pythondist_requires} +Requires: python%{python3_pkgversion}-humanfriendly >= 7.1 +%endif -%if 0%{?fedora} +%if !0%{?rhel} || 0%{?rhel} >= 8 Suggests: %{name}-doc = %{version}-%{release} -%endif # fedora +%endif %description -n python%{python3_pkgversion}-%{srcname} The coloredlogs package enables colored terminal output for Python's logging @@ -85,9 +82,6 @@ PATH=%{buildroot}%{_bindir}:$PATH \ PYTHONUSERBASE=%{buildroot}%{_prefix} \ PYTHONUNBUFFERED=1 \ py.test-%{python3_version} \ -%if 0%{?python3_version_nodots} >= 37 - --deselect %{srcname}/tests.py::ColoredLogsTestCase::test_plain_text_output_format \ -%endif %{srcname}/tests.py @@ -105,6 +99,9 @@ PATH=%{buildroot}%{_bindir}:$PATH \ %changelog +* Wed Apr 15 2020 Scott K Logan - 14.0-1 +- Update to 14.0 (rhbz#1803324) + * Thu Jan 30 2020 Fedora Release Engineering - 10.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index bb836ee..1ea9d4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-coloredlogs-10.0.tar.gz) = 19d782a2d9160474b9235efd42673eb5385e37b470bf0af561da1eba60c6145ee46abc44b0c2a00ef4f4e765c358e6692c498bfee5871db091aeaff55d20f163 +SHA512 (python-coloredlogs-14.0.tar.gz) = 529a68f2ae1bd281e585cbdf67dab3386d8b16c35996d849d5d70f087248fccc622f7e42f1fb9885e1a9133172ad35b77c7741b986ca25dce8ddc38c59be82a7