Accepting request 201416 from devel:languages:python

- update to 1.4.5:
  * Update the pyparsing dependency to a version that supports both
  Python 2 and Python 3.
  * Add PyPy testing.
- remove patches that went upstream:
  * remove 0001-Require-pyparsing-2.0.1.patch
  * remove relax-cmd2-requires.diff
- fix requires (forwarded request 201198 from dirkmueller)

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

0001-Require-pyparsing-2.0.1.patch

@@ -1,22 +0,0 @@
-diff -ruN a/setup.py b/setup.py
---- a/setup.py	2013-09-17 15:34:02.201817935 +0200
-+++ b/setup.py	2013-09-17 15:33:51.693994249 +0200
-@@ -18,17 +18,9 @@
- install_requires = [
-     'PrettyTable>=0.6,<0.8',
-     'cmd2>=0.6.4,<0.6.7',
-+    'pyparsing>=2.0.1'
- ]
- 
--# We need a different version of PyParsing, depending on which version
--# of Python we're using. cmd2 should have this set properly, but until
--# there is a release declare the dependency ourselves.
--# http://trac-hg.assembla.com/python-cmd2/rev/a5f3d5a89d6c
--if sys.version_info[0] < 3:
--    install_requires.append('pyparsing==1.5.7')
--else:
--    install_requires.append('pyparsing>=2.0.0')
--
- try:
-     import argparse  # noqa
- except ImportError:

cliff-1.4.4.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d15f2b59ac4bbb04eb11cd1fe5d5f30a2e0769afc0a4c675ca205b50fae567f
-size 121547

cliff-1.4.5.tar.gz

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

python-cliff.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Sep 27 13:44:08 UTC 2013 - dmueller@suse.com
+
+- update to 1.4.5:
+  * Update the pyparsing dependency to a version that supports both
+  Python 2 and Python 3.
+  * Add PyPy testing.
+- remove patches that went upstream:
+  * remove 0001-Require-pyparsing-2.0.1.patch
+  * remove relax-cmd2-requires.diff
+- fix requires
+
 -------------------------------------------------------------------
 Tue Sep 17 13:29:29 UTC 2013 - speilicke@suse.com
 

python-cliff.spec

@@ -17,16 +17,13 @@
 
 
 Name:           python-cliff
-Version:        1.4.4
+Version:        1.4.5
 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:         relax-cmd2-requires.diff
-# PATCH-FIX-UPSTREAM speilicke@suse.com -- Backport of https://github.com/dreamhost/cliff/pull/47
-Patch1:         0001-Require-pyparsing-2.0.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-argparse
 BuildRequires:  python-devel
@@ -42,7 +39,7 @@ BuildRequires:  python-pep8
 BuildRequires:  python-pyparsing >= 2.0.1
 Requires:       python-PrettyTable >= 0.6
 Requires:       python-argparse
-Requires:       python-cmd2 >= 0.6.4
+Requires:       python-cmd2 >= 0.6.7
 Requires:       python-pyparsing >= 2.0.1
 Requires:       python-tablib
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
@@ -67,8 +64,6 @@ This package contains documentation files for %{name}.
 
 %prep
 %setup -q -n cliff-%{version}
-%patch0
-%patch1 -p1
 
 %build
 python setup.py build

relax-cmd2-requires.diff

@@ -1,22 +0,0 @@
---- cliff.egg-info/requires.txt
-+++ cliff.egg-info/requires.txt
-@@ -1,3 +1,3 @@
- PrettyTable>=0.6,<0.8
--cmd2>=0.6.4,<0.6.6
--pyparsing==1.5.7
-\ No newline at end of file
-+cmd2>=0.6.4,<0.6.7
-+pyparsing==1.5.7
---- setup.py
-+++ setup.py
-@@ -17,9 +17,7 @@
- 
- install_requires = [
-     'PrettyTable>=0.6,<0.8',
--    # Restrict cliff from bringing in cmd2 0.6.6 until the problem
--    # with the Python 3-only code is resolved.
--    'cmd2>=0.6.4,<0.6.6',
-+    'cmd2>=0.6.4,<0.6.7',
- ]
- 
- # We need a different version of PyParsing, depending on which version