[rpms/fedfind] test-pr-branch: new release 2.4.1 (CLI search by cid / label, get_package_nvras)

[rpms/fedfind] test-pr-branch: new release 2.4.1 (CLI search by cid / label, get_package_nvras)

[Adam Williamson]

A new commit has been pushed.

Repo   : rpms/fedfind
Branch : test-pr-branch
Commit : 0941f454b65c3fedb6dface1a55a2efc41055652
Author : Adam Williamson <awilliam@redhat.com>
Date   : 2016-03-21T19:10:42-07:00
Stats  : +30/-12 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/fedfind/c/0941f454b65c3fedb6dface1a55a2efc41055652?branch=test-pr-branch

Log:
new release 2.4.1 (CLI search by cid / label, get_package_nvras)

---
diff --git a/.gitignore b/.gitignore
index 396e6da..ca99fb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /fedfind-2.2.2.tar.xz
 /fedfind-2.2.3.tar.xz
 /fedfind-2.3.0.tar.xz
+/fedfind-2.4.1.tar.xz

diff --git a/fedfind.spec b/fedfind.spec
index 3144c82..85c2170 100644
--- a/fedfind.spec
+++ b/fedfind.spec
@@ -6,10 +6,14 @@
 %{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
 %endif
 
+# packages required at both test time and run time
+%global test_requires2 python2-cached_property python2-productmd python-six python-setuptools
+%global test_requires3 python3-cached_property python3-productmd python3-six python3-setuptools
+
 %global srcname fedfind
 
 Name:           fedfind
-Version:        2.3.0
+Version:        2.4.1
 Release:        1%{?dist}
 Summary:        Fedora Finder finds Fedora
 
@@ -20,18 +24,21 @@ Source0:        https://www.happyassassin.net/fedfind/releases/%{srcname}-%{vers
 BuildArch:      noarch
 
 BuildRequires:  python2-devel
+# No python2-pytest on EL or F22
+BuildRequires:  pytest
+# No python2-mock on EL or F22
+BuildRequires:  python-mock
+BuildRequires:  %{test_requires2}
 %if 0%{?with_python3}
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
+BuildRequires:  python3-pytest
+BuildRequires:  python3-mock
+BuildRequires:  %{test_requires3}
 %endif # if with_python3
-BuildRequires:  python-setuptools
-Requires:       python-setuptools
 # Not available on EPEL, so made optional in code
 # Recommends:   python-subprocess32
-Requires:       python-argparse
-Requires:       python2-cached_property
-Requires:       python2-productmd
-Requires:       python-six
+Requires:       %{test_requires2}
 Provides:       python2-fedfind = %{version}-%{release}
 Provides:       python-fedfind = %{version}-%{release}
 
@@ -46,10 +53,7 @@ Fedora images.
 %package -n python3-fedfind
 Summary:        Fedora Finder finds Fedora (using Python 3)
 Group:          Applications/Productivity
-Requires:       python3-cached_property
-Requires:       python3-productmd
-Requires:       python3-six
-Requires:       python3-setuptools
+Requires:       %{test_requires3}
 # old name from pre-Fedora packaging on happyassassin
 Obsoletes:      fedfind3 < %{version}-%{release}
 Provides:       fedfind3 = %{version}-%{release}
@@ -94,6 +98,15 @@ popd
 
 %{__python2} setup.py install --skip-build --root %{buildroot}
 
+%check
+%{__python2} setup.py test
+
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py test
+popd
+%endif # with_python3
+
 %files
 %doc README.md CHANGELOG.md
 %license COPYING
@@ -109,6 +122,10 @@ popd
 
 
 %changelog
+* Mon Mar 21 2016 Adam Williamson <awilliam@redhat.com> - 2.4.1-1
+- new release 2.4.1 (CLI search by cid / label, get_package_nvras)
+- enable tests
+
 * Thu Mar 17 2016 Adam Williamson <awilliam@redhat.com> - 2.3.0-1
 - new release 2.3.0 (drop 'payload', support candidates synced to alt)
 

diff --git a/sources b/sources
index 9eae217..d3b422a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d3fdb57b0552707da2785efd013d7d3  fedfind-2.3.0.tar.xz
+acefc37e96922cee0dbce530bbd1f45e  fedfind-2.4.1.tar.xz