From 021d191225cce657666bbbd23a0876295d1d2ffd58519193b1ce11aea6e5e1be Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Fri, 19 Jan 2018 05:56:59 +0000 Subject: [PATCH] - update to version 1.13.0 - Add plug-in summary for osc doc - Add --no-rollback option for stack cancel - Add `--converge` argument for osc stack update - No longer use oslotest.mockpatch - Use generic user for both zuul v2 and v3 - Modify error message encountered during stack update - Decode content before checking - Support --show-nested in openstack stack update --dry-run - Don't override sections in deep_update - Imported Translations from Zanata - Don't preformat stack output show list/map values - Remove vestigate HUDSON_PUBLISH_DOCS reference - Allow cancelling create_in_progress stacks with --no-rollback - Updated from global requirements - Use Sphinx 1.5 warning-is-error - Convert to singlespec OBS-URL: https://build.opensuse.org/package/show/Cloud:OpenStack:Factory/python-heatclient?expand=0&rev=43 --- _service | 4 +- python-heatclient-1.11.0.tar.gz | 3 - python-heatclient-1.13.0.tar.gz | 3 + python-heatclient.changes | 21 +++++ python-heatclient.spec | 131 ++++++++++++++++++++------------ 5 files changed, 107 insertions(+), 55 deletions(-) delete mode 100644 python-heatclient-1.11.0.tar.gz create mode 100644 python-heatclient-1.13.0.tar.gz diff --git a/_service b/_service index 9ca1a2e..1165e7e 100644 --- a/_service +++ b/_service @@ -1,8 +1,8 @@ - https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/openstack/python-heatclient/python-heatclient.spec.j2 + https://raw.githubusercontent.com/openstack/rpm-packaging/master/openstack/python-heatclient/python-heatclient.spec.j2 python-heatclient.spec - https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/global-requirements.txt + https://raw.githubusercontent.com/openstack/rpm-packaging/master/global-requirements.txt cloud-devel@suse.de gh,openstack,python-heatclient diff --git a/python-heatclient-1.11.0.tar.gz b/python-heatclient-1.11.0.tar.gz deleted file mode 100644 index 06172d2..0000000 --- a/python-heatclient-1.11.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4592df82c3abbffe22f2c223470074526245c9e960f8f5f055f840b60d94a155 -size 165700 diff --git a/python-heatclient-1.13.0.tar.gz b/python-heatclient-1.13.0.tar.gz new file mode 100644 index 0000000..abfc8ec --- /dev/null +++ b/python-heatclient-1.13.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6f03b93b7413beddee81b157149938c541ef08cb67412dd879dbfbc65a691d1 +size 165468 diff --git a/python-heatclient.changes b/python-heatclient.changes index 145101d..58ee7b0 100644 --- a/python-heatclient.changes +++ b/python-heatclient.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri Jan 19 05:52:48 UTC 2018 - cloud-devel@suse.de + +- update to version 1.13.0 + - Add plug-in summary for osc doc + - Add --no-rollback option for stack cancel + - Add `--converge` argument for osc stack update + - No longer use oslotest.mockpatch + - Use generic user for both zuul v2 and v3 + - Modify error message encountered during stack update + - Decode content before checking + - Support --show-nested in openstack stack update --dry-run + - Don't override sections in deep_update + - Imported Translations from Zanata + - Don't preformat stack output show list/map values + - Remove vestigate HUDSON_PUBLISH_DOCS reference + - Allow cancelling create_in_progress stacks with --no-rollback + - Updated from global requirements + - Use Sphinx 1.5 warning-is-error +- Convert to singlespec + ------------------------------------------------------------------- Mon Aug 7 09:10:40 UTC 2017 - cloud-devel@suse.de diff --git a/python-heatclient.spec b/python-heatclient.spec index cb2247d..f67ebe4 100644 --- a/python-heatclient.spec +++ b/python-heatclient.spec @@ -1,7 +1,7 @@ # # spec file for package python-heatclient # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,96 +16,127 @@ # -%global sname python-heatclient Name: python-heatclient -Version: 1.11.0 +Version: 1.13.0 Release: 0 Summary: Python API and CLI for OpenStack Heat License: Apache-2.0 Group: Development/Languages/Python -Url: https://launchpad.net/%{sname} -Source0: https://pypi.io/packages/source/p/%{sname}/%{sname}-%{version}.tar.gz +Url: https://launchpad.net/python-heatclient +Source0: https://files.pythonhosted.org/packages/source/p/python-heatclient/python-heatclient-1.13.0.tar.gz BuildRequires: openstack-macros -BuildRequires: python-PyYAML >= 3.10.0 -BuildRequires: python-cliff >= 2.6.0 BuildRequires: python-devel -BuildRequires: python-fixtures >= 3.0.0 -BuildRequires: python-mock >= 2.0 -BuildRequires: python-mox3 >= 0.7.0 -BuildRequires: python-osc-lib >= 1.5.1 -BuildRequires: python-oslo.serialization >= 1.10.0 -BuildRequires: python-oslotest >= 1.10.0 -BuildRequires: python-pbr >= 2.0.0 -BuildRequires: python-requests-mock >= 1.1 -BuildRequires: python-swiftclient >= 3.2.0 -BuildRequires: python-testrepository >= 0.0.18 -BuildRequires: python-testscenarios >= 0.4 -BuildRequires: python-testtools >= 1.4.0 -Requires: python-Babel >= 2.3.4 -Requires: python-PrettyTable >= 0.7.1 -Requires: python-PyYAML >= 3.10.0 -Requires: python-cliff >= 2.6.0 -Requires: python-iso8601 >= 0.1.11 -Requires: python-keystoneauth1 >= 2.21.0 -Requires: python-osc-lib >= 1.5.1 -Requires: python-oslo.i18n >= 2.1.0 -Requires: python-oslo.serialization >= 1.10.0 -Requires: python-oslo.utils >= 3.20.0 -Requires: python-requests >= 2.14.2 -Requires: python-six >= 1.9.0 -Requires: python-swiftclient >= 3.2.0 +BuildRequires: python2-PyYAML +BuildRequires: python2-cliff +BuildRequires: python2-fixtures +BuildRequires: python2-mock +BuildRequires: python2-mox3 +BuildRequires: python2-osc-lib +BuildRequires: python2-oslo.serialization +BuildRequires: python2-pbr +BuildRequires: python2-requests-mock +BuildRequires: python2-swiftclient +BuildRequires: python2-testrepository +BuildRequires: python2-testscenarios +BuildRequires: python2-testtools +BuildRequires: python3-PyYAML +BuildRequires: python3-cliff +BuildRequires: python3-devel +BuildRequires: python3-fixtures +BuildRequires: python3-mock +BuildRequires: python3-mox3 +BuildRequires: python3-osc-lib +BuildRequires: python3-oslo.serialization +BuildRequires: python3-pbr +BuildRequires: python3-requests-mock +BuildRequires: python3-swiftclient +BuildRequires: python3-testrepository +BuildRequires: python3-testscenarios +BuildRequires: python3-testtools +Requires: python-Babel +Requires: python-PrettyTable +Requires: python-PyYAML +Requires: python-cliff +Requires: python-iso8601 +Requires: python-keystoneauth1 +Requires: python-osc-lib +Requires: python-oslo.i18n +Requires: python-oslo.serialization +Requires: python-oslo.utils +Requires: python-requests +Requires: python-six +Requires: python-swiftclient 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 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 doc +%package -n python-heatclient-doc Summary: Documentation for OpenStack Heat API Client -Group: Documentation +Group: Documentation/HTML BuildRequires: python-Sphinx -BuildRequires: python-openstackdocstheme >= 1.11.0 +BuildRequires: python-openstackdocstheme -%description doc +%description -n python-heatclient-doc 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. This package contains auto-generated documentation. %prep -%autosetup -n %{sname}-%{version} +%autosetup -p1 -n python-heatclient-1.13.0 %py_req_cleanup sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg %build -%{py2_build} +%{python_build} %{__python2} setup.py build_sphinx --builder=html,man # remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} %install -%{py2_install} +%{python_install} # man page install -p -D -m 644 doc/build/man/heat.1 %{buildroot}%{_mandir}/man1/heat.1 # bash completion -install -p -D -m 644 tools/heat.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/%{name} +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 -%{__python2} setup.py testr +%{python_expand rm -rf .testrepository +$python setup.py testr +} -%files -%doc README.rst +%files %{python_files} %license LICENSE -%{python2_sitelib}/heatclient -%{python2_sitelib}/*.egg-info -%{_sysconfdir}/bash_completion.d//%{name} -%{_mandir}/man1/heat.1.gz -%{_bindir}/heat +%{python_sitelib}/heatclient +%{python_sitelib}/*.egg-info +%python_alternative %{_bindir}/heat +%python_alternative %{_mandir}/man1/heat.1 +%python_alternative %{_sysconfdir}/bash_completion.d/heat.bash_completion -%files doc +%files -n python-heatclient-doc %license LICENSE -%doc doc/build/html +%doc doc/build/html README.rst %changelog