From 5b367c8a7371c978c221d4a2da9edf4f60d07057fb1d2f69faed21ea590ae73f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 11 Mar 2020 17:08:28 +0000 Subject: [PATCH] - switch to python 3.x only build OBS-URL: https://build.opensuse.org/package/show/Cloud:OpenStack:Factory/python-cinderclient?expand=0&rev=45 --- python-cinderclient.changes | 5 +++ python-cinderclient.spec | 77 ++++++++++++++----------------------- 2 files changed, 34 insertions(+), 48 deletions(-) diff --git a/python-cinderclient.changes b/python-cinderclient.changes index aafed49..ba750f6 100644 --- a/python-cinderclient.changes +++ b/python-cinderclient.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 11 17:08:13 UTC 2020 - Dirk Mueller + +- switch to python 3.x only build + ------------------------------------------------------------------- Wed Oct 9 12:57:11 UTC 2019 - cloud-devel@suse.de diff --git a/python-cinderclient.spec b/python-cinderclient.spec index 8a5a819..0495c99 100644 --- a/python-cinderclient.spec +++ b/python-cinderclient.spec @@ -1,7 +1,7 @@ # # spec file for package python-cinderclient # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,18 +25,6 @@ Group: Development/Languages/Python URL: https://launchpad.net/python-cinderclient Source0: https://files.pythonhosted.org/packages/source/p/python-cinderclient/python-cinderclient-5.0.0.tar.gz BuildRequires: openstack-macros -BuildRequires: python2-PrettyTable >= 0.7.1 -BuildRequires: python2-ddt -BuildRequires: python2-fixtures -BuildRequires: python2-keystoneauth1 >= 3.4.0 -BuildRequires: python2-mock -BuildRequires: python2-oslo.serialization -BuildRequires: python2-oslo.utils >= 3.33.0 -BuildRequires: python2-pbr >= 2.0.0 -BuildRequires: python2-requests >= 2.14.2 -BuildRequires: python2-requests-mock -BuildRequires: python2-stestr -BuildRequires: python2-testtools BuildRequires: python3-PrettyTable >= 0.7.1 BuildRequires: python3-ddt BuildRequires: python3-fixtures @@ -49,30 +37,32 @@ BuildRequires: python3-requests >= 2.14.2 BuildRequires: python3-requests-mock BuildRequires: python3-stestr BuildRequires: python3-testtools -Requires: python-Babel >= 2.3.4 -Requires: python-PrettyTable >= 0.7.1 -Requires: python-keystoneauth1 >= 3.4.0 -Requires: python-oslo.i18n >= 3.15.3 -Requires: python-oslo.utils >= 3.33.0 -Requires: python-requests >= 2.14.2 -Requires: python-simplejson >= 3.5.1 -Requires: python-six >= 1.10.0 BuildArch: noarch -%if 0%{?suse_version} -Requires(post): update-alternatives -Requires(postun): update-alternatives -%else -# on RDO, update-alternatives is in chkconfig -Requires(post): chkconfig -Requires(postun): chkconfig -%endif -%python_subpackages %description This is a client for the OpenStack Cinder API (Block Storage. There's a Python API (the cinderclient module), and a command-line script (cinder). Each implements 100% of the OpenStack Cinder API. +%package -n python3-cinderclient +Summary: Python API and CLI for OpenStack Cinder +Group: Development/Languages/Python +Requires: python3-Babel >= 2.3.4 +Requires: python3-PrettyTable >= 0.7.1 +Requires: python3-keystoneauth1 >= 3.4.0 +Requires: python3-oslo.i18n >= 3.15.3 +Requires: python3-oslo.utils >= 3.33.0 +Requires: python3-requests >= 2.14.2 +Requires: python3-simplejson >= 3.5.1 +Requires: python3-six >= 1.10.0 + +%description -n python3-cinderclient +This is a client for the OpenStack Cinder API (Block Storage. There's a +Python API (the cinderclient module), and a command-line script (cinder). +Each implements 100% of the OpenStack Cinder API. + +This package contains the Python 3.x module. + %package -n python-cinderclient-doc Summary: Documentation for OpenStack Cinder API Client Group: Documentation/HTML @@ -91,7 +81,7 @@ This package contains auto-generated documentation. %py_req_cleanup %build -%{python_build} +%{py3_build} PBR_VERSION=5.0.0 %sphinx_build -b html doc/source doc/build/html PBR_VERSION=5.0.0 %sphinx_build -b man doc/source doc/build/man @@ -99,33 +89,24 @@ PBR_VERSION=5.0.0 %sphinx_build -b man doc/source doc/build/man rm -rf doc/build/html/.{doctrees,buildinfo} %install -%{python_install} +%{py3_install} # man page install -p -D -m 644 doc/build/man/cinder.1 %{buildroot}%{_mandir}/man1/cinder.1 # bash completion install -p -D -m 644 tools/cinder.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/cinder.bash_completion -%python_clone -a %{buildroot}%{_bindir}/cinder -%python_clone -a %{buildroot}%{_mandir}/man1/cinder.1 -%python_clone -a %{buildroot}%{_sysconfdir}/bash_completion.d/cinder.bash_completion - -%post -%{python_install_alternative cinder cinder.1 %{_sysconfdir}/bash_completion.d/cinder.bash_completion} - -%postun -%python_uninstall_alternative cinder %check rm cinderclient/tests/unit/test_shell.py -%python_exec -m stestr.cli run +python3 -m stestr.cli run -%files %{python_files} +%files -n python3-cinderclient %license LICENSE %doc README.rst ChangeLog -%{python_sitelib}/cinderclient -%{python_sitelib}/*.egg-info -%python_alternative %{_bindir}/cinder -%python_alternative %{_mandir}/man1/cinder.1 -%python_alternative %{_sysconfdir}/bash_completion.d/cinder.bash_completion +%{python3_sitelib}/cinderclient +%{python3_sitelib}/*.egg-info +%{_bindir}/cinder +%{_mandir}/man1/cinder.1* +%{_sysconfdir}/bash_completion.d/cinder.bash_completion %files -n python-cinderclient-doc %license LICENSE