[rpms/fedfind] test-pr-branch-2: Update to 4.2.1, disable Python 2 on F30+ / EL8+

[rpms/fedfind] test-pr-branch-2: Update to 4.2.1, disable Python 2 on F30+ / EL8+

[Adam Williamson]

A new commit has been pushed.

Repo   : rpms/fedfind
Branch : test-pr-branch-2
Commit : 34595a0f10a22304a799ca405e965f9f9949f399
Author : Adam Williamson <awilliam@redhat.com>
Date   : 2018-11-22T17:52:40-08:00
Stats  : +32/-3 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/fedfind/c/34595a0f10a22304a799ca405e965f9f9949f399?branch=test-pr-branch-2

Log:
Update to 4.2.1, disable Python 2 on F30+ / EL8+

---
diff --git a/.gitignore b/.gitignore
index 2cae260..a2488b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,4 @@
 /fedfind-4.1.2.tar.gz
 /fedfind-4.1.3.tar.gz
 /fedfind-4.2.0.tar.gz
+/fedfind-4.2.1.tar.gz

diff --git a/fedfind.spec b/fedfind.spec
index fcf59e6..9f16907 100644
--- a/fedfind.spec
+++ b/fedfind.spec
@@ -7,6 +7,15 @@
 %bcond_with     python3
 %endif
 
+# Disable Python 2 builds for Fedora > 29, EPEL > 7
+%if 0%{?fedora} > 29 || 0%{?rhel} > 7
+%bcond_with         python2
+%global obsolete2   1
+%else
+%bcond_without      python2
+%global obsolete2   0
+%endif
+
 # packages required at both test time and run time
 %global test_requires2 python2-cached_property python2-productmd python2-six python2-setuptools
 %global test_requires3 python%{python3_pkgversion}-cached_property python%{python3_pkgversion}-productmd python%{python3_pkgversion}-six python%{python3_pkgversion}-setuptools
@@ -14,8 +23,8 @@
 %global srcname fedfind
 
 Name:           fedfind
-Version:        4.2.0
-Release:        3%{?dist}
+Version:        4.2.1
+Release:        1%{?dist}
 Summary:        Fedora compose and image finder
 
 Group:          Applications/Productivity
@@ -24,10 +33,12 @@ URL:            https://pagure.io/fedora-qa/fedfind
 Source0:        https://files.pythonhosted.org/packages/source/f/%{srcname}/%{srcname}-%{version}.tar.gz
 BuildArch:      noarch
 
+%if 0%{?with_python2}
 BuildRequires:  python2-devel
 BuildRequires:  python2-pytest
 BuildRequires:  python2-mock
 BuildRequires:  %{test_requires2}
+%endif # if with_python2
 %if 0%{?with_python3}
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
@@ -53,6 +64,7 @@ Fedora Finder finds Fedora. For now, that means it finds Fedora images
 nightly composes. The fedfind package provides a simple CLI for showing
 image URLs.
 
+%if 0%{?with_python2}
 %package -n python2-fedfind
 Summary:        Fedora compose and image finder library
 %{?python_provide:%python_provide python2-fedfind}
@@ -68,11 +80,15 @@ nightly composes. The fedfind library provides a handy interface for
 interacting with Fedora composes and discovering various properties of
 them, along with some miscellaneous helper functions. This is the
 Python 2 library package.
+%endif # if with_python2
 
 %if 0%{?with_python3}
 %package -n python%{python3_pkgversion}-fedfind
 Summary:        Fedora Finder finds Fedora (using Python 3)
 %{?python_provide:%python_provide python%{python3_pkgversion}-fedfind}
+%if 0%{?obsolete2}
+Obsoletes:      python2-fedfind < %{version}-%{release}
+%endif # obsolete2
 Group:          Applications/Productivity
 Requires:       %{test_requires3}
 
@@ -95,7 +111,9 @@ find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!.*python2|#!%{__python3}|'
 %endif # with_python3
 
 %build
+%if 0%{?with_python2}
 %py2_build
+%endif # with_python2
 %if 0%{?with_python3}
 pushd %{py3dir}
 %py3_build
@@ -107,7 +125,9 @@ rm -rf %{buildroot}
 
 # We want the Python 3 executable to be default where it builds, so
 # go with this install order
+%if 0%{?with_python2}
 %py2_install
+%endif # with_python2
 %if 0%{?with_python3}
 pushd %{py3dir}
 %py3_install
@@ -116,7 +136,9 @@ popd
 
 
 %check
+%if 0%{?with_python2}
 %{__python2} setup.py test
+%endif # with_python2
 
 %if 0%{?with_python3}
 pushd %{py3dir}
@@ -129,10 +151,12 @@ popd
 %license COPYING
 %{_bindir}/fedfind
 
+%if 0%{?with_python2}
 %files -n python2-fedfind
 %doc README.md CHANGELOG.md
 %license COPYING
 %{python2_sitelib}/%{srcname}*
+%endif # with_python2
 
 %if 0%{?with_python3}
 %files -n python%{python3_pkgversion}-fedfind
@@ -143,6 +167,10 @@ popd
 
 
 %changelog
+* Thu Nov 22 2018 Adam Williamson <awilliam@redhat.com> - 4.2.1-1
+- New release 4.2.1: make test suite work without Python 2
+- Disable Python 2 build on F30+, EL8+
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

diff --git a/sources b/sources
index 48abe86..e2eeffe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedfind-4.2.0.tar.gz) = 7e7d2d10c37127cc961dca33b2cd4ab5521d0a8467e46e1bb8b1b01d72608b2eb1be2203232c66be7b07f81f1ba821a53fbb4e61f511d57c78280c3ecab9440c
+SHA512 (fedfind-4.2.1.tar.gz) = 9859eeb5a8fa445d55e59eb76be6db1f8f5b86c87a44a656a6e2f79d1d30cdf6fb0477a607f316c5093c5daa770d21dbe4f299a4e50d8764fdc0f77ed11a8f27