diff --git a/0001-Fix-doc-build-if-git-is-absent.patch b/0001-Fix-doc-build-if-git-is-absent.patch new file mode 100644 index 0000000..f298ce2 --- /dev/null +++ b/0001-Fix-doc-build-if-git-is-absent.patch @@ -0,0 +1,46 @@ +From 43862612783a0021664b7ece442681cff4899003 Mon Sep 17 00:00:00 2001 +From: Thomas Bechtold +Date: Wed, 13 Jul 2016 17:07:42 +0200 +Subject: [PATCH] Fix doc build if git is absent + +When building packages if git is absent, then we should not set +html_last_updated_fmt. It can still be set via the -D switch +when building with sphinx-build. + +Change-Id: If6585c62ed783f38b2b80afa7fc9795f7e9426a6 +Closes-Bug: #1552251 +--- + doc/source/conf.py | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/doc/source/conf.py b/doc/source/conf.py +index e483b53..8bb3fe4 100644 +--- a/doc/source/conf.py ++++ b/doc/source/conf.py +@@ -25,6 +25,7 @@ + + import os + import subprocess ++import warnings + + # If extensions (or modules to document with autodoc) are in another directory, + # add these directories to sys.path here. If the directory is relative to the +@@ -149,8 +150,13 @@ html_theme_options = { + # html_last_updated_fmt = '%b %d, %Y' + git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", + "-n1"] +-html_last_updated_fmt = subprocess.Popen( +- git_cmd, stdout=subprocess.PIPE).communicate()[0] ++try: ++ html_last_updated_fmt = subprocess.Popen( ++ git_cmd, stdout=subprocess.PIPE).communicate()[0] ++except Exception: ++ warnings.warn('Cannot get last updated time from git repository. ' ++ 'Not setting "html_last_updated_fmt".') ++ + + # If true, SmartyPants will be used to convert quotes and dashes to + # typographically correct entities. +-- +2.9.0 + diff --git a/python-heatclient-0.8.0.tar.gz b/python-heatclient-0.8.0.tar.gz deleted file mode 100644 index 32aa6e8..0000000 --- a/python-heatclient-0.8.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cd1c855ee21f18bfffbc7269e40c417b953d0855aa3cc8b56d778b8612467d5 -size 121399 diff --git a/python-heatclient-1.1.0.tar.gz b/python-heatclient-1.1.0.tar.gz new file mode 100644 index 0000000..1567609 --- /dev/null +++ b/python-heatclient-1.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe8f0fb4b1c2a5e641a8e79e9c743757e85b169e6df65797686fd910f3f477e8 +size 166176 diff --git a/python-heatclient.changes b/python-heatclient.changes index d17116d..a89ee5d 100644 --- a/python-heatclient.changes +++ b/python-heatclient.changes @@ -1,3 +1,137 @@ +------------------------------------------------------------------- +Wed Jul 13 14:58:50 UTC 2016 - tbechtold@suse.com + +- update to 1.1.0: + * Updated from global requirements + * Fix regression handling relative paths in environment + * Update .gitreview for stable/mitaka + * Use poll_for_events for "openstack stack delete" + * Add OSC plugin for openstack orchestation service list + * Add OSC plugin for openstack orchestation build info + * Strip any whitespace before checking for json + * Add OSC plugin for stack resource mark unhealthy + * Implement stack event list --follow + * Replace assertEqual(None, *) with assertIsNone + * Prompt user before deleting stack if tty + * Add more readonly openstack client funcitonal tests + * Use poll_for_events for "openstack stack " + * Use poll_for_events for "openstack stack adopt" + * Use poll_for_events for "openstack stack update" + * Use poll_for_events for "openstack stack create" + * poll_for_events fall back to stack get + * Fix collision with update and update cancel + * Update OSC metavars + * OpenstackClient plugin for software deployment output show + * Move poll_for_events to event_utils + * Adds --filter to search for resources + * Stack resource search + * OpenstackClient plugin for software deployment metadata show + * Add stack hook poll and clear to openstack client + * OpenstackClient plugin for deployment create + * Remove the only-value flag of output-show + * Changes to support server-side environment resolution + * OSC plugin for stack snapshot delete + * OSC plugin for stack snapshot create + * Use yaml.safe_load() instead of yaml.load() + * Use oslo.utils.reflection to extract class name + * Add OpenstackClient plugin for software deployment show + * Add openstack client stack snapshot restore + * Add openstack client stack resource signal + * OSC plugin for stack resource show and list + * OpenstackClient plugin for event list + * OpenstackClient plugin for event show + * OpenstackClient plugin for stack delete + * Fix resource_type osc entrypoint + * OSC plugin for software config show + * Add openstack cli stack actions + * Add openstack client resource type list and show + * OSC plugin for stack snapshot show + * Add openstack client software config create + * OpenstackClient plugin for template show + * OpenStackClient plugin for stack output list + * OpenstackClient plugin for stack output show + * Add openstack client software config list + * Add openstack client stack resource metadata show + * Adds ignore_errors for template-validate command + * Add heat client support for Resource set health + * Sort osc command entry points + * OpenstackClient plugin for template function list + * OpenstackClient plugin for template version list + * Add OpenstackClient plugin for software deployment list + * Add openstack client software config delete + * OpenstackClient plugin for stack abandon + * OpenstackClient plugin for stack adopt + * OpenstackClient plugin for software deployment delete + * Add openstack client stack basic funtion tests + * Remove incorrectly used "# flake8: noqa" + * Update translation setup + * Edit backslashes for lines continuations + * Raise CommandError when Any of stack/deployment/config delete failed + * Ignore restricted_actions key + * Add formatters for 'tags' in method _do_stack_show + * Enable osc extension in setup.cfg + * Disable osc extension for 0.9.0 release + * Remove argparse from requirements + * Add openstack client stack snapshot list + * Add --dry-run option to openstack stack create + * Include keystone message when authentication failed + * Add show_nested support to update --dry-run + * Update template_utils to support object env's + * Improve "openstack stack create --wait" help message + * OpenstackClient plugin for stack update + * OpenstackClient plugin for stack create + * Validate for empty file for stack-adopt + * Misspelling in message + * Add resolve_outputs parameter to stack get method + * Allow event specification in the environment + * Add debug testenv in tox + * Replace deprecated library function os.popen() with subprocess + * Update --template-object to support nested stacks + * Added -P support to template-validate + * Fix error message on authentication failure + * Change LOG.warn to LOG.warning + * use keystoneclient exceptions instead of oslo-incubator code + * Resolve outputs from stack object + * Use stack lookup for getting stack name/id + * Replace assertEqual(None, *) with assertIsNone in tests + * Removes MANIFEST.in as it is not needed explicitely by PBR + * Fix Resource.__eq__ mismatch semantics of object equal + * remove py26 specific code from heatclient + * Deprecated tox -downloadcache option removed + * remove py26 support tag in setup.cfg + * Add JsonFormat display option + * Remove py26 support + * Delete python bytecode before every test run + * Enable pep8 E123 test + * Enable pep8 E126 test + * Enable pep8 E128 test + * Enable pep8 E265 test + * Enable pep8 E241 test + * Enable pep8 E713 test + * Use six.iteritems() instead of iter(XXX.items()) + * Fix error when listing stacks + * OpenStack typo + * Enable pep8 H202 test + * Enable pep8 H238 test + * Enable pep8 H405 tests + * Add output API calls implementations + * Refine event_log_formatter output + * Last sync from oslo-incubator + * Delete the corresponding config when deleting a deployment + * OpenStackClient plugin for stack list + * Fix environment files parsing bug for stack-adopt + * Support to list software configs + * Ignore .eggs + * OpenStackClient plugin for stack show + * Fix error in stack-list metadata + * improve readme content + * Add option for detailed template error + * Add standard code coverage configuration file + * Add PATCH support for stack-update --dry-run + * Fix the bug when showing event in log format +- Adjust Requires +- Add 0001-Fix-doc-build-if-git-is-absent.patch + ------------------------------------------------------------------- Sat Sep 19 07:01:26 UTC 2015 - tbechtold@suse.com diff --git a/python-heatclient.spec b/python-heatclient.spec index c19f902..81ff496 100644 --- a/python-heatclient.spec +++ b/python-heatclient.spec @@ -1,7 +1,7 @@ # # spec file for package python-heatclient # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -19,7 +19,7 @@ %define component heatclient Name: python-%{component} -Version: 0.8.0 +Version: 1.1.0 Release: 0 Summary: OpenStack Orchestration (Heat) API Client License: Apache-2.0 @@ -27,6 +27,8 @@ Group: Development/Languages/Python Url: http://launchpad.net/python-heatclient Source: https://pypi.python.org/packages/source/p/python-heatclient/python-heatclient-%{version}.tar.gz Source99: %name-rpmlintrc +# PATCH-FIX-UPSTREAM 0001-Fix-doc-build-if-git-is-absent.patch -- https://review.openstack.org/341605 +Patch1: 0001-Fix-doc-build-if-git-is-absent.patch BuildRequires: openstack-suse-macros BuildRequires: python-base BuildRequires: python-setuptools @@ -41,14 +43,15 @@ Requires: python >= 2.6.8 Requires: python-Babel >= 1.3 Requires: python-PrettyTable >= 0.7 Requires: python-PyYAML >= 3.1.0 -Requires: python-argparse +Requires: python-cliff >= 1.15.0 Requires: python-iso8601 >= 0.1.9 Requires: python-keystoneclient >= 1.6.0 -Requires: python-oslo.i18n >= 1.5.0 -Requires: python-oslo.serialization >= 1.4.0 -Requires: python-oslo.utils >= 2.0.0 +Requires: python-openstackclient >= 2.1.0 +Requires: python-oslo.i18n >= 2.1.0 +Requires: python-oslo.serialization >= 1.10.0 +Requires: python-oslo.utils >= 3.5.0 Requires: python-pbr >= 1.6 -Requires: python-requests >= 2.5.2 +Requires: python-requests >= 2.8.1 Requires: python-six >= 1.9.0 Requires: python-swiftclient >= 2.2.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -78,8 +81,8 @@ Requires: python-fixtures >= 1.3.1 Requires: python-mock >= 1.2 Requires: python-mox3 >= 0.7.0 Requires: python-oslotest >= 1.10.0 -Requires: python-requests-mock >= 0.6.0 -Requires: python-tempest-lib >= 0.6.1 +Requires: python-requests-mock >= 0.7.0 +Requires: python-tempest-lib >= 0.14.0 Requires: python-testrepository >= 0.0.18 Requires: python-testscenarios >= 0.4 Requires: python-testtools >= 1.4.0 @@ -89,7 +92,7 @@ This package contains testsuite files for %{name}. %prep %setup -q -%openstack_cleanup_prep +%patch1 -p1 echo %{version} > heatclient/versioninfo %build