Skip to content

Commit

Permalink
Update version.py from autover for various fixes:
Browse files Browse the repository at this point in the history
  * Allow develop_install to work (holoviz-dev/autover#41)

  * Failed to report 'dirty' for commit count of 0 (holoviz-dev/autover#44)
  • Loading branch information
ceball committed Apr 24, 2018
1 parent 06894b5 commit d1fbd38
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions param/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ def __str__(self):
release = '.'.join(str(el) for el in self.release)
prerelease = '' if self.prerelease is None else self.prerelease

if self.commit_count == 0:
if self.commit_count == 0 and not self.dirty:
return release + prerelease

commit = self.commit
Expand Down Expand Up @@ -438,7 +438,7 @@ def verify(self, string_version=None):

@classmethod
def get_setup_version(cls, setup_path, reponame, describe=False,
dirty='raise', pkgname=None, archive_commit=None):
dirty='report', pkgname=None, archive_commit=None):
"""
Helper for use in setup.py to get the version from the .version file (if available)
or more up-to-date information from git describe (if available).
Expand Down Expand Up @@ -492,7 +492,7 @@ def extract_directory_tag(cls, setup_path, reponame):

@classmethod
def setup_version(cls, setup_path, reponame, archive_commit=None,
pkgname=None, dirty='raise'):
pkgname=None, dirty='report'):
info = {}
git_describe = None
pkgname = reponame if pkgname is None else pkgname
Expand Down

0 comments on commit d1fbd38

Please sign in to comment.