From f21ed48e74cf862ec19a588e50e7beb8768a03d9 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sun, 11 Mar 2018 16:56:57 -0500
Subject: [PATCH] Prevent import from breaking version-number finding in doc
build
---
doc/conf.py | 5 ++++-
loopy/version.py | 2 +-
setup.py | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/doc/conf.py b/doc/conf.py
index f98186ba0..a2807b076 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -11,7 +11,8 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
-#import sys, os
+#import sys
+import os
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
@@ -58,10 +59,12 @@ _version_source = "../loopy/version.py"
with open(_version_source) as vpy_file:
version_py = vpy_file.read()
+os.environ["AKPYTHON_EXEC_IMPORT_UNAVAILABLE"] = "1"
exec(compile(version_py, _version_source, 'exec'), ver_dic)
version = ".".join(str(x) for x in ver_dic["VERSION"])
# The full version, including alpha/beta/rc tags.
release = ver_dic["VERSION_TEXT"]
+del os.environ["AKPYTHON_EXEC_IMPORT_UNAVAILABLE"]
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/loopy/version.py b/loopy/version.py
index ee54ae05a..2f29e806e 100644
--- a/loopy/version.py
+++ b/loopy/version.py
@@ -24,7 +24,7 @@ THE SOFTWARE.
# {{{ find install- or run-time git revision
import os
-if os.environ.get("AKPYTHON_EXEC_FROM_WITHIN_WITHIN_SETUP_PY") is not None:
+if os.environ.get("AKPYTHON_EXEC_IMPORT_UNAVAILABLE") is not None:
# We're just being exec'd by setup.py. We can't import anything.
_git_rev = None
diff --git a/setup.py b/setup.py
index e69fea128..6c684f546 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ try:
finally:
version_file.close()
-os.environ["AKPYTHON_EXEC_FROM_WITHIN_WITHIN_SETUP_PY"] = "1"
+os.environ["AKPYTHON_EXEC_IMPORT_UNAVAILABLE"] = "1"
exec(compile(version_file_contents, "loopy/version.py", 'exec'), ver_dic)
--
GitLab