Merge pull request #61 from EugeniuZ/master

Fallback to reading version from json file
saltstack · Nov 6, 2015 · de2baa5 · de2baa5
2 parents 5e77f24 + 0a419f8
commit de2baa5
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/setup.py b/setup.py
@@ -60,6 +60,10 @@ def read_version_tag():
 
     return None
 
+def read_version_from_json_file():
+    with open(os.path.join(os.path.dirname(__file__), "pepper", "version.json")) as f:
+        return json.load(f)['version']
+
 def parse_version_tag(tag):
     '''
     Parse the output from Git describe
@@ -68,7 +72,7 @@ def parse_version_tag(tag):
     Git SHA (if available).
     '''
     if not tag or '-g' not in tag:
-        return tag, None, None
+        return read_version_from_json_file(), None, None
 
     match = re.search('(?P<version>.*)-(?P<num_commits>[0-9]+)-g(?P<sha>[0-9a-fA-F]+)', tag)