[rpms/python-futurist] noevent: Remove Python2 subpackage in Fedora 30+ (bz#1671984)

[rpms/python-futurist] noevent: Remove Python2 subpackage in Fedora 30+ (bz#1671984)

[Javier Pena]

            A new commit has been pushed.

            Repo   : rpms/python-futurist
            Branch : noevent
            Commit : ec27c7e2a3e680ba29ab9f471b2c89dc0e21a30f
            Author : Javier Pena <jpena@redhat.com>
            Date   : 2019-02-04T11:33:43+01:00
            Stats  : +29/-10 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-futurist/c/ec27c7e2a3e680ba29ab9f471b2c89dc0e21a30f?branch=noevent

            Log:
            Remove Python2 subpackage in Fedora 30+ (bz#1671984)
Enable unit tests

---
diff --git a/python-futurist.spec b/python-futurist.spec
index 9bbe26e..c0a1bec 100644
--- a/python-futurist.spec
+++ b/python-futurist.spec
@@ -1,5 +1,9 @@
-%if 0%{?fedora}
-%global with_python3 1
+%if 0%{?fedora} || 0%{?rhel} > 7
+%bcond_with    python2
+%bcond_without python3
+%else
+%bcond_without python2
+%bcond_with    python3
 %endif
 
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
@@ -8,14 +12,15 @@
 
 Name:           python-%{pypi_name}
 Version:        1.7.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Useful additions to futures, from the future
 
 License:        ASL 2.0
 URL:            http://docs.openstack.org/developer/futurist
 Source0:        https://pypi.io/packages/source/f/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
- 
+
+%if %{with python2}
 %package -n python2-%{pypi_name}
 Summary:        Useful additions to futures, from the future
 %{?python_provide:%python_provide python2-%{pypi_name}}
@@ -47,8 +52,9 @@ Requires:       python2-prettytable
 
 %description -n python2-%{pypi_name}
 Code from the future, delivered to you in the now.
+%endif
 
-%if 0%{?with_python3}
+%if %{with python3}
 %package -n python3-%{pypi_name}
 Summary:        Useful additions to futures, from the future
 %{?python_provide:%python_provide python3-%{pypi_name}}
@@ -61,6 +67,7 @@ BuildRequires:  python3-prettytable
 BuildRequires:  python3-sphinx
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-six
+BuildRequires:  python3-openstackdocstheme
 # test requirements
 BuildRequires:  python3-eventlet
 BuildRequires:  python3-subunit
@@ -96,10 +103,12 @@ Code from the future, delivered to you in the now.
 %setup -q -n %{pypi_name}-%{version}
 
 %build
-%if 0%{?with_python3}
+%if 0%{with python3}
 %py3_build
 %endif # with_python3
+%if %{with python2}
 %py2_build
+%endif
 
 # generate html docs
 sphinx-build doc/source html
@@ -108,27 +117,33 @@ rm -rf html/.{doctrees,buildinfo}
 
 
 %install
-%if 0%{?with_python3}
+%if %{with python3}
 %py3_install
 %endif
+%if %{with python2}
 %py2_install
+%endif
 
 %check
+%if %{with python2}
 export PYTHON=%{__python2}
 # test fails with db type could not determined
 # %{__python2} setup.py testr --slowest
-%if 0%{?with_python3}
+%endif
+%if %{with python3}
 export PYTHON=%{__python3}
-# %{__python3} setup.py testr --slowest
+%{__python3} setup.py testr --slowest
 %endif
 
+%if %{with python2}
 %files -n python2-%{pypi_name}
 %doc README.rst
 %license LICENSE
 %{python2_sitelib}/%{pypi_name}
 %{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%endif
 
-%if 0%{?with_python3}
+%if %{with python3}
 %files -n python3-%{pypi_name}
 %doc README.rst
 %license LICENSE
@@ -141,6 +156,10 @@ export PYTHON=%{__python3}
 %license LICENSE
 
 %changelog
+* Mon Feb 04 2019 Javier Peña <jpena@redhat.com> - 1.7.0-3
+- Remove Python2 subpackage in Fedora 30+ (bz#1671984)
+- Enable unit tests
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild