dev-python/enable: Backport fixes for doc building

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=564510

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec@gentoo.org>
This commit is contained in:
Justin Lecher
2015-10-31 09:37:38 +01:00
parent 875fab3477
commit 1c689827cd
3 changed files with 57 additions and 0 deletions

View File

@@ -44,6 +44,8 @@ DISTUTILS_IN_SOURCE_BUILD=1
PATCHES=(
"${FILESDIR}"/${PN}-4.4.1-swig.patch
"${FILESDIR}"/${P}-gcc-5.patch
"${FILESDIR}"/${P}-doc.patch
"${FILESDIR}"/${P}-version.patch
)
python_prepare_all() {

View File

@@ -0,0 +1,24 @@
From 41134b03b96b741d95554846841c189313052265 Mon Sep 17 00:00:00 2001
From: John Wiggins <jwiggins@enthought.com>
Date: Thu, 1 Oct 2015 20:40:07 +0200
Subject: [PATCH] Read the docs version directly from enable._version
---
docs/source/conf.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 10b7552..995e315 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -41,8 +41,8 @@
# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
d = {}
-execfile(os.path.join('..', '..', 'enable', '__init__.py'), d)
-version = release = d['__version__']
+execfile(os.path.join('..', '..', 'enable', '_version.py'), d)
+version = release = d['full_version']
# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:

View File

@@ -0,0 +1,31 @@
From f91c824ebad74e8c23e62fe3390842c5fe322aee Mon Sep 17 00:00:00 2001
From: itziakos <ioannist@enthought.com>
Date: Wed, 20 May 2015 22:52:42 +0100
Subject: [PATCH] check the enable._version.py when installing from source
---
setup.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/setup.py b/setup.py
index f765f51..3328b93 100644
--- a/setup.py
+++ b/setup.py
@@ -92,13 +92,14 @@ def write_version_py(filename):
fullversion = VERSION
if os.path.exists('.git'):
git_revision, dev_num = git_version()
- elif os.path.exists('kiva/_version.py'):
+ # All packages are synced with the enable version
+ elif os.path.exists('enable/_version.py'):
# must be a source distribution, use existing version file
try:
- from kiva._version import git_revision, full_version
+ from enable._version import git_revision, full_version
except ImportError:
raise ImportError("Unable to import git_revision. Try removing "
- "kiva/_version.py and the build directory "
+ "enable/_version.py and the build directory "
"before building.")
match = re.match(r'.*?\.dev(?P<dev_num>\d+)', full_version)