diff --git a/0001-Require-pyparsing-2.0.1.patch b/0001-Require-pyparsing-2.0.1.patch deleted file mode 100644 index 6f28f0b..0000000 --- a/0001-Require-pyparsing-2.0.1.patch +++ /dev/null @@ -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: diff --git a/cliff-1.4.4.tar.gz b/cliff-1.4.4.tar.gz deleted file mode 100644 index 97ad854..0000000 --- a/cliff-1.4.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d15f2b59ac4bbb04eb11cd1fe5d5f30a2e0769afc0a4c675ca205b50fae567f -size 121547 diff --git a/cliff-1.4.5.tar.gz b/cliff-1.4.5.tar.gz new file mode 100644 index 0000000..d3d99eb --- /dev/null +++ b/cliff-1.4.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ec2c40e899cbb4d478aa946e1430600bf596ca2a3f12162a9514e9d580935ec +size 121371 diff --git a/python-cliff.changes b/python-cliff.changes index a749311..6254eb3 100644 --- a/python-cliff.changes +++ b/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 diff --git a/python-cliff.spec b/python-cliff.spec index c99bce2..18548b3 100644 --- a/python-cliff.spec +++ b/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 diff --git a/relax-cmd2-requires.diff b/relax-cmd2-requires.diff deleted file mode 100644 index 09af825..0000000 --- a/relax-cmd2-requires.diff +++ /dev/null @@ -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