python/python-cliff
SHA256
15
0
Fork 0
forked from pool/python-cliff
Code Pull Requests Activity

Accepting request 199550 from devel:languages:python

Browse Source 
- Add 0001-Require-pyparsing-2.0.1.patch: Allow running with pyparsing>=2.0.1

OBS-URL: https://build.opensuse.org/request/show/199550
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-cliff?expand=0&rev=14
This commit is contained in:
Stephan Kulow
2013-09-23 11:15:29 +00:00
committed by Git OBS Bridge
parent f0b2c34307
commit 373f4dc33b
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
0001-Require-pyparsing-2.0.1.patch Normal file
View File

@@ -0,0 +1,22 @@
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:

5
python-cliff.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Sep 17 13:29:29 UTC 2013 - speilicke@suse.com
- Add 0001-Require-pyparsing-2.0.1.patch: Allow running with pyparsing>=2.0.1
-------------------------------------------------------------------
Mon Sep 9 08:47:28 UTC 2013 - dmueller@suse.com

7
python-cliff.spec
View File

@@ -25,6 +25,8 @@ 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
@@ -37,11 +39,11 @@ BuildRequires: python-coverage
BuildRequires: python-mock >= 1.0.1
BuildRequires: python-nose
BuildRequires: python-pep8
BuildRequires: python-pyparsing == 1.5.7
BuildRequires: python-pyparsing >= 2.0.1
Requires: python-PrettyTable >= 0.6
Requires: python-argparse
Requires: python-cmd2 >= 0.6.4
Requires: python-pyparsing == 1.5.7
Requires: python-pyparsing >= 2.0.1
Requires: python-tablib
%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()")}
@@ -66,6 +68,7 @@ This package contains documentation files for %{name}.
%prep
%setup -q -n cliff-%{version}
%patch0
%patch1 -p1
%build
python setup.py build