summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Kellogg-Stedman <lars@oddbit.com>2018-05-02 08:22:35 -0400
committerLars Kellogg-Stedman <lars@oddbit.com>2018-05-02 08:50:17 -0400
commit4e977aafe4d2df129b3f8001e4fe4dfd9642f7f9 (patch)
treefe8b9cda3f50ca5672d534b899cd27f029e8580a
parentdd0f8689a135b33dbeedaefdfa149fd7ec3c94e8 (diff)
correct path to conf.py in makeversionhdr.py
the py/makeversionhdr.py script was looking for `conf.py` in the `docs/` directory, but this was relocated in 46e7f8e. This is used by the fallback `get_version_info_from_docs_conf` method, which is only consulted if `git` is unavailable in the build environment. Closes #791.
-rw-r--r--py/makeversionhdr.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
index ebd887445..1f82d5933 100644
--- a/py/makeversionhdr.py
+++ b/py/makeversionhdr.py
@@ -52,7 +52,7 @@ def get_version_info_from_git():
return git_tag, git_hash, ver
def get_version_info_from_docs_conf():
- with open(os.path.join(os.path.dirname(sys.argv[0]), "..", "docs", "conf.py")) as f:
+ with open(os.path.join(os.path.dirname(sys.argv[0]), "..", "conf.py")) as f:
for line in f:
if line.startswith("version = release = '"):
ver = line.strip().split(" = ")[2].strip("'")