Skip to content

Commit eb64ef5

Browse files
committed
FIX: Improve short version file handling
1 parent 8e8428f commit eb64ef5

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

nibabel/_version.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ def git_get_keywords(versionfile_abs):
167167
@register_vcs_handler("git", "keywords")
168168
def git_versions_from_keywords(keywords, tag_prefix, verbose):
169169
"""Get version information from git keywords."""
170-
if not keywords:
171-
raise NotThisMethod("no keywords at all, weird")
170+
if "refnames" not in keywords:
171+
raise NotThisMethod("Short version file found")
172172
date = keywords.get("date")
173173
if date is not None:
174174
# git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant

versioneer.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -588,8 +588,8 @@ def git_get_keywords(versionfile_abs):
588588
@register_vcs_handler("git", "keywords")
589589
def git_versions_from_keywords(keywords, tag_prefix, verbose):
590590
"""Get version information from git keywords."""
591-
if not keywords:
592-
raise NotThisMethod("no keywords at all, weird")
591+
if "refnames" not in keywords:
592+
raise NotThisMethod("Short version file found")
593593
date = keywords.get("date")
594594
if date is not None:
595595
# git-2.2.0 added "%%cI", which expands to an ISO-8601 -compliant
@@ -985,8 +985,8 @@ def git_get_keywords(versionfile_abs):
985985
@register_vcs_handler("git", "keywords")
986986
def git_versions_from_keywords(keywords, tag_prefix, verbose):
987987
"""Get version information from git keywords."""
988-
if not keywords:
989-
raise NotThisMethod("no keywords at all, weird")
988+
if "refnames" not in keywords:
989+
raise NotThisMethod("Short version file found")
990990
date = keywords.get("date")
991991
if date is not None:
992992
# git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant

0 commit comments

Comments
 (0)