15
0
forked from pool/python-cliff

Accepting request 220428 from devel:languages:python

- update to 1.5.2:
  * Fix the arguments passed to commands when they are instantiated to
  pull out help.
  * Add bash command completion.
  * Use stevedore to load formatter plugins
  * Use pbr for packaging
- add remove-distribute-dep.patch: remove distribute dependency
- add 0001-Fix-doc-build-with-Python-2.6.x.patch: Fix build with python 2.6 (forwarded request 220390 from dirkmueller)

OBS-URL: https://build.opensuse.org/request/show/220428
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-cliff?expand=0&rev=16
This commit is contained in:
Stephan Kulow
2014-01-31 08:44:04 +00:00
committed by Git OBS Bridge
parent 0946425915
commit 0f8251c6d4
6 changed files with 73 additions and 8 deletions

View File

@@ -0,0 +1,34 @@
From 7cf3dc000b374bab2a876495ab4528dd9f51d6a2 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Thu, 30 Jan 2014 16:48:00 +0100
Subject: [PATCH] Fix doc build with Python 2.6.x
subprocess.check_output was new in Python 2.7.
Use an alternative construct via subprocess.Popen
which works on Python 2.6 as well.
Change-Id: I0b44fc19183f1c6b23fe5a9cce31de381809534d
---
docs/source/conf.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 131a9f9..ee6daeb 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -51,10 +51,8 @@ copyright = u'2012-%s, Doug Hellmann' % datetime.datetime.today().year
# built documents.
#
# The short X.Y version.
-version = subprocess.check_output([
- 'sh', '-c',
- 'cd ../..; python setup.py --version',
-])
+version = subprocess.Popen(['sh', '-c', 'cd ../..; python setup.py --version'],
+ stdout=subprocess.PIPE).stdout.read()
version = version.strip()
# The full version, including alpha/beta/rc tags.
release = version
--
1.8.4.1

View File

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

3
cliff-1.5.2.tar.gz Normal file
View File

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

View File

@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Jan 21 13:22:18 UTC 2014 - dmueller@suse.com
- update to 1.5.2:
* Fix the arguments passed to commands when they are instantiated to
pull out help.
* Add bash command completion.
* Use stevedore to load formatter plugins
* Use pbr for packaging
- add remove-distribute-dep.patch: remove distribute dependency
- add 0001-Fix-doc-build-with-Python-2.6.x.patch: Fix build with python 2.6
-------------------------------------------------------------------
Fri Sep 27 13:44:08 UTC 2013 - dmueller@suse.com

View File

@@ -1,7 +1,7 @@
#
# spec file for package python-cliff
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,31 +17,39 @@
Name: python-cliff
Version: 1.4.5
Version: 1.5.2
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: remove-distribute-dep.patch
Patch1: 0001-Fix-doc-build-with-Python-2.6.x.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python-argparse
BuildRequires: python-devel
BuildRequires: python-setuptools
BuildRequires: python-tablib
# Test requirements:
BuildRequires: python-PrettyTable
BuildRequires: python-Sphinx
BuildRequires: python-cmd2
BuildRequires: python-coverage
BuildRequires: python-mock >= 1.0.1
BuildRequires: python-nose
BuildRequires: python-pbr
BuildRequires: python-pep8
BuildRequires: python-pyparsing >= 2.0.1
BuildRequires: python-six
BuildRequires: python-stevedore
Requires: python-PrettyTable >= 0.6
%if 0%{?suse_version} <= 1110
Requires: python-argparse
%endif
Requires: python-cmd2 >= 0.6.7
Requires: python-pyparsing >= 2.0.1
Requires: python-tablib
Requires: python-six
Requires: python-stevedore
%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()")}
%py_requires
@@ -64,15 +72,18 @@ This package contains documentation files for %{name}.
%prep
%setup -q -n cliff-%{version}
%patch0
%patch1 -p1
%build
python setup.py build
python setup.py build_sphinx
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
%check
nosetests
python setup.py test
%files
%defattr(-,root,root,-)

View File

@@ -0,0 +1,8 @@
--- test-requirements.txt
+++ test-requirements.txt
@@ -3,5 +3,4 @@
coverage
pep8
cmd2
-distribute
PrettyTable