15
0
forked from pool/python-cliff

Accepting request 238766 from devel:languages:python

1

OBS-URL: https://build.opensuse.org/request/show/238766
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-cliff?expand=0&rev=18
This commit is contained in:
Stephan Kulow
2014-06-30 19:45:08 +00:00
committed by Git OBS Bridge
parent 9fda144637
commit 18934a5b8c
7 changed files with 30 additions and 92 deletions

View File

@@ -1,34 +0,0 @@
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,40 +0,0 @@
From 75ab1c5646902b6569058467c789b14f0e3080d1 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Thu, 13 Feb 2014 12:55:22 +0100
Subject: [PATCH] Move pep8 dependency into pep8 tox test
The other unit tests do not require pep8
Change-Id: I7ac68bb3ff48a76a6dd3db08a05827831069f141
---
test-requirements.txt | 1 -
tox.ini | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/test-requirements.txt b/test-requirements.txt
index 85c0039..624f4f9 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,5 @@
nose
mock
coverage
-pep8
cmd2
PrettyTable
diff --git a/tox.ini b/tox.ini
index a210ff2..da84351 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ deps =
coverage
[testenv:pep8]
-deps = flake8
+deps = flake8 pep8==1.4.5
commands = flake8 cliff docs/source/conf.py setup.py
[testenv:py26]
--
1.8.4.1

View File

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

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

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

View File

@@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Jun 26 09:37:02 UTC 2014 - dmueller@suse.com
- update to 1.6.1:
* Remove PrettyTable from documentation requirements
* Fix a bug in ShellFormatter's escaping of double quotes in strings
* Import run_cross_tests.sh from oslo-incubator
* add doc requirements to venv
* Add max-width support for table formatter
* Add value only output formattter
* Update readme with links to bug tracker and source
* Move pep8 dependency into pep8 tox test
* Fix doc build with Python 2.6.x
* Fix interactive mode with command line args
* Update .gitreview after repo rename
* Escape double quotes in shell formatter
* Add unit test for shell formatter
* Rename private attribute to avoid conflict
* Sync with global requirements
* Add integration tests with known consumers
* update history for previous change
* Make the formatters a private part of the command
- 0001-Fix-doc-build-with-Python-2.6.x.patch, 0001-Move-pep8-dependency-into-pep8-tox-test.patch,
remove-distribute-dep.patch: Merged upstream
-------------------------------------------------------------------
Thu Feb 13 11:53:51 UTC 2014 - dmueller@suse.com

View File

@@ -17,16 +17,13 @@
Name: python-cliff
Version: 1.5.2
Version: 1.6.1
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
Patch2: 0001-Move-pep8-dependency-into-pep8-tox-test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python-argparse
BuildRequires: python-devel
@@ -72,9 +69,6 @@ This package contains documentation files for %{name}.
%prep
%setup -q -n cliff-%{version}
%patch0
%patch1 -p1
%patch2 -p1
%build
python setup.py build

View File

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