From 9e906cf59247bf6327aeba49d7552e3edad76503 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Sun, 24 Jan 2021 14:16:12 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/tracer.git#603e2a3692f3a1ce544a240dfe1e874dcf8f6e4e --- .gitignore | 1 + sources | 2 +- tracer.spec | 34 +++++++++++++--------------------- 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index aad7f28..10d87a7 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /tracer-0.7.2.tar.gz /tracer-0.7.3.tar.gz /tracer-0.7.4.tar.gz +/tracer-0.7.5.tar.gz diff --git a/sources b/sources index 41c50dd..7ace246 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tracer-0.7.4.tar.gz) = 848fa4f8d86d36c244317b0cb0a2d01373414fd7ddff00a8a2b7d70b5054b46a25dfb84fe0eb2323afadcc67277d508a6b11aaa44d63b273e3b42b83463a8449 +SHA512 (tracer-0.7.5.tar.gz) = 0851ea67e7fc8a48ba2d2af9563247d5bf4401d93d9ada6325cce89132153710861846baf4aacde0edcd1a45f3f1a8d309b8cbeeeed29e82336dbf64e824ae59 diff --git a/tracer.spec b/tracer.spec index bbec317..7850a6f 100644 --- a/tracer.spec +++ b/tracer.spec @@ -17,8 +17,8 @@ %endif Name: tracer -Version: 0.7.4 -Release: 2%{?dist} +Version: 0.7.5 +Release: 1%{?dist} Summary: Finds outdated running applications in your system BuildArch: noarch @@ -60,23 +60,19 @@ Obsoletes: %{name} <= 0.6.11 BuildRequires: python2-devel BuildRequires: python2-sphinx %if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: python-beautifulsoup4 BuildRequires: rpm-python BuildRequires: python-lxml BuildRequires: python2-mock Requires: rpm-python -Requires: python-beautifulsoup4 Requires: python-lxml %else -BuildRequires: python2-beautifulsoup4 BuildRequires: python2-rpm Requires: python2-rpm -Requires: python2-beautifulsoup4 Requires: python2-lxml %endif -BuildRequires: python2-nose +BuildRequires: python2-pytest BuildRequires: python2-psutil -BuildRequires: python2-future +BuildRequires: python2-six BuildRequires: dbus-python Requires: dbus-python Requires: python2-psutil @@ -100,19 +96,17 @@ Python 2 version. Summary: %{summary} BuildRequires: python3-devel BuildRequires: python3-sphinx -BuildRequires: python3-nose +BuildRequires: python3-pytest BuildRequires: python3-psutil -BuildRequires: python3-future -BuildRequires: python3-beautifulsoup4 +BuildRequires: python3-six BuildRequires: python3-dbus BuildRequires: python3-rpm Requires: python3-rpm -Requires: python3-beautifulsoup4 Requires: python3-psutil Requires: python3-lxml Requires: python3-setuptools Requires: python3-dbus -Requires: python3-future +Requires: python3-six Requires: %{name}-common = %{version}-%{release} %if %{with suggest} Suggests: python3-argcomplete @@ -150,13 +144,9 @@ make %{?_smp_mflags} man %check %if %{with python3} -nosetests-3 . +python3 -m pytest -v tests %else -%if 0%{?rhel} && 0%{?rhel} <= 7 -nosetests . -%else -nosetests-2 . -%endif +python2 -m pytest -v tests %endif %install @@ -207,8 +197,10 @@ make DESTDIR=%{buildroot}%{_datadir} mo %changelog -* Wed Jul 29 2020 Fedora Release Engineering - 0.7.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* Sun Jan 24 2021 Jakub Kadlcik 0.7.5-1 +- Depend on python3-six instead of python3-future (frostyx@email.cz) +- Drop beautifulsoup4 in favor of built-in xml.dom (frostyx@email.cz) +- Drop nosetests dependency, use pytest instead (frostyx@email.cz) * Mon Jun 08 2020 Jakub Kadlcik 0.7.4-1 - Fix list index out of range for ssh process names (frostyx@email.cz)