- switch to python 3.x only build

OBS-URL: https://build.opensuse.org/package/show/Cloud:OpenStack:Factory/python-heatclient?expand=0&rev=55
This commit is contained in:
Dirk Mueller 2020-03-11 17:05:31 +00:00 committed by Git OBS Bridge
parent 890eb3fd17
commit f6b10c5fd3
2 changed files with 54 additions and 60 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 11 17:05:20 UTC 2020 - Dirk Mueller <dmueller@suse.com>
- switch to python 3.x only build
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 9 12:59:51 UTC 2019 - cloud-devel@suse.de Wed Oct 9 12:59:51 UTC 2019 - cloud-devel@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package python-heatclient # spec file for package python-heatclient
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -25,20 +25,6 @@ Group: Development/Languages/Python
URL: https://launchpad.net/python-heatclient URL: https://launchpad.net/python-heatclient
Source0: https://files.pythonhosted.org/packages/source/p/python-heatclient/python-heatclient-1.18.0.tar.gz Source0: https://files.pythonhosted.org/packages/source/p/python-heatclient/python-heatclient-1.18.0.tar.gz
BuildRequires: openstack-macros BuildRequires: openstack-macros
BuildRequires: python-devel
BuildRequires: python2-PyYAML >= 3.12
BuildRequires: python2-cliff >= 2.8.0
BuildRequires: python2-fixtures
BuildRequires: python2-mock
BuildRequires: python2-mox3
BuildRequires: python2-osc-lib >= 1.8.0
BuildRequires: python2-oslo.serialization >= 2.18.0
BuildRequires: python2-pbr >= 2.0.0
BuildRequires: python2-requests-mock
BuildRequires: python2-stestr
BuildRequires: python2-swiftclient >= 3.2.0
BuildRequires: python2-testscenarios
BuildRequires: python2-testtools
BuildRequires: python3-PyYAML >= 3.12 BuildRequires: python3-PyYAML >= 3.12
BuildRequires: python3-cliff >= 2.8.0 BuildRequires: python3-cliff >= 2.8.0
BuildRequires: python3-devel BuildRequires: python3-devel
@ -53,40 +39,53 @@ BuildRequires: python3-stestr
BuildRequires: python3-swiftclient >= 3.2.0 BuildRequires: python3-swiftclient >= 3.2.0
BuildRequires: python3-testscenarios BuildRequires: python3-testscenarios
BuildRequires: python3-testtools BuildRequires: python3-testtools
Requires: python-Babel >= 2.3.4 Requires: python3-Babel >= 2.3.4
Requires: python-PrettyTable >= 0.7.2 Requires: python3-PrettyTable >= 0.7.2
Requires: python-PyYAML >= 3.12 Requires: python3-PyYAML >= 3.12
Requires: python-cliff >= 2.8.0 Requires: python3-cliff >= 2.8.0
Requires: python-iso8601 >= 0.1.11 Requires: python3-iso8601 >= 0.1.11
Requires: python-keystoneauth1 >= 3.4.0 Requires: python3-keystoneauth1 >= 3.4.0
Requires: python-osc-lib >= 1.8.0 Requires: python3-osc-lib >= 1.8.0
Requires: python-oslo.i18n >= 3.15.3 Requires: python3-oslo.i18n >= 3.15.3
Requires: python-oslo.serialization >= 2.18.0 Requires: python3-oslo.serialization >= 2.18.0
Requires: python-oslo.utils >= 3.33.0 Requires: python3-oslo.utils >= 3.33.0
Requires: python-requests >= 2.14.2 Requires: python3-requests >= 2.14.2
Requires: python-six >= 1.10.0 Requires: python3-six >= 1.10.0
Requires: python-swiftclient >= 3.2.0 Requires: python3-swiftclient >= 3.2.0
BuildArch: noarch 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 %description
This is a client for the OpenStack Heat API. There's a Python API (the This is a client for the OpenStack Heat API. There's a Python API (the
heatclient module), and a command-line script (heat). Each implements 100% of heatclient module), and a command-line script (heat). Each implements 100% of
the OpenStack Heat API. the OpenStack Heat API.
%package -n python3-heatclient
Summary: Python API and CLI for OpenStack Heat
Group: Development/Languages/Python
Requires: python3-Babel >= 2.3.4
Requires: python3-PrettyTable >= 0.7.2
Requires: python3-PyYAML >= 3.12
Requires: python3-cliff >= 2.8.0
Requires: python3-iso8601 >= 0.1.11
Requires: python3-keystoneauth1 >= 3.4.0
Requires: python3-osc-lib >= 1.8.0
Requires: python3-oslo.i18n >= 3.15.3
Requires: python3-oslo.serialization >= 2.18.0
Requires: python3-oslo.utils >= 3.33.0
Requires: python3-requests >= 2.14.2
Requires: python3-six >= 1.10.0
Requires: python3-swiftclient >= 3.2.0
%description -n python3-heatclient
This is a client for the OpenStack Heat API. There's a Python API (the
heatclient module), and a command-line script (heat). Each implements 100% of
the OpenStack Heat API.
%package -n python-heatclient-doc %package -n python-heatclient-doc
Summary: Documentation for OpenStack Heat API Client Summary: Documentation for OpenStack Heat API Client
Group: Documentation/HTML Group: Documentation/HTML
BuildRequires: python-Sphinx BuildRequires: python3-Sphinx
BuildRequires: python-openstackdocstheme BuildRequires: python3-openstackdocstheme
%description -n python-heatclient-doc %description -n python-heatclient-doc
This is a client for the OpenStack Heat API. There's a Python API (the This is a client for the OpenStack Heat API. There's a Python API (the
@ -99,40 +98,30 @@ This package contains auto-generated documentation.
%py_req_cleanup %py_req_cleanup
%build %build
%{python_build} %{py3_build}
%{__python2} setup.py build_sphinx --builder=html,man PBR_VERSION=1.18.0 %sphinx_build -b html doc/source doc/build/html
PBR_VERSION=1.18.0 sphinx-build -b html doc/source doc/build/html PBR_VERSION=1.18.0 %sphinx_build -b man doc/source doc/build/man
PBR_VERSION=1.18.0 sphinx-build -b man doc/source doc/build/man
# remove the sphinx-build leftovers # remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo} rm -rf doc/build/html/.{doctrees,buildinfo}
%install %install
%{python_install} %{py3_install}
# man page # man page
install -p -D -m 644 doc/build/man/heat.1 %{buildroot}%{_mandir}/man1/heat.1 install -p -D -m 644 doc/build/man/heat.1 %{buildroot}%{_mandir}/man1/heat.1
# bash completion # bash completion
install -p -D -m 644 tools/heat.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/heat.bash_completion install -p -D -m 644 tools/heat.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/heat.bash_completion
%python_clone -a %{buildroot}%{_bindir}/heat
%python_clone -a %{buildroot}%{_mandir}/man1/heat.1
%python_clone -a %{buildroot}%{_sysconfdir}/bash_completion.d/heat.bash_completion
%post
%{python_install_alternative heat heat.1 %{_sysconfdir}/bash_completion.d/heat.bash_completion}
%postun
%python_uninstall_alternative heat
%check %check
%python_exec -m stestr.cli run python3 -m stestr.cli run
%files %{python_files} %files -n python3-heatclient
%license LICENSE %license LICENSE
%{python_sitelib}/heatclient %{python3_sitelib}/heatclient
%{python_sitelib}/*.egg-info %{python3_sitelib}/*.egg-info
%python_alternative %{_bindir}/heat %{_bindir}/heat
%python_alternative %{_mandir}/man1/heat.1 %{_mandir}/man1/heat.1*
%python_alternative %{_sysconfdir}/bash_completion.d/heat.bash_completion %{_sysconfdir}/bash_completion.d/heat.bash_completion
%files -n python-heatclient-doc %files -n python-heatclient-doc
%license LICENSE %license LICENSE