Accepting request 174973 from devel:languages:python

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/174973
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-cliff?expand=0&rev=9

0001-Restore-compatibility-with-Prettytable-0.7.2.patch

@@ -1,39 +0,0 @@
-From d1be2d0081e33f6f7b5a533245b9d623e0285f99 Mon Sep 17 00:00:00 2001
-From: Dirk Mueller <dirk@dmllr>
-Date: Thu, 2 May 2013 12:39:20 +0200
-Subject: [PATCH] Restore compatibility with Prettytable < 0.7.2
-
-Starting with 0.7.2, PrettyTable changed default on how empty
-tables are rendered. Before they were completely ommitted, now
-the default is to show the table headers and decoration, just
-no content. Restore the previous behavior to stay compatible.
----
- cliff/formatters/table.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/cliff/formatters/table.py b/cliff/formatters/table.py
-index 5b625ed..b13b364 100644
---- a/cliff/formatters/table.py
-+++ b/cliff/formatters/table.py
-@@ -22,7 +22,7 @@ class TableFormatter(ListFormatter, SingleFormatter):
-         pass
- 
-     def emit_list(self, column_names, data, stdout, parsed_args):
--        x = prettytable.PrettyTable(column_names)
-+        x = prettytable.PrettyTable(column_names, print_empty=False)
-         x.padding_width = 1
-         # Figure out the types of the columns in the
-         # first row and set the alignment of the
-@@ -46,7 +46,8 @@ class TableFormatter(ListFormatter, SingleFormatter):
-         return
- 
-     def emit_one(self, column_names, data, stdout, parsed_args):
--        x = prettytable.PrettyTable(field_names=('Field', 'Value'))
-+        x = prettytable.PrettyTable(field_names=('Field', 'Value'),
-+                                    print_empty=False)
-         x.padding_width = 1
-         # Align all columns left because the values are
-         # not all the same type.
--- 
-1.8.1.4
-

cliff-1.3.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7c0250b5139993d04dcbb8b9d05376094b7271586b3698b4764c7c6f4697e0f8
-size 124408

cliff-1.3.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46bb798f73f76e2ed63b53f4da5bfb6624d8efaf88f98e6e7a1aa711e1f259fe
+size 124518

ignore-cmd2-requires.diff

@@ -1,11 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -24,7 +24,7 @@
- install_requires = [
-     'distribute',
-     'PrettyTable>=0.6,<0.8',
--    'cmd2==0.6.4',
-+    'cmd2>=0.6.4,<0.7',
- ]
- 
- # We need a different version of PyParsing, depending on which version

python-cliff.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri May  3 09:55:16 UTC 2013 - speilicke@suse.com
+
+- Update to version 1.3.3:
+  + Upstreamed:
+    - 0001-Restore-compatibility-with-Prettytable-0.7.2.patch 
+    - ignore-cmd2-requires.diff: 
+
 -------------------------------------------------------------------
 Thu May  2 10:42:04 UTC 2013 - dmueller@suse.com
 

python-cliff.spec

@@ -17,31 +17,29 @@
 
 
 Name:           python-cliff
-Version:        1.3.2
+Version:        1.3.3
 Release:        0
 Url:            https://github.com/dreamhost/cliff
 Summary:        Command Line Interface Formulation Framework
 License:        Apache-2.0
 Group:          Development/Languages/Python
 Source:         http://pypi.python.org/packages/source/c/cliff/cliff-%{version}.tar.gz
-Patch0:         ignore-cmd2-requires.diff
-Patch1:         0001-Restore-compatibility-with-Prettytable-0.7.2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-argparse
 BuildRequires:  python-devel
 BuildRequires:  python-distribute
 BuildRequires:  python-tablib
 # Test requirements:
+BuildRequires:  python-PrettyTable
 BuildRequires:  python-cmd2
 BuildRequires:  python-coverage
 BuildRequires:  python-mock >= 1.0.1
 BuildRequires:  python-nose
 BuildRequires:  python-pep8
-BuildRequires:  python-prettytable
 BuildRequires:  python-pyparsing == 1.5.7
+Requires:       python-PrettyTable >= 0.6
 Requires:       python-argparse
 Requires:       python-cmd2 >= 0.6.4
-Requires:       python-prettytable >= 0.6
 Requires:       python-pyparsing == 1.5.7
 Requires:       python-tablib
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
@@ -66,8 +64,6 @@ This package contains documentation files for %{name}.
 
 %prep
 %setup -q -n cliff-%{version}
-%patch0
-%patch1 -p1
 
 %build
 python setup.py build