MAINT: Add fallback version to versioneer + git-archive

Author: effigies

nibabel/_version.py

@@ -15,6 +15,7 @@
 import re
 import subprocess
 import sys
+import runpy
 
 
 def get_keywords():
@@ -155,6 +156,11 @@ def git_get_keywords(versionfile_abs):
         f.close()
     except EnvironmentError:
         pass
+    try:
+        rel = runpy.run_path(os.path.join(os.path.dirname(versionfile_abs), "info.py"))
+        keywords["fallback"] = rel["VERSION"]
+    except (FileNotFoundError, KeyError):
+        pass
     return keywords
 
 
@@ -205,10 +211,10 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
                     "full-revisionid": keywords["full"].strip(),
                     "dirty": False, "error": None,
                     "date": date}
-    # no suitable tags, so version is "0+unknown", but full hex is still there
+    # no suitable tags, so inspect ./info.py
     if verbose:
-        print("no suitable tags, using unknown + full revision id")
-    return {"version": "0+unknown",
+        print("no suitable tags, falling back to info.VERSION or 0+unknown")
+    return {"version": keywords.get("fallback", "0+unknown"),
             "full-revisionid": keywords["full"].strip(),
             "dirty": False, "error": "no suitable tags", "date": None}
 

nibabel/info.py

@@ -1,11 +1,28 @@
-""" Define long_description parameter
+""" Define distribution parameters for nibabel, including package version
 
-This parameter is used to fill settings in setup.py, the nibabel top-level
-docstring, and in building the docs.
+The long description parameter is used to fill settings in setup.py, the
+nibabel top-level docstring, and in building the docs.
 We exec this file in several places, so it cannot import nibabel or use
 relative imports.
 """
 
+# nibabel version information
+# This is a fall-back for versioneer when installing from a git archive.
+# This should be set to the intended next version + dev to indicate a
+# development (pre-release) version.
+_version_major = 3
+_version_minor = 0
+_version_micro = 0
+_version_extra = 'dev'
+# _version_extra = ''
+
+# Format expected by setup.py and doc/source/conf.py: string of form "X.Y.Z"
+VERSION = "%s.%s.%s%s" % (_version_major,
+                          _version_minor,
+                          _version_micro,
+                          _version_extra)
+
+
 # Note: this long_description is the canonical place to edit this text.
 # It also appears in README.rst, but it should get there by running
 # ``tools/refresh_readme.py`` which pulls in this version.

versioneer.py

@@ -287,6 +287,7 @@
 import re
 import subprocess
 import sys
+import runpy
 
 
 class VersioneerConfig:
@@ -435,6 +436,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
 import re
 import subprocess
 import sys
+import runpy
 
 
 def get_keywords():
@@ -575,6 +577,11 @@ def git_get_keywords(versionfile_abs):
         f.close()
     except EnvironmentError:
         pass
+    try:
+        rel = runpy.run_path(os.path.join(os.path.dirname(versionfile_abs), "info.py"))
+        keywords["fallback"] = rel["VERSION"]
+    except (FileNotFoundError, KeyError):
+        pass
     return keywords
 
 
@@ -625,10 +632,10 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
                     "full-revisionid": keywords["full"].strip(),
                     "dirty": False, "error": None,
                     "date": date}
-    # no suitable tags, so version is "0+unknown", but full hex is still there
+    # no suitable tags, so inspect ./info.py
     if verbose:
-        print("no suitable tags, using unknown + full revision id")
-    return {"version": "0+unknown",
+        print("no suitable tags, falling back to info.VERSION or 0+unknown")
+    return {"version": keywords.get("fallback", "0+unknown"),
             "full-revisionid": keywords["full"].strip(),
             "dirty": False, "error": "no suitable tags", "date": None}
 
@@ -967,6 +974,11 @@ def git_get_keywords(versionfile_abs):
         f.close()
     except EnvironmentError:
         pass
+    try:
+        rel = runpy.run_path(os.path.join(os.path.dirname(versionfile_abs), "info.py"))
+        keywords["fallback"] = rel["VERSION"]
+    except (FileNotFoundError, KeyError):
+        pass
     return keywords
 
 
@@ -1017,10 +1029,10 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
                     "full-revisionid": keywords["full"].strip(),
                     "dirty": False, "error": None,
                     "date": date}
-    # no suitable tags, so version is "0+unknown", but full hex is still there
+    # no suitable tags, so inspect ./info.py
     if verbose:
-        print("no suitable tags, using unknown + full revision id")
-    return {"version": "0+unknown",
+        print("no suitable tags, falling back to info.VERSION or 0+unknown")
+    return {"version": keywords.get("fallback", "0+unknown"),
             "full-revisionid": keywords["full"].strip(),
             "dirty": False, "error": "no suitable tags", "date": None}