upgrade to versioneer-0.18

This commit is contained in:
Brian Warner 2017-01-01 14:10:57 -05:00
parent 7393f1e80d
commit 92f8c60b31
2 changed files with 12 additions and 7 deletions

View File

@ -6,7 +6,7 @@
# that just contains the computed version number. # that just contains the computed version number.
# This file is released into the public domain. Generated by # This file is released into the public domain. Generated by
# versioneer-0.17 (https://github.com/warner/python-versioneer) # versioneer-0.18 (https://github.com/warner/python-versioneer)
"""Git implementation of _version.py.""" """Git implementation of _version.py."""

View File

@ -1,5 +1,5 @@
# Version: 0.17 # Version: 0.18
"""The Versioneer - like a rocketeer, but for versions. """The Versioneer - like a rocketeer, but for versions.
@ -10,7 +10,7 @@ The Versioneer
* https://github.com/warner/python-versioneer * https://github.com/warner/python-versioneer
* Brian Warner * Brian Warner
* License: Public Domain * License: Public Domain
* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, 3.5, and pypy * Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, and pypy
* [![Latest Version] * [![Latest Version]
(https://pypip.in/version/versioneer/badge.svg?style=flat) (https://pypip.in/version/versioneer/badge.svg?style=flat)
](https://pypi.python.org/pypi/versioneer/) ](https://pypi.python.org/pypi/versioneer/)
@ -151,8 +151,8 @@ that this commit is two revisions ("+2") beyond the "0.11" tag. For released
software (exactly equal to a known tag), the identifier will only contain the software (exactly equal to a known tag), the identifier will only contain the
stripped tag, e.g. "0.11". stripped tag, e.g. "0.11".
Other styles are available. See details.md in the Versioneer source tree for Other styles are available. See [details.md](details.md) in the Versioneer
descriptions. source tree for descriptions.
## Debugging ## Debugging
@ -364,6 +364,7 @@ def get_config_from_root(root):
class NotThisMethod(Exception): class NotThisMethod(Exception):
"""Exception raised if a method is not valid for the current scenario.""" """Exception raised if a method is not valid for the current scenario."""
# these dictionaries contain VCS-specific tools # these dictionaries contain VCS-specific tools
LONG_VERSION_PY = {} LONG_VERSION_PY = {}
HANDLERS = {} HANDLERS = {}
@ -415,6 +416,8 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
print("stdout was %s" % stdout) print("stdout was %s" % stdout)
return None, p.returncode return None, p.returncode
return stdout, p.returncode return stdout, p.returncode
LONG_VERSION_PY['git'] = ''' LONG_VERSION_PY['git'] = '''
# This file helps to compute a version number in source trees obtained from # This file helps to compute a version number in source trees obtained from
# git-archive tarball (such as those provided by githubs download-from-tag # git-archive tarball (such as those provided by githubs download-from-tag
@ -423,7 +426,7 @@ LONG_VERSION_PY['git'] = '''
# that just contains the computed version number. # that just contains the computed version number.
# This file is released into the public domain. Generated by # This file is released into the public domain. Generated by
# versioneer-0.17 (https://github.com/warner/python-versioneer) # versioneer-0.18 (https://github.com/warner/python-versioneer)
"""Git implementation of _version.py.""" """Git implementation of _version.py."""
@ -1176,8 +1179,9 @@ def versions_from_parentdir(parentdir_prefix, root, verbose):
(str(rootdirs), parentdir_prefix)) (str(rootdirs), parentdir_prefix))
raise NotThisMethod("rootdir doesn't start with parentdir_prefix") raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
SHORT_VERSION_PY = """ SHORT_VERSION_PY = """
# This file was generated by 'versioneer.py' (0.17) from # This file was generated by 'versioneer.py' (0.18) from
# revision-control system data, or from the parent directory name of an # revision-control system data, or from the parent directory name of an
# unpacked source archive. Distribution tarballs contain a pre-generated copy # unpacked source archive. Distribution tarballs contain a pre-generated copy
# of this file. # of this file.
@ -1808,6 +1812,7 @@ def scan_setup_py():
errors += 1 errors += 1
return errors return errors
if __name__ == "__main__": if __name__ == "__main__":
cmd = sys.argv[1] cmd = sys.argv[1]
if cmd == "setup": if cmd == "setup":