[rpms/python-magnumclient] epel10: Update to stein release

[rpms/python-magnumclient] epel10: Update to stein release

[Alfredo Moralejo]

A new commit has been pushed.

Repo   : rpms/python-magnumclient
Branch : epel10
Commit : 916f8dfde2c4905c2cd98f02e7301f76ef947ad8
Author : Alfredo Moralejo <amoralej@redhat.com>
Date   : 2019-05-13T20:59:22+02:00
Stats  : +107/-80 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/python-magnumclient/c/916f8dfde2c4905c2cd98f02e7301f76ef947ad8?branch=epel10

Log:
Update to stein release

---
diff --git a/.gitignore b/.gitignore
index adb8539..a8eb791 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /python-magnumclient-2.0.0.tar.gz
 /python-magnumclient-2.3.0.tar.gz
 /python-magnumclient-2.9.1.tar.gz
+/python-magnumclient-2.12.0.tar.gz

diff --git a/python-magnumclient.spec b/python-magnumclient.spec
index 9fedf72..ff888c0 100644
--- a/python-magnumclient.spec
+++ b/python-magnumclient.spec
@@ -1,6 +1,18 @@
+# Macros for py2/py3 compatibility
+%if 0%{?fedora} || 0%{?rhel} > 7
+%global pyver %{python3_pkgversion}
+%else
+%global pyver 2
+%endif
+%global pyver_bin python%{pyver}
+%global pyver_sitelib %python%{pyver}_sitelib
+%global pyver_install %py%{pyver}_install
+%global pyver_build %py%{pyver}_build
+# End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 %global sname python-magnumclient
 %global pname magnumclient
+%global with_doc 1
 
 %global common_desc \
 This is a client library for Magnum built on the Magnum API. \
@@ -10,8 +22,8 @@ command-line tool (magnum).
 %global common_desc_tests Python-magnumclient test subpackage
 
 Name:           python-%{pname}
-Version:        2.9.1
-Release:        3%{?dist}
+Version:        2.12.0
+Release:        1%{?dist}
 Summary:        Client library for Magnum API
 
 License:        ASL 2.0
@@ -22,122 +34,136 @@ BuildArch:      noarch
 %description
 %{common_desc}
 
-%package -n     python3-%{pname}
+%package -n     python%{pyver}-%{pname}
 Summary:        Client library for Magnum API
-%{?python_provide:%python_provide python3-%{pname}}
+%{?python_provide:%python_provide python%{pyver}-%{pname}}
+%if %{pyver} == 3
+Obsoletes: python2-%{pname} < %{version}-%{release}
+%endif
 
-BuildRequires:  git-core
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-pbr
+BuildRequires:  python%{pyver}-devel
+BuildRequires:  python%{pyver}-setuptools
+BuildRequires:  python%{pyver}-pbr
+BuildRequires:  git
 
 # test dependencies
-BuildRequires:  python3-oslo-utils
-BuildRequires:  python3-openstackclient
-BuildRequires:  python3-oslo-serialization
-BuildRequires:  python3-oslo-log
-BuildRequires:  python3-osprofiler
-BuildRequires:  python3-stevedore
-BuildRequires:  python3-requests
-BuildRequires:  python3-oslo-i18n
-BuildRequires:  python3-fixtures
-BuildRequires:  python3-mock
-BuildRequires:  python3-testtools
-BuildRequires:  python3-keystoneauth1
-BuildRequires:  python3-prettytable
-
-Requires:    python3-babel
-Requires:    python3-cryptography
-Requires:    python3-decorator
-Requires:    python3-keystoneauth1 >= 3.3.0
-Requires:    python3-oslo-i18n >= 3.15.3
-Requires:    python3-oslo-log >= 3.36.0
-Requires:    python3-oslo-serialization >= 2.18.0
-Requires:    python3-oslo-utils >= 3.33.0
-Requires:    python3-osc-lib >= 1.8.0
-Requires:    python3-os-client-config >= 1.28.0
-Requires:    python3-pbr
-Requires:    python3-prettytable
-Requires:    python3-six
-
-%description -n python3-%{pname}
+BuildRequires:  python%{pyver}-oslo-utils
+BuildRequires:  python%{pyver}-openstackclient
+BuildRequires:  python%{pyver}-oslo-serialization
+BuildRequires:  python%{pyver}-oslo-log
+BuildRequires:  python%{pyver}-osprofiler
+BuildRequires:  python%{pyver}-stevedore
+BuildRequires:  python%{pyver}-requests
+BuildRequires:  python%{pyver}-oslo-i18n
+BuildRequires:  python%{pyver}-fixtures
+BuildRequires:  python%{pyver}-mock
+BuildRequires:  python%{pyver}-testtools
+BuildRequires:  python%{pyver}-keystoneauth1
+BuildRequires:  python%{pyver}-prettytable
+
+Requires:    python%{pyver}-babel
+Requires:    python%{pyver}-cryptography
+Requires:    python%{pyver}-keystoneauth1 >= 3.4.0
+Requires:    python%{pyver}-oslo-i18n >= 3.15.3
+Requires:    python%{pyver}-oslo-log >= 3.36.0
+Requires:    python%{pyver}-oslo-serialization >= 2.18.0
+Requires:    python%{pyver}-oslo-utils >= 3.33.0
+Requires:    python%{pyver}-osc-lib >= 1.8.0
+Requires:    python%{pyver}-os-client-config >= 1.28.0
+Requires:    python%{pyver}-pbr
+Requires:    python%{pyver}-prettytable
+Requires:    python%{pyver}-six
+
+# Handle python2 exception
+%if %{pyver} == 2
+Requires:    python-decorator
+%else
+Requires:    python%{pyver}-decorator
+%endif
+
+%description -n python%{pyver}-%{pname}
 %{common_desc}
 
+%if 0%{?with_doc}
 %package -n python-%{pname}-doc
 Summary:        python-magnumclient documentation
-BuildRequires:  python3-sphinx
-BuildRequires:  python3-openstackdocstheme
+BuildRequires:   python%{pyver}-sphinx
+BuildRequires:   python%{pyver}-openstackdocstheme
+BuildRequires:   python%{pyver}-os-client-config
+
+# Handle python2 exception
+%if %{pyver} == 2
+BuildRequires:   python-decorator
+%else
+BuildRequires:   python%{pyver}-decorator
+%endif
 
 %description -n python-%{pname}-doc
 Documentation for python-magnumclient
+%endif
 
-%package -n python3-%{pname}-tests
+%package -n python%{pyver}-%{pname}-tests
 Summary: Python-magnumclient test subpackage
-
-Requires:  python3-%{pname} = %{version}-%{release}
-Requires:  python3-oslo-utils
-Requires:  python3-stevedore
-Requires:  python3-requests
-Requires:  python3-oslo-i18n
-Requires:  python3-fixtures
-Requires:  python3-mock
-Requires:  python3-testtools
-Requires:  python3-keystoneauth1
-Requires:  python3-prettytable
-
-%description -n python3-%{pname}-tests
+%{?python_provide:%python_provide python2-%{pname}-tests}
+
+Requires:  python%{pyver}-%{pname} = %{version}-%{release}
+Requires:  python%{pyver}-oslo-utils
+Requires:  python%{pyver}-stevedore
+Requires:  python%{pyver}-requests
+Requires:  python%{pyver}-oslo-i18n
+Requires:  python%{pyver}-fixtures
+Requires:  python%{pyver}-mock
+Requires:  python%{pyver}-testtools
+Requires:  python%{pyver}-keystoneauth1
+Requires:  python%{pyver}-prettytable
+
+%description -n python%{pyver}-%{pname}-tests
 %{common_desc_tests}
 
 %prep
 %autosetup -n %{name}-%{upstream_version} -S git
 
 # let RPM handle deps
-rm -rf {,test-}requirements.txt
+rm -rf *requirements.txt
 
 %build
-%py3_build
+%{pyver_build}
+
+%if 0%{?with_doc}
 # generate html docs
-%{__python3} setup.py build_sphinx -b html
+# (TODO) Re-add -W once https://review.openstack.org/#/c/554197 is in a
+# tagged release
+sphinx-build-%{pyver} -b html doc/source doc/build/html
 # Fix hidden-file-or-dir warnings
 rm -rf doc/build/html/.{doctrees,buildinfo}
+%endif
 
 %install
-%py3_install
+%{pyver_install}
 
 %check
 # tests are failing due to unicode not defined
 # we are skipping the test
-%{__python3} setup.py test || :
+%{pyver_bin} setup.py test ||
 
-%files -n python3-%{pname}
+%files -n python%{pyver}-%{pname}
 %doc README.rst
 %license LICENSE
+%{pyver_sitelib}/%{pname}
 %{_bindir}/magnum
-%{python3_sitelib}/magnumclient
-%{python3_sitelib}/*.egg-info
-%exclude %{python3_sitelib}/%{pname}/tests
+%{pyver_sitelib}/*.egg-info
+%exclude %{pyver_sitelib}/%{pname}/tests
 
+%if 0%{?with_doc}
 %files -n python-%{pname}-doc
 %license LICENSE
 %doc doc/build/html
+%endif
 
-%files -n python3-%{pname}-tests
-%{python3_sitelib}/%{pname}/tests
+%files -n python%{pyver}-%{pname}-tests
+%{pyver_sitelib}/%{pname}/tests
 
 %changelog
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Oct 27 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-2
-- Subpackages python2-magnumclient, python2-magnumclient-tests have been removed
-  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
-
-* Wed Jun 06 2018 RDO <dev@lists.rdoproject.org> 2.9.1-1
-- Update to 2.9.1
-
-* Mon Mar 05 2018 RDO <dev@lists.rdoproject.org> 2.9.0-1
-- Update to 2.9.0
-
-* Sun Feb 11 2018 RDO <dev@lists.rdoproject.org> 2.8.0-1
-- Update to 2.8.0
+* Mon Mar 11 2019 RDO <dev@lists.rdoproject.org> 2.12.0-1
+- Update to 2.12.0
 

diff --git a/sources b/sources
index 013d25f..90b8615 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (python-magnumclient-2.9.1.tar.gz) = dd709a83897bae972def56a00c9f14b68dcf2da167d59bcd34c5051a3ef4f5f0a62f9c8e7b5652fa96a82a4f97a1047ba4a9b441d87563c64f5154c48d686cb0
+SHA512 (python-magnumclient-2.12.0.tar.gz) = a6d8790b87801ca313bb119e75490cb2913a11558925b6a49e276a7bfed102cf8e575f344fce8e31223f835c4961c50c2918844689ef88ef34c72c8a1032f340