forked from pool/python-glanceclient
Change links to openSUSE:Factory
OBS-URL: https://build.opensuse.org/package/show/Cloud:OpenStack:Factory/python-glanceclient?expand=0&rev=5
This commit is contained in:
parent
1e05c89d58
commit
6909f004cc
@ -1,83 +0,0 @@
|
||||
commit 31960f0a8584802852d97ec8ce27b5516b32d63b
|
||||
Author: Dirk Mueller <dirk@dmllr.de>
|
||||
Date: Fri Feb 22 16:11:12 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. Added testcase to ensure this.
|
||||
|
||||
Change-Id: I1a1a709e6053451b1256a0d78f8fe8562fb10e62
|
||||
|
||||
diff --git a/tests/test_utils.py b/tests/test_utils.py
|
||||
index 3f275b8..279f5d6 100644
|
||||
--- a/tests/test_utils.py
|
||||
+++ b/tests/test_utils.py
|
||||
@@ -15,6 +15,8 @@
|
||||
|
||||
import errno
|
||||
import testtools
|
||||
+import sys
|
||||
+import StringIO
|
||||
|
||||
from glanceclient.common import utils
|
||||
|
||||
@@ -69,6 +71,47 @@ class TestUtils(testtools.TestCase):
|
||||
self.assertEqual(u'ni\xf1o', ensure_unicode('ni\xc3\xb1o',
|
||||
incoming='ascii'))
|
||||
|
||||
+ def test_prettytable(self):
|
||||
+ class Struct:
|
||||
+ def __init__(self, **entries):
|
||||
+ self.__dict__.update(entries)
|
||||
+
|
||||
+ # test that the prettytable output is wellformatted (left-aligned)
|
||||
+ columns = ['ID', 'Name']
|
||||
+ val = ['Name1', 'another', 'veeeery long']
|
||||
+ images = [Struct(**{'id': i ** 16, 'name': val[i]})
|
||||
+ for i in range(len(val))]
|
||||
+
|
||||
+ saved_stdout = sys.stdout
|
||||
+ try:
|
||||
+ sys.stdout = output_list = StringIO.StringIO()
|
||||
+ utils.print_list(images, columns)
|
||||
+
|
||||
+ sys.stdout = output_dict = StringIO.StringIO()
|
||||
+ utils.print_dict({'K': 'k', 'Key': 'Value'})
|
||||
+
|
||||
+ finally:
|
||||
+ sys.stdout = saved_stdout
|
||||
+
|
||||
+ self.assertEqual(output_list.getvalue(), '''\
|
||||
++-------+--------------+
|
||||
+| ID | Name |
|
||||
++-------+--------------+
|
||||
+| | Name1 |
|
||||
+| 1 | another |
|
||||
+| 65536 | veeeery long |
|
||||
++-------+--------------+
|
||||
+''')
|
||||
+
|
||||
+ self.assertEqual(output_dict.getvalue(), '''\
|
||||
++----------+-------+
|
||||
+| Property | Value |
|
||||
++----------+-------+
|
||||
+| K | k |
|
||||
+| Key | Value |
|
||||
++----------+-------+
|
||||
+''')
|
||||
+
|
||||
def test_ensure_str(self):
|
||||
ensure_str = utils.ensure_str
|
||||
self.assertEqual("True", ensure_str(True))
|
||||
diff --git a/tools/pip-requires b/tools/pip-requires
|
||||
index e5a9941..7aaf5da 100644
|
||||
--- a/tools/pip-requires
|
||||
+++ b/tools/pip-requires
|
||||
@@ -1,5 +1,5 @@
|
||||
argparse
|
||||
-prettytable>=0.6,<0.7
|
||||
+prettytable>=0.6,<0.8
|
||||
python-keystoneclient>=0.1.2,<1
|
||||
pyOpenSSL
|
||||
warlock>=0.7.0,<2
|
5
_service
5
_service
@ -1,7 +1,8 @@
|
||||
<services>
|
||||
<service name="git_tarballs" mode="disabled">
|
||||
<param name="url">http://tarballs.openstack.org/python-glanceclient/python-glanceclient-0.8.0.tar.gz</param>
|
||||
<param name="email">cloud-devel@suse.de</param>
|
||||
<param name="url">http://tarballs.openstack.org/python-glanceclient/python-glanceclient-master.tar.gz</param>
|
||||
<param name="email">opensuse-cloud@opensuse.org</param>
|
||||
<param name="version-regexp">.*-([^-]+)\.g[a-zA-Z0-9]{7}</param>
|
||||
<param name="plain-version">True</param>
|
||||
</service>
|
||||
</services>
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:46bfe15087437f19499c803394334a470081804f3f23f19dcc5a83608c01d383
|
||||
size 90083
|
3
python-glanceclient-master.tar.gz
Normal file
3
python-glanceclient-master.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f70926a137ec209d9e98f40ced7685828985c83d29219386ef328be93646e467
|
||||
size 117085
|
@ -1,12 +1,130 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 3 11:44:48 UTC 2013 - dmueller@suse.com
|
||||
Thu Sep 26 09:58:14 UTC 2013 - opensuse-cloud@opensuse.org
|
||||
|
||||
- add 31960f0a8584802852d97ec8ce27b5516b32d63b.diff
|
||||
- Update to version 0.10.0.21:
|
||||
+ Support glance client can get ipv6 image url correctly
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 2 10:12:08 UTC 2013 - dmueller@suse.com
|
||||
Fri Sep 20 00:04:18 UTC 2013 - opensuse-cloud@opensuse.org
|
||||
|
||||
- downgrade to the released tarball (0.8.0)
|
||||
- Update to version 0.10.0.19:
|
||||
+ Use openstack-images-v2.1-json-patch for update method
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 18 09:11:55 UTC 2013 - dmueller@suse.com
|
||||
|
||||
- fix requires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 3 23:54:49 UTC 2013 - opensuse-cloud@opensuse.org
|
||||
|
||||
- Update to version 0.10.0.17:
|
||||
+ Enable query image by tag
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 29 00:12:44 UTC 2013 - opensuse-cloud@opensuse.org
|
||||
|
||||
- Update to version 0.10.0.16:
|
||||
+ Fix glanceclient usage inconsistences for options
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 23 23:47:40 UTC 2013 - opensuse-cloud@opensuse.org
|
||||
|
||||
- Update to version 0.10.0.15:
|
||||
+ Add 0.11.0 doc notes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 23 00:10:25 UTC 2013 - opensuse-cloud@opensuse.org
|
||||
|
||||
- Update to version 0.10.0.14:
|
||||
+ Allow single-wildcard SSL common name matching
|
||||
+ Don't use posixpath for URLs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 20 00:03:20 UTC 2013 - opensuse-cloud@opensuse.org
|
||||
|
||||
- Update to version 0.10.0.10:
|
||||
+ removed deprecated parameter --public
|
||||
+ Revert "removed deprecated parameter --public"
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 16 23:45:53 UTC 2013 - opensuse-cloud@opensuse.org
|
||||
|
||||
- Update to version 0.10.0.7:
|
||||
+ \Allow removal of properties using glance v2 api
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 13 00:13:56 UTC 2013 - opensuse-cloud@opensuse.org
|
||||
|
||||
- Update to version 0.10.0.6:
|
||||
+ Updated from global requirements
|
||||
+ Raise warlock requirement
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 10 10:54:46 UTC 2013 - opensuse-cloud@opensuse.org
|
||||
|
||||
- Update to version 0.10.0.2:
|
||||
+ Add 0.10.0 docs update
|
||||
+ Revert 02116565d358a4fa254217779fef82b14b38d8ca
|
||||
+ Cast image_id to string before calling urllib.quote
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 8 23:40:00 UTC 2013 - opensuse-cloud@opensuse.org
|
||||
|
||||
- Update to version 0.9.0.73:
|
||||
+ Show a pretty progressbar when uploading and downloading an image.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 16 00:18:16 UTC 2013 - opensuse-cloud@opensuse.org
|
||||
|
||||
- Update to version 0.9.0.49:
|
||||
+ uncap python-keystoneclient version requirement
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 8 23:45:21 UTC 2013 - opensuse-cloud@opensuse.org
|
||||
|
||||
- Update to version 0.9.0.48:
|
||||
+ Flake8 should ignore build folder
|
||||
+ Rename invalid domain name to be RFC compliant.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 5 23:43:24 UTC 2013 - opensuse-cloud@opensuse.org
|
||||
|
||||
- Update to version 0.9.0.45:
|
||||
+ Enable client V2 to update/delete tags for a given image.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 2 00:18:59 UTC 2013 - opensuse-cloud@opensuse.org
|
||||
|
||||
- Update to version 0.9.0.44:
|
||||
+ Start using Pyflakes and Hacking
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 27 09:43:46 UTC 2013 - speilicke@suse.com
|
||||
|
||||
- Only depend on python-discover on SLE, it's a Python-2.6 feature
|
||||
backport
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 12 09:55:33 UTC 2013 - dmueller@suse.com
|
||||
|
||||
- fix requires of test package
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 4 12:28:52 UTC 2013 - speilicke@suse.com
|
||||
|
||||
- tools/pip-requires changed to requirements.txt (pip's de-facto
|
||||
standard)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 29 11:22:37 UTC 2013 - dmueller@suse.com
|
||||
|
||||
- remove setBadness call from rpmlintrc
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 27 08:45:20 UTC 2013 - dmueller@suse.com
|
||||
|
||||
- python-pbr/d2to1 requires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 26 13:43:11 UTC 2013 - dmueller@suse.com
|
||||
|
@ -19,33 +19,35 @@
|
||||
%define component glanceclient
|
||||
|
||||
Name: python-glanceclient
|
||||
Version: 0.8.0
|
||||
Version: 0.10.0.21
|
||||
Release: 0
|
||||
Summary: Openstack Image (Glance) API Client
|
||||
License: Apache-2.0
|
||||
Group: Development/Languages/Python
|
||||
Url: http://launchpad.net/python-glanceclient
|
||||
Source: python-glanceclient-0.8.0.tar.gz
|
||||
Source: python-glanceclient-master.tar.gz
|
||||
Source2: openstack-glance.sh
|
||||
Patch0: 31960f0a8584802852d97ec8ce27b5516b32d63b.diff
|
||||
BuildRequires: openstack-suse-macros
|
||||
BuildRequires: python-base
|
||||
BuildRequires: python-distribute
|
||||
# Documentation build requirements:
|
||||
BuildRequires: python-PrettyTable
|
||||
BuildRequires: python-Sphinx
|
||||
BuildRequires: python-d2to1
|
||||
BuildRequires: python-iso8601
|
||||
BuildRequires: python-keystoneclient
|
||||
BuildRequires: python-prettytable
|
||||
BuildRequires: python-pbr
|
||||
BuildRequires: python-pyOpenSSL
|
||||
BuildRequires: python-warlock
|
||||
Requires: python >= 2.6.8
|
||||
Requires: python-argparse
|
||||
# /usr/bin/glance uses pkg_resources, thus:
|
||||
Requires: python-distribute
|
||||
Requires: python-keystoneclient
|
||||
Requires: python-prettytable >= 0.6
|
||||
Requires: python-PrettyTable >= 0.6
|
||||
Requires: python-d2to1 >= 0.2.10
|
||||
Requires: python-keystoneclient >= 0.3.0
|
||||
Requires: python-pbr >= 0.5.21
|
||||
Requires: python-pyOpenSSL
|
||||
Requires: python-warlock
|
||||
Requires: python-warlock >= 1.0.1
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
|
||||
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
|
||||
@ -61,25 +63,27 @@ a Python API (the glanceclient module), and a command-line tool (glance).
|
||||
Summary: Openstack Image (Glance) API Client - Testsuite
|
||||
Group: System/Management
|
||||
Requires: %{name} = %{version}
|
||||
Requires: python-mox
|
||||
Requires: python-nose
|
||||
Requires: python-nose-exclude
|
||||
Requires: python-nosehtmloutput
|
||||
Requires: python-nosexcover
|
||||
Requires: python-openstack.nose_plugin
|
||||
Requires: python-pep8
|
||||
Requires: python-testtools >= 0.9.22
|
||||
Requires: python-tox
|
||||
Requires: python-coverage >= 3.6
|
||||
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
|
||||
Requires: python-discover
|
||||
%endif
|
||||
Requires: python-flake8 >= 2.0
|
||||
Requires: python-hacking >= 0.5.6
|
||||
Requires: python-mock >= 0.8.0
|
||||
Requires: python-mox >= 0.5.3
|
||||
Requires: python-pep8 >= 1.4.5
|
||||
Requires: python-pyflakes >= 0.7.2
|
||||
Requires: python-testrepository >= 0.0.17
|
||||
Requires: python-testtools >= 0.9.32
|
||||
|
||||
%description test
|
||||
This package contains testsuite files for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n python-glanceclient-0.8.0
|
||||
%patch0 -p1
|
||||
%setup -q -n python-glanceclient-0.10.0.21.g7a4a8a0
|
||||
%openstack_cleanup_prep
|
||||
# Our package versioning scheme is different (but we provide the correct thing) thus:
|
||||
sed -i "s|python-keystoneclient>=0.1.2,<1|python-keystoneclient|" tools/pip-requires
|
||||
sed -i "s|python-keystoneclient>=0.1.2,<1|python-keystoneclient|" requirements.txt
|
||||
|
||||
%build
|
||||
python setup.py build
|
||||
|
Loading…
x
Reference in New Issue
Block a user