From f69cc4492f3c04c25de56b114e585b27ffa73500 Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Wed, 2 Mar 2016 11:02:49 +0100 Subject: [PATCH] Make versioneer work from subdirectory --- .gitignore | 3 +++ gitversion/getversion.py | 2 +- gitversion/versioneer.py | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d2ffae00..2b212f93 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ umltest.status /cmake /.idea *~ + +gitversion/*.pyc +gitversion/__pycache__ diff --git a/gitversion/getversion.py b/gitversion/getversion.py index a7e1ee96..98e94028 100755 --- a/gitversion/getversion.py +++ b/gitversion/getversion.py @@ -2,4 +2,4 @@ import versioneer -print versioneer.get_version() +print(versioneer.get_version()) diff --git a/gitversion/versioneer.py b/gitversion/versioneer.py index 7dfa1c4c..0781d5f6 100644 --- a/gitversion/versioneer.py +++ b/gitversion/versioneer.py @@ -1048,7 +1048,8 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): expanded, and _version.py hasn't already been rewritten with a short version string, meaning we're inside a checked out source tree. """ - if not os.path.exists(os.path.join(root, ".git")): + # -- (MESSMER) CHANGED FOLLOWING LINE TO LOOK FOR ../.git instead of .git -- + if not os.path.exists(os.path.join(root, "../.git")): if verbose: print("no .git in %s" % root) raise NotThisMethod("no .git directory")