Hello community,
here is the log from the commit of package python-heatclient for
openSUSE:Factory checked in at 2013-04-29 14:17:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-heatclient (Old)
and /work/SRC/openSUSE:Factory/.python-heatclient.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-heatclient", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-heatclient/python-heatclient.changes
2013-01-17 10:00:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-heatclient.new/python-heatclient.changes
2013-04-29 14:17:07.000000000 +0200
@@ -0,0 +1,55 @@
+-------------------------------------------------------------------
+Mon Mar 18 10:43:21 UTC 2013 - speili...@suse.com
+
+- Drop +git.$TIMESTAMP.$COMMITHASH version suffix
+
+--------------------------------------------------------------------
+Mon Mar 11 10:04:50 UTC 2013 - cloud-de...@suse.de
+
+- Update to version 0.2.0+git.1362996290.841ded0:
+ + Remove warlock from pip-requires as it is not used
+
+--------------------------------------------------------------------
+Tue Mar 5 16:52:17 UTC 2013 - cloud-de...@suse.de
+
+- Update to version 0.2.0+git.1362502337.b6ff6d2:
+ + Change --disable-rollback option to --enable-rollback
+
+--------------------------------------------------------------------
+Thu Feb 28 12:53:02 UTC 2013 - sasc...@suse.de
+
+- Update to version 0.2.0+git.1362055982.ec0a708:
+ + Don't add 'dev' to tag_build
+
+--------------------------------------------------------------------
+Sun Feb 24 18:19:14 UTC 2013 - cloud-de...@suse.de
+
+- Update to version 0.2.0dev+git.1361729954.f1baa75:
+ + heatclient : correct timeout parameter name
+ + heatclient : Add --disable-rollback option
+
+-------------------------------------------------------------------
+Fri Feb 22 11:27:01 UTC 2013 - sasc...@suse.de
+
+- BuildRequire openstack-suse-macros instead of openstack-macros
+
+--------------------------------------------------------------------
+Mon Feb 18 09:40:19 UTC 2013 - cloud-de...@suse.de
+
+- Update to version 0.2.0dev+git.1361180419.84b7969:
+ + Return the exit code from tox to callers of run_tests.sh
+
+--------------------------------------------------------------------
+Mon Feb 4 12:04:33 UTC 2013 - dmuel...@suse.com
+
+- Update to version 0.2.0dev+git.1359979473.bcaf6c4:
+ + Add switch to disable token authentication.
+ + Don't log at all if debugging is not turned on
+
+--------------------------------------------------------------------
+Mon Jan 14 13:00:00 UTC 2013 - sasc...@suse.de
+
+- Update to version 0.2.0dev+git.1358164800.7f50a72:
+ + Fixes required for packaging
+- Updated requirements
+
@@ -2 +57 @@
-Wed Jan 9 08:55:36 UTC 2013 - cloud-de...@suse.de
+Wed Jan 9 08:55:36 UTC 2013 - sasc...@suse.de
@@ -10 +65 @@
-Wed Dec 19 15:03:10 UTC 2012 - cloud-de...@suse.de
+Wed Dec 19 15:03:10 UTC 2012 - sasc...@suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-heatclient.spec ++++++
--- /var/tmp/diff_new_pack.9U3CgV/_old 2013-04-29 14:17:08.000000000 +0200
+++ /var/tmp/diff_new_pack.9U3CgV/_new 2013-04-29 14:17:08.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-heatclient
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products 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,25 +19,28 @@
%define component heatclient
Name: python-%{component}
-Version: 0.1.0.2.gb1b5455+git.1357718178.b1b5455
+Version: 0.2.0
Release: 0
-License: Apache-2.0
Summary: Openstack Orchestration (Heat) API Client
-Url: http://launchpad.net/python-heatclient
+License: Apache-2.0
Group: Development/Languages/Python
+Url: http://launchpad.net/python-heatclient
Source: python-heatclient-master.tar.gz
-BuildRequires: openstack-macros
+BuildRequires: openstack-suse-macros
BuildRequires: python-base
BuildRequires: python-distribute
# Documentation build requirements:
+BuildRequires: python-Sphinx
BuildRequires: python-httplib2
+BuildRequires: python-iso8601 >= 0.1.4
BuildRequires: python-keystoneclient
BuildRequires: python-prettytable
-BuildRequires: python-Sphinx
Requires: python >= 2.6.8
Requires: python-argparse
-Requires: python-prettytable >= 0.6
-Requires: python-keystoneclient >= 0.1.2
+Requires: python-httplib2
+Requires: python-iso8601 >= 0.1.4
+Requires: python-keystoneclient >= 0.2
+Requires: python-prettytable >= 0.5
Requires: python-warlock < 2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
@@ -65,28 +68,26 @@
Requires: python-mox
Requires: python-nose
Requires: python-nose-exclude
+Requires: python-nosehtmloutput
Requires: python-nosexcover
Requires: python-openstack.nose_plugin
-Requires: python-nosehtmloutput
-Requires: python-setuptools-git >= 0.4
+Requires: python-pep8
%description test
This package contains testsuite files for %{name}.
%prep
-%setup -q -n python-heatclient-0.1.0.2.gb1b5455
+%setup -q -n python-heatclient-0.2.0
%openstack_cleanup_prep
echo %{version} > heatclient/versioninfo
%build
python setup.py build
python setup.py build_sphinx
-# Currently no man pages:
-#python setup.py build_sphinx -b man
rm -rf doc/build/html/{.buildinfo,.doctrees}
%install
-python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
--install-data=%{python_sitelib}
### test subpackage
%openstack_test_package_install
++++++ _service ++++++
--- /var/tmp/diff_new_pack.9U3CgV/_old 2013-04-29 14:17:08.000000000 +0200
+++ /var/tmp/diff_new_pack.9U3CgV/_new 2013-04-29 14:17:08.000000000 +0200
@@ -2,5 +2,6 @@
<service name="git_tarballs" mode="disabled">
<param
name="url">http://tarballs.openstack.org/python-heatclient/python-heatclient-master.tar.gz</param>
<param name="email">cloud-de...@suse.de</param>
+ <param name="plain-version">True</param>
</service>
</services>
++++++ python-heatclient-master.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/.gitignore
new/python-heatclient-0.2.0/.gitignore
--- old/python-heatclient-0.1.0.2.gb1b5455/.gitignore 2013-01-09
01:33:45.000000000 +0100
+++ new/python-heatclient-0.2.0/.gitignore 1970-01-01 01:00:00.000000000
+0100
@@ -1,19 +0,0 @@
-.coverage
-.venv
-*,cover
-cover
-*.pyc
-.idea
-*.swp
-*~
-AUTHORS
-build
-dist
-ChangeLog
-run_tests.err.log
-.tox
-doc/source/api
-*.egg
-heatclient/versioninfo
-python_heatclient.egg-info
-*.log
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/.gitreview
new/python-heatclient-0.2.0/.gitreview
--- old/python-heatclient-0.1.0.2.gb1b5455/.gitreview 2013-01-09
01:33:45.000000000 +0100
+++ new/python-heatclient-0.2.0/.gitreview 1970-01-01 01:00:00.000000000
+0100
@@ -1,4 +0,0 @@
-[gerrit]
-host=review.openstack.org
-port=29418
-project=openstack/python-heatclient.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/AUTHORS
new/python-heatclient-0.2.0/AUTHORS
--- old/python-heatclient-0.1.0.2.gb1b5455/AUTHORS 2013-01-09
01:34:58.000000000 +0100
+++ new/python-heatclient-0.2.0/AUTHORS 2013-03-18 00:22:42.000000000 +0100
@@ -1,5 +1,9 @@
+Angus Salkeld <asalk...@redhat.com>
Dan Radez <dra...@redhat.com>
+Dirk Mueller <d...@dmllr.de>
+Ian Main <im...@redhat.com>
Jeremy Stanley <fu...@yuggoth.org>
Monty Taylor <mord...@inaugust.com>
Steve Baker <sba...@redhat.com>
-Steven Dake <sd...@redhat.com>
\ No newline at end of file
+Steven Dake <sd...@redhat.com>
+Steven Hardy <sha...@redhat.com>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/ChangeLog
new/python-heatclient-0.2.0/ChangeLog
--- old/python-heatclient-0.1.0.2.gb1b5455/ChangeLog 2013-01-09
01:34:58.000000000 +0100
+++ new/python-heatclient-0.2.0/ChangeLog 2013-03-18 00:22:42.000000000
+0100
@@ -1,3 +1,171 @@
+commit 3740ae9fcb1ed4dc39796ceccbf0e7000be71002
+Author: Dirk Mueller <d...@dmllr.de>
+Date: Fri Mar 15 17:41:41 2013 +0100
+
+ Allow for prettytable 0.7.x as well
+
+ Relax requirements to >= 0.6, < 0.8, as 0.7.x seems to
+ work as well. Lower has been raised to 0.6 to match
openstack-common/requirements
+
+ Change-Id: Ic8ce818016ae7d9fbfeb1548b612f8d9e8ae7c42
+
+ tools/pip-requires | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 841ded0a5a1c0ed7ef07b7662381d623ded403c4
+Author: Angus Salkeld <asalk...@redhat.com>
+Date: Thu Mar 7 15:57:44 2013 +1100
+
+ Remove warlock from pip-requires as it is not used
+
+ This is a hangover from copying from glanceclient
+
+ Change-Id: Id81035b5432b65e776217f6b3e7e62c4447d4541
+ Signed-off-by: Angus Salkeld <asalk...@redhat.com>
+
+ tools/pip-requires | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit b6ff6d2eecdaa6840ecadd8bb30a9de1d3dad92b
+Author: Steven Hardy <sha...@redhat.com>
+Date: Mon Mar 4 15:53:15 2013 +0000
+
+ Change --disable-rollback option to --enable-rollback
+
+ Due to bug 1131303, the engine default is changing to disable
+ rollback by default, so we instead need an option to allow
+ users to enable this functionality
+
+ fixes bug 1144630
+
+ Change-Id: I509e616e20a3e4750ffcefe6e72c52e5f60445bc
+
+ heatclient/v1/shell.py | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit ec0a708c998656c1500897436cdcf3bb2a42f2b4
+Author: Steve Baker <sba...@redhat.com>
+Date: Wed Feb 27 10:28:30 2013 +1300
+
+ Don't add 'dev' to tag_build
+
+ Change-Id: I3b37b4bf29fab29ffcb471b7f9f4707c8d5882fe
+
+ setup.cfg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit f1baa757c38c21dfb4f6ac43670257729f958200
+Author: Steven Hardy <sha...@redhat.com>
+Date: Mon Feb 18 15:07:21 2013 +0000
+
+ heatclient : Add --disable-rollback option
+
+ Adds -D/--disable-rollback option to align with new heat-cfn
+ option
+
+ Change-Id: I4a997df0b63d19a25f2047710809a80520187f9f
+ Signed-off-by: Steven Hardy <sha...@redhat.com>
+
+ heatclient/v1/shell.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit 776f25099e90d31d05e28eb7f6fdc69b63d74478
+Author: Steven Hardy <sha...@redhat.com>
+Date: Mon Feb 18 13:54:42 2013 +0000
+
+ heatclient : correct timeout parameter name
+
+ The timeout parameter needs to be timeout_mins to match the
+ engine API or the parameter will not be recognized by the
+ engine.
+
+ fixes bug 1129348
+
+ Change-Id: I489364a2abed376f35bf2da24915db30c982e61b
+ Signed-off-by: Steven Hardy <sha...@redhat.com>
+
+ heatclient/v1/shell.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 84b7969b72af218f948078eb8ee46a97783f24de
+Author: Dirk Mueller <d...@dmllr.de>
+Date: Mon Feb 11 18:01:27 2013 +0100
+
+ Return the exit code from tox to callers of run_tests.sh
+
+ Invoking PIPESTATUS appears to be volatile in my environment,
+ after the if condition it is already again 0, even if it was
+ non-zero before. Capture the result permanently in a variable
+ and use that one consistently.
+
+ Also handle the just-pep8 case correctly.
+
+ Change-Id: Icca8c00c8d2189da1a133db277c9071c2d6c880b
+
+ run_tests.sh | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit bcaf6c4d9327a221091302fea807860ae538994c
+Author: Ian Main <im...@redhat.com>
+Date: Thu Jan 31 15:42:24 2013 -0800
+
+ Add switch to disable token authentication.
+
+ This patch allows you to disable token authentication with keystone so
+ that the client can be used with other backends in heat.
+
+ Change-Id: I4b35df82a782ddbc8532e85a7b9d532b327d010a
+ Signed-off-by: Ian Main <im...@redhat.com>
+
+ heatclient/common/http.py | 3 +++
+ heatclient/shell.py | 35 +++++++++++++++++++++++------------
+ 2 files changed, 26 insertions(+), 12 deletions(-)
+
+commit 8f268e44cdc8b8a434aa510a1c389793a1ea2872
+Author: Angus Salkeld <asalk...@redhat.com>
+Date: Fri Jan 25 12:03:01 2013 +1100
+
+ Don't log at all if debugging is not turned on
+
+ Else the http module prints this out on each command - yuk
+
+ "INFO Starting new HTTP connection (1): 127.0.0.1"
+
+ Change-Id: I6e8900106051914b7ddc0a216c6a7864f4ea38e0
+
+ heatclient/shell.py | 4 ----
+ 1 file changed, 4 deletions(-)
+
+commit 7f50a72aacd9e48ef682037ab11f372a52cc838a
+Author: Steve Baker <sba...@redhat.com>
+Date: Thu Jan 10 11:07:06 2013 +1300
+
+ Fixes required for packaging
+
+ - Add versioninfo to the data_files
+ - Excludes for MANIFEST.in
+
+ Part of blueprint rpm-package
+ Change-Id: Ia629c9e08d070785d8ee0984913e62064e94ebb4
+
+ MANIFEST.in | 5 +++--
+ setup.py | 1 +
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 706cbdb57b2ed9cca29f04db0cc3700f7a04f985
+Merge: 15be62b bc972b2
+Author: Jenkins <jenk...@review.openstack.org>
+Date: Wed Jan 9 20:01:11 2013 +0000
+
+ Merge "Switch to using version.canonical_version_string"
+
+commit 15be62b7f78c70829edd464cb0d209572aa040ce
+Merge: b1b5455 712e172
+Author: Jenkins <jenk...@review.openstack.org>
+Date: Wed Jan 9 20:00:28 2013 +0000
+
+ Merge "Update to latest oslo-incubator"
+
commit b1b545581dc7bec76ffb5a23a0c6fac6111e492f
Author: Steve Baker <sba...@redhat.com>
Date: Wed Jan 9 10:51:40 2013 +1300
@@ -13,6 +181,35 @@
tools/pip-requires | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
+commit bc972b214ee03d2b04ae9fe099e3ad59fd735b4b
+Author: Steve Baker <sba...@redhat.com>
+Date: Fri Jan 4 16:53:10 2013 +1300
+
+ Switch to using version.canonical_version_string
+
+ Change-Id: Id095c61325b0d64bc77b742abf72958aeb4cde4d
+
+ heatclient/version.py | 3 +++
+ setup.cfg | 5 +++++
+ setup.py | 5 ++++-
+ 3 files changed, 12 insertions(+), 1 deletion(-)
+
+commit 712e1726adcf30f48df3f855c14c2a5e80657dbe
+Author: Steve Baker <sba...@redhat.com>
+Date: Fri Jan 4 16:58:11 2013 +1300
+
+ Update to latest oslo-incubator
+
+ The included changes to version.py are required for
+ correctly generating the versioninfo file.
+
+ Change-Id: I3534f4de099dc6d7462d896e9b18a8f776ee4daf
+
+ heatclient/openstack/common/importutils.py | 2 +-
+ heatclient/openstack/common/setup.py | 46 +++++++++++++++++++---------
+ heatclient/openstack/common/version.py | 37 +++++++++-------------
+ 3 files changed, 46 insertions(+), 39 deletions(-)
+
commit c7130de0a979c8adb32fd52efd41ae05456d9d55
Author: Steve Baker <sba...@redhat.com>
Date: Tue Dec 11 13:48:55 2012 +1300
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/MANIFEST.in
new/python-heatclient-0.2.0/MANIFEST.in
--- old/python-heatclient-0.1.0.2.gb1b5455/MANIFEST.in 2013-01-09
01:33:45.000000000 +0100
+++ new/python-heatclient-0.2.0/MANIFEST.in 2013-03-18 00:21:09.000000000
+0100
@@ -1,10 +1,11 @@
include AUTHORS
-include HACKING
include LICENSE
-include README.rst
+include README.md
include ChangeLog
include tox.ini
include heatclient/versioninfo
recursive-include doc *
recursive-include tests *
recursive-include tools *
+exclude .gitignore
+exclude .gitreview
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/PKG-INFO
new/python-heatclient-0.2.0/PKG-INFO
--- old/python-heatclient-0.1.0.2.gb1b5455/PKG-INFO 2013-01-09
01:34:58.000000000 +0100
+++ new/python-heatclient-0.2.0/PKG-INFO 2013-03-18 00:22:43.000000000
+0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: python-heatclient
-Version: 0.1.0.2.gb1b5455
+Version: 0.2.0
Summary: Client library for Heat orchestration API
Home-page: https://github.com/openstack/python-heatclient
Author: Heat API Developers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-heatclient-0.1.0.2.gb1b5455/heatclient/common/http.py
new/python-heatclient-0.2.0/heatclient/common/http.py
--- old/python-heatclient-0.1.0.2.gb1b5455/heatclient/common/http.py
2013-01-09 01:33:45.000000000 +0100
+++ new/python-heatclient-0.2.0/heatclient/common/http.py 2013-03-18
00:21:09.000000000 +0100
@@ -50,6 +50,7 @@
def __init__(self, endpoint, **kwargs):
self.endpoint = endpoint
+ self.auth_url = kwargs.get('auth_url')
self.auth_token = kwargs.get('token')
self.username = kwargs.get('username')
self.password = kwargs.get('password')
@@ -131,6 +132,8 @@
kwargs['headers'].setdefault('User-Agent', USER_AGENT)
if self.auth_token:
kwargs['headers'].setdefault('X-Auth-Token', self.auth_token)
+ if self.auth_url:
+ kwargs['headers'].setdefault('X-Auth-Url', self.auth_url)
if self.username:
kwargs['headers'].setdefault('X-Auth-User', self.username)
if self.password:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-heatclient-0.1.0.2.gb1b5455/heatclient/openstack/common/importutils.py
new/python-heatclient-0.2.0/heatclient/openstack/common/importutils.py
---
old/python-heatclient-0.1.0.2.gb1b5455/heatclient/openstack/common/importutils.py
2013-01-09 01:33:45.000000000 +0100
+++ new/python-heatclient-0.2.0/heatclient/openstack/common/importutils.py
2013-03-18 00:21:09.000000000 +0100
@@ -29,7 +29,7 @@
try:
__import__(mod_str)
return getattr(sys.modules[mod_str], class_str)
- except (ValueError, AttributeError), exc:
+ except (ValueError, AttributeError):
raise ImportError('Class %s cannot be found (%s)' %
(class_str,
traceback.format_exception(*sys.exc_info())))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-heatclient-0.1.0.2.gb1b5455/heatclient/openstack/common/setup.py
new/python-heatclient-0.2.0/heatclient/openstack/common/setup.py
--- old/python-heatclient-0.1.0.2.gb1b5455/heatclient/openstack/common/setup.py
2013-01-09 01:33:45.000000000 +0100
+++ new/python-heatclient-0.2.0/heatclient/openstack/common/setup.py
2013-03-18 00:21:09.000000000 +0100
@@ -31,13 +31,13 @@
def parse_mailmap(mailmap='.mailmap'):
mapping = {}
if os.path.exists(mailmap):
- fp = open(mailmap, 'r')
- for l in fp:
- l = l.strip()
- if not l.startswith('#') and ' ' in l:
- canonical_email, alias = [x for x in l.split(' ')
- if x.startswith('<')]
- mapping[alias] = canonical_email
+ with open(mailmap, 'r') as fp:
+ for l in fp:
+ l = l.strip()
+ if not l.startswith('#') and ' ' in l:
+ canonical_email, alias = [x for x in l.split(' ')
+ if x.startswith('<')]
+ mapping[alias] = canonical_email
return mapping
@@ -54,7 +54,8 @@
def get_reqs_from_files(requirements_files):
for requirements_file in requirements_files:
if os.path.exists(requirements_file):
- return open(requirements_file, 'r').read().split('\n')
+ with open(requirements_file, 'r') as fil:
+ return fil.read().split('\n')
return []
@@ -116,8 +117,12 @@
def _run_shell_command(cmd):
- output = subprocess.Popen(["/bin/sh", "-c", cmd],
- stdout=subprocess.PIPE)
+ if os.name == 'nt':
+ output = subprocess.Popen(["cmd.exe", "/C", cmd],
+ stdout=subprocess.PIPE)
+ else:
+ output = subprocess.Popen(["/bin/sh", "-c", cmd],
+ stdout=subprocess.PIPE)
out = output.communicate()
if len(out) == 0:
return None
@@ -135,15 +140,17 @@
_run_shell_command("git fetch origin +refs/meta/*:refs/remotes/meta/*")
milestone_cmd = "git show meta/openstack/release:%s" % branch_name
milestonever = _run_shell_command(milestone_cmd)
- if not milestonever:
- milestonever = ""
+ if milestonever:
+ first_half = "%s~%s" % (milestonever, datestamp)
+ else:
+ first_half = datestamp
+
post_version = _get_git_post_version()
# post version should look like:
# 0.1.1.4.gcc9e28a
# where the bit after the last . is the short sha, and the bit between
# the last and second to last is the revno count
(revno, sha) = post_version.split(".")[-2:]
- first_half = "%s~%s" % (milestonever, datestamp)
second_half = "%s%s.%s" % (revno_prefix, revno, sha)
return ".".join((first_half, second_half))
@@ -236,7 +243,8 @@
def write_versioninfo(project, version):
"""Write a simple file containing the version of the package."""
- open(os.path.join(project, 'versioninfo'), 'w').write("%s\n" % version)
+ with open(os.path.join(project, 'versioninfo'), 'w') as fil:
+ fil.write("%s\n" % version)
def get_cmdclass():
@@ -268,6 +276,9 @@
from sphinx.setup_command import BuildDoc
class LocalBuildDoc(BuildDoc):
+
+ builders = ['html', 'man']
+
def generate_autoindex(self):
print "**Autodocumenting from %s" % os.path.abspath(os.curdir)
modules = {}
@@ -303,14 +314,19 @@
if not os.getenv('SPHINX_DEBUG'):
self.generate_autoindex()
- for builder in ['html', 'man']:
+ for builder in self.builders:
self.builder = builder
self.finalize_options()
self.project = self.distribution.get_name()
self.version = self.distribution.get_version()
self.release = self.distribution.get_version()
BuildDoc.run(self)
+
+ class LocalBuildLatex(LocalBuildDoc):
+ builders = ['latex']
+
cmdclass['build_sphinx'] = LocalBuildDoc
+ cmdclass['build_sphinx_latex'] = LocalBuildLatex
except ImportError:
pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-heatclient-0.1.0.2.gb1b5455/heatclient/openstack/common/version.py
new/python-heatclient-0.2.0/heatclient/openstack/common/version.py
---
old/python-heatclient-0.1.0.2.gb1b5455/heatclient/openstack/common/version.py
2013-01-09 01:33:45.000000000 +0100
+++ new/python-heatclient-0.2.0/heatclient/openstack/common/version.py
2013-03-18 00:21:09.000000000 +0100
@@ -24,30 +24,17 @@
import setup
-class _deferred_version_string(object):
- """Internal helper class which provides delayed version calculation."""
- def __init__(self, version_info, prefix):
- self.version_info = version_info
- self.prefix = prefix
-
- def __str__(self):
- return "%s%s" % (self.prefix, self.version_info.version_string())
-
- def __repr__(self):
- return "%s%s" % (self.prefix, self.version_info.version_string())
-
-
class VersionInfo(object):
def __init__(self, package, python_package=None, pre_version=None):
"""Object that understands versioning for a package
- :param package: name of the top level python namespace. For heat,
- this would be "heat" for python-heatclient, it
- would be "heatclient"
+ :param package: name of the top level python namespace. For glance,
+ this would be "glance" for python-glanceclient, it
+ would be "glanceclient"
:param python_package: optional name of the project name. For
- heat this can be left unset. For
- python-heatclient, this would be
- "python-heatclient"
+ glance this can be left unset. For
+ python-glanceclient, this would be
+ "python-glanceclient"
:param pre_version: optional version that the project is working to
"""
self.package = package
@@ -57,14 +44,15 @@
self.python_package = python_package
self.pre_version = pre_version
self.version = None
+ self._cached_version = None
def _generate_version(self):
"""Defer to the openstack.common.setup routines for making a
version from git."""
if self.pre_version is None:
- return setup.get_post_version(self.python_package)
+ return setup.get_post_version(self.package)
else:
- return setup.get_pre_version(self.python_package, self.pre_version)
+ return setup.get_pre_version(self.package, self.pre_version)
def _newer_version(self, pending_version):
"""Check to see if we're working with a stale version or not.
@@ -138,11 +126,14 @@
else:
return '%s-dev' % (version_parts[0],)
- def deferred_version_string(self, prefix=""):
+ def cached_version_string(self, prefix=""):
"""Generate an object which will expand in a string context to
the results of version_string(). We do this so that don't
call into pkg_resources every time we start up a program when
passing version information into the CONF constructor, but
rather only do the calculation when and if a version is requested
"""
- return _deferred_version_string(self, prefix)
+ if not self._cached_version:
+ self._cached_version = "%s%s" % (prefix,
+ self.version_string())
+ return self._cached_version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-heatclient-0.1.0.2.gb1b5455/heatclient/shell.py
new/python-heatclient-0.2.0/heatclient/shell.py
--- old/python-heatclient-0.1.0.2.gb1b5455/heatclient/shell.py 2013-01-09
01:33:45.000000000 +0100
+++ new/python-heatclient-0.2.0/heatclient/shell.py 2013-03-18
00:21:09.000000000 +0100
@@ -129,6 +129,12 @@
parser.add_argument('--os_auth_token',
help=argparse.SUPPRESS)
+ parser.add_argument('--os-no-client-auth',
+ default=utils.env('OS_NO_CLIENT_AUTH'),
+ action='store_true',
+ help="Do not contact keystone for a token.\
+ Defaults to env[OS_NO_CLIENT_AUTH]")
+
parser.add_argument('--heat-url',
default=utils.env('HEAT_URL'),
help='Defaults to env[HEAT_URL]')
@@ -229,10 +235,6 @@
level=logging.DEBUG)
httplib2.debuglevel = 1
- else:
- logging.basicConfig(
- format="%(levelname)s %(message)s",
- level=logging.INFO)
def main(self, argv):
# Parse args once to find version
@@ -285,20 +287,25 @@
'endpoint_type': args.os_endpoint_type,
'insecure': args.insecure
}
- _ksclient = self._get_ksclient(**kwargs)
- token = args.os_auth_token or _ksclient.auth_token
- endpoint = args.heat_url or \
- self._get_endpoint(_ksclient, **kwargs)
+ endpoint = args.heat_url
+
+ if not args.os_no_client_auth:
+ _ksclient = self._get_ksclient(**kwargs)
+ token = args.os_auth_token or _ksclient.auth_token
+
+ kwargs = {
+ 'token': token,
+ 'insecure': args.insecure,
+ 'timeout': args.timeout,
+ 'ca_file': args.ca_file,
+ 'cert_file': args.cert_file,
+ 'key_file': args.key_file,
+ }
+
+ if not endpoint:
+ endpoint = self._get_endpoint(_ksclient, **kwargs)
- kwargs = {
- 'token': token,
- 'insecure': args.insecure,
- 'timeout': args.timeout,
- 'ca_file': args.ca_file,
- 'cert_file': args.cert_file,
- 'key_file': args.key_file,
- }
if not args.token_only:
kwargs['username'] = args.os_username
kwargs['password'] = args.os_password
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-heatclient-0.1.0.2.gb1b5455/heatclient/v1/shell.py
new/python-heatclient-0.2.0/heatclient/v1/shell.py
--- old/python-heatclient-0.1.0.2.gb1b5455/heatclient/v1/shell.py
2013-01-09 01:33:45.000000000 +0100
+++ new/python-heatclient-0.2.0/heatclient/v1/shell.py 2013-03-18
00:21:09.000000000 +0100
@@ -51,6 +51,8 @@
@utils.arg('-c', '--create-timeout', metavar='<TIMEOUT>',
default=60, type=int,
help='Stack creation timeout in minutes. Default: 60')
+@utils.arg('-r', '--enable-rollback', default=False, action="store_true",
+ help='Enable rollback on create/update failure')
@utils.arg('-P', '--parameters', metavar='<KEY1=VALUE1;KEY2=VALUE2...>',
help='Parameter values used to create the stack.')
@utils.arg('name', metavar='<STACK_NAME>',
@@ -69,6 +71,8 @@
@utils.arg('-c', '--create-timeout', metavar='<TIMEOUT>',
default=60, type=int,
help='Stack creation timeout in minutes. Default: 60')
+@utils.arg('-r', '--enable-rollback', default=False, action="store_true",
+ help='Enable rollback on create/update failure')
@utils.arg('-P', '--parameters', metavar='<KEY1=VALUE1;KEY2=VALUE2...>',
help='Parameter values used to create the stack.')
@utils.arg('name', metavar='<STACK_NAME>',
@@ -76,7 +80,8 @@
def do_stack_create(hc, args):
'''Create the stack'''
fields = {'stack_name': args.name,
- 'timeoutmins': args.create_timeout,
+ 'timeout_mins': args.create_timeout,
+ 'disable_rollback': not(args.enable_rollback),
'parameters': utils.format_parameters(args.parameters)}
_set_template_fields(hc, args, fields)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-heatclient-0.1.0.2.gb1b5455/heatclient/version.py
new/python-heatclient-0.2.0/heatclient/version.py
--- old/python-heatclient-0.1.0.2.gb1b5455/heatclient/version.py
2013-01-09 01:33:45.000000000 +0100
+++ new/python-heatclient-0.2.0/heatclient/version.py 2013-03-18
00:21:09.000000000 +0100
@@ -15,5 +15,8 @@
from heatclient.openstack.common import version as common_version
+NEXT_VERSION = '0.2.0'
+
version_info = common_version.VersionInfo('heatclient',
+ pre_version=NEXT_VERSION,
python_package='python-heatclient')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-heatclient-0.1.0.2.gb1b5455/heatclient/versioninfo
new/python-heatclient-0.2.0/heatclient/versioninfo
--- old/python-heatclient-0.1.0.2.gb1b5455/heatclient/versioninfo
2013-01-09 01:34:58.000000000 +0100
+++ new/python-heatclient-0.2.0/heatclient/versioninfo 2013-03-18
00:22:41.000000000 +0100
@@ -1 +1 @@
-0.1.0.2.gb1b5455
+0.2.0~20130317.3.g3740ae9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-heatclient-0.1.0.2.gb1b5455/python_heatclient.egg-info/PKG-INFO
new/python-heatclient-0.2.0/python_heatclient.egg-info/PKG-INFO
--- old/python-heatclient-0.1.0.2.gb1b5455/python_heatclient.egg-info/PKG-INFO
2013-01-09 01:34:58.000000000 +0100
+++ new/python-heatclient-0.2.0/python_heatclient.egg-info/PKG-INFO
2013-03-18 00:22:42.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: python-heatclient
-Version: 0.1.0.2.gb1b5455
+Version: 0.2.0
Summary: Client library for Heat orchestration API
Home-page: https://github.com/openstack/python-heatclient
Author: Heat API Developers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-heatclient-0.1.0.2.gb1b5455/python_heatclient.egg-info/SOURCES.txt
new/python-heatclient-0.2.0/python_heatclient.egg-info/SOURCES.txt
---
old/python-heatclient-0.1.0.2.gb1b5455/python_heatclient.egg-info/SOURCES.txt
2013-01-09 01:34:58.000000000 +0100
+++ new/python-heatclient-0.2.0/python_heatclient.egg-info/SOURCES.txt
2013-03-18 00:22:43.000000000 +0100
@@ -1,5 +1,3 @@
-.gitignore
-.gitreview
AUTHORS
ChangeLog
LICENSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-heatclient-0.1.0.2.gb1b5455/python_heatclient.egg-info/requires.txt
new/python-heatclient-0.2.0/python_heatclient.egg-info/requires.txt
---
old/python-heatclient-0.1.0.2.gb1b5455/python_heatclient.egg-info/requires.txt
2013-01-09 01:34:58.000000000 +0100
+++ new/python-heatclient-0.2.0/python_heatclient.egg-info/requires.txt
2013-03-18 00:22:42.000000000 +0100
@@ -1,5 +1,4 @@
httplib2
iso8601>=0.1.4
-prettytable>=0.5,<0.7
-python-keystoneclient>=0.2,<0.3
-warlock<2
\ No newline at end of file
+prettytable>=0.6,<0.8
+python-keystoneclient>=0.2,<0.3
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/run_tests.sh
new/python-heatclient-0.2.0/run_tests.sh
--- old/python-heatclient-0.1.0.2.gb1b5455/run_tests.sh 2013-01-09
01:33:45.000000000 +0100
+++ new/python-heatclient-0.2.0/run_tests.sh 2013-03-18 00:21:09.000000000
+0100
@@ -35,13 +35,13 @@
done
if [ $just_pep8 -eq 1 ]; then
- tox -e pep8
- exit
+ exec tox -e pep8
fi
-tox -e py27 $toxargs 2>&1 | tee run_tests.err.log || exit
-if [ ${PIPESTATUS[0]} -ne 0 ]; then
- exit ${PIPESTATUS[0]}
+tox -e py27 $toxargs 2>&1 | tee run_tests.err.log || exit 1
+tox_exit_code=${PIPESTATUS[0]}
+if [ 0$tox_exit_code -ne 0 ]; then
+ exit $tox_exit_code
fi
if [ -z "$toxargs" ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/setup.py
new/python-heatclient-0.2.0/setup.py
--- old/python-heatclient-0.1.0.2.gb1b5455/setup.py 2013-01-09
01:33:45.000000000 +0100
+++ new/python-heatclient-0.2.0/setup.py 2013-03-18 00:21:09.000000000
+0100
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@@ -14,6 +16,7 @@
import setuptools
from heatclient.openstack.common import setup
+from heatclient.version import version_info as version
def read(fname):
@@ -21,7 +24,7 @@
setuptools.setup(
name="python-heatclient",
- version=setup.get_post_version('heatclient'),
+ version=version.canonical_version_string(always=True),
author='Heat API Developers',
author_email='disc...@heat-api.org',
description="Client library for Heat orchestration API",
@@ -49,4 +52,5 @@
dependency_links=setup.parse_dependency_links(),
tests_require=setup.parse_requirements(['tools/test-requires']),
setup_requires=['setuptools-git>=0.4'],
+ data_files=[('heatclient', ['heatclient/versioninfo'])]
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-heatclient-0.1.0.2.gb1b5455/tools/pip-requires
new/python-heatclient-0.2.0/tools/pip-requires
--- old/python-heatclient-0.1.0.2.gb1b5455/tools/pip-requires 2013-01-09
01:33:45.000000000 +0100
+++ new/python-heatclient-0.2.0/tools/pip-requires 2013-03-18
00:21:12.000000000 +0100
@@ -1,6 +1,5 @@
argparse
httplib2
iso8601>=0.1.4
-prettytable>=0.5,<0.7
+prettytable>=0.6,<0.8
python-keystoneclient>=0.2,<0.3
-warlock<2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
