From 6e2c91c3fbf0f9151682acd321ff20e056f27ae3 Mon Sep 17 00:00:00 2001
From: Seth House <seth@eseth.com>
Date: Fri, 6 Nov 2015 14:34:03 -0700
Subject: [PATCH] Move JSON file check so it works for build-time and for
 install-time

---
 setup.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 5f2d007..66de9b7 100644
--- a/setup.py
+++ b/setup.py
@@ -58,6 +58,9 @@ def read_version_tag():
         else:
             return out.strip() or None
 
+    else:
+        return read_version_from_json_file()
+
     return None
 
 def read_version_from_json_file():
@@ -72,7 +75,7 @@ def parse_version_tag(tag):
     Git SHA (if available).
     '''
     if not tag or '-g' not in tag:
-        return read_version_from_json_file(), None, None
+        return tag, None, None
 
     match = re.search('(?P<version>.*)-(?P<num_commits>[0-9]+)-g(?P<sha>[0-9a-fA-F]+)', tag)