forked from pool/python-cliff
0f8251c6d4
- 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
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
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
|
|
|