[rpms/python-magnumclient] epel10.2: Subpackages python2-magnumclient, python2-magnumclient-tests have been removed

[rpms/python-magnumclient] epel10.2: Subpackages python2-magnumclient, python2-magnumclient-tests have been removed

[@ 2026-08-10 9:50 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/python-magnumclient
Branch : epel10.2
Commit : b6e77d39752cc977b6c00d09317d1f70dc70609c
Author : Miro Hrončok <miro@hroncok.cz>
Date   : 2018-10-27T22:05:23+02:00
Stats  : +10/-123 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/python-magnumclient/c/b6e77d39752cc977b6c00d09317d1f70dc70609c?branch=epel10.2

Log:
Subpackages python2-magnumclient, python2-magnumclient-tests have been removed

---
diff --git a/python-magnumclient.spec b/python-magnumclient.spec
index 909fc5c..e233202 100644
--- a/python-magnumclient.spec
+++ b/python-magnumclient.spec
@@ -2,13 +2,6 @@
 %global sname python-magnumclient
 %global pname magnumclient
 
-%if 0%{?fedora} >= 24
-%global with_python3 1
-%global default_python 3
-%else
-%global default_python 2
-%endif
-
 %global common_desc \
 This is a client library for Magnum built on the Magnum API. \
 It provides a Python API (the magnumclient module) and a \
@@ -18,7 +11,7 @@ command-line tool (magnum).
 
 Name:           python-%{pname}
 Version:        2.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Client library for Magnum API
 
 License:        ASL 2.0
@@ -29,56 +22,11 @@ BuildArch:      noarch
 %description
 %{common_desc}
 
-%package -n     python2-%{pname}
-Summary:        Client library for Magnum API
-%{?python_provide:%python_provide python2-%{pname}}
-
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-BuildRequires:  python2-pbr
-BuildRequires:  git
-
-# test dependencies
-BuildRequires:  python2-oslo-utils
-BuildRequires:  python2-openstackclient
-BuildRequires:  python2-oslo-serialization
-BuildRequires:  python2-oslo-log
-BuildRequires:  python2-osprofiler
-BuildRequires:  python2-stevedore
-BuildRequires:  python2-requests
-BuildRequires:  python2-oslo-i18n
-BuildRequires:  python2-fixtures
-BuildRequires:  python2-mock
-BuildRequires:  python2-testtools
-BuildRequires:  python2-keystoneauth1
-BuildRequires:  python2-prettytable
-
-Requires:    python2-babel
-Requires:    python2-cryptography
-Requires:    python2-keystoneauth1 >= 3.3.0
-Requires:    python2-oslo-i18n >= 3.15.3
-Requires:    python2-oslo-log >= 3.36.0
-Requires:    python2-oslo-serialization >= 2.18.0
-Requires:    python2-oslo-utils >= 3.33.0
-Requires:    python2-osc-lib >= 1.8.0
-Requires:    python2-os-client-config >= 1.28.0
-Requires:    python2-pbr
-Requires:    python2-prettytable
-Requires:    python2-six
-%if 0%{?fedora} > 0
-Requires:    python2-decorator
-%else
-Requires:    python-decorator
-%endif
-
-%description -n python2-%{pname}
-%{common_desc}
-
-%if 0%{?with_python3}
 %package -n     python3-%{pname}
 Summary:        Client library for Magnum API
 %{?python_provide:%python_provide python3-%{pname}}
 
+BuildRequires:  git-core
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-pbr
@@ -114,41 +62,15 @@ Requires:    python3-six
 
 %description -n python3-%{pname}
 %{common_desc}
-%endif
 
 %package -n python-%{pname}-doc
 Summary:        python-magnumclient documentation
-BuildRequires:   python2-sphinx
-BuildRequires:   python2-openstackdocstheme
-BuildRequires:   python2-os-client-config
-%if 0%{?fedora} > 0
-BuildRequires:   python2-decorator
-%else
-BuildRequires:   python-decorator
-%endif
+BuildRequires:  python3-sphinx
+BuildRequires:  python3-openstackdocstheme
 
 %description -n python-%{pname}-doc
 Documentation for python-magnumclient
 
-%package -n python2-%{pname}-tests
-Summary: Python-magnumclient test subpackage
-%{?python_provide:%python_provide python2-%{pname}-tests}
-
-Requires:  python2-%{pname} = %{version}-%{release}
-Requires:  python2-oslo-utils
-Requires:  python2-stevedore
-Requires:  python2-requests
-Requires:  python2-oslo-i18n
-Requires:  python2-fixtures
-Requires:  python2-mock
-Requires:  python2-testtools
-Requires:  python2-keystoneauth1
-Requires:  python2-prettytable
-
-%description -n python2-%{pname}-tests
-%{common_desc_tests}
-
-%if 0%{?with_python3}
 %package -n python3-%{pname}-tests
 Summary: Python-magnumclient test subpackage
 
@@ -165,7 +87,6 @@ Requires:  python3-prettytable
 
 %description -n python3-%{pname}-tests
 %{common_desc_tests}
-%endif
 
 %prep
 %autosetup -n %{name}-%{upstream_version} -S git
@@ -174,74 +95,40 @@ Requires:  python3-prettytable
 rm -rf {,test-}requirements.txt
 
 %build
-%py2_build
-
-%if 0%{?with_python3}
 %py3_build
-%endif
 # generate html docs
-%{__python2} setup.py build_sphinx -b html
+%{__python3} setup.py build_sphinx -b html
 # Fix hidden-file-or-dir warnings
 rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %install
-
-%if 0%{?with_python3}
 %py3_install
-%if %{default_python} >= 3
-mv %{buildroot}%{_bindir}/magnum ./magnum.py3
-%endif
-%endif
-
-%py2_install
-
-%if 0%{?default_python} >= 3
-mv magnum.py3 %{buildroot}%{_bindir}/magnum
-%endif
 
 %check
 # tests are failing due to unicode not defined
 # we are skipping the test
-%{__python2} setup.py test ||
-%if 0%{?with_python3}
-%{__python3} setup.py test ||
-%endif
-
-%files -n python2-%{pname}
-%doc README.rst
-%license LICENSE
-%{python2_sitelib}/%{pname}
-%if 0%{?default_python} <= 2
-%{_bindir}/magnum
-%endif
-%{python2_sitelib}/*.egg-info
-%exclude %{python2_sitelib}/%{pname}/tests
+%{__python3} setup.py test || :
 
-%if 0%{?with_python3}
 %files -n python3-%{pname}
 %doc README.rst
 %license LICENSE
-%if 0%{?default_python} >= 3
 %{_bindir}/magnum
-%endif
 %{python3_sitelib}/magnumclient
 %{python3_sitelib}/*.egg-info
 %exclude %{python3_sitelib}/%{pname}/tests
-%endif
 
 %files -n python-%{pname}-doc
 %license LICENSE
 %doc doc/build/html
 
-%files -n python2-%{pname}-tests
-%{python2_sitelib}/%{pname}/tests
-
-%if 0%{?with_python3}
 %files -n python3-%{pname}-tests
 %{python3_sitelib}/%{pname}/tests
-%endif
 
 %changelog
+* 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