Skip to content

Commit

Permalink
Bump versioneer
Browse files Browse the repository at this point in the history
  • Loading branch information
gatesn committed Jun 22, 2017
1 parent e8b00aa commit 88712b5
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 10 deletions.
4 changes: 4 additions & 0 deletions pyls/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@

hookspec = pluggy.HookspecMarker(PYLS)
hookimpl = pluggy.HookimplMarker(PYLS)

from ._version import get_versions
__version__ = get_versions()['version']
del get_versions
7 changes: 3 additions & 4 deletions pyls/_version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Copyright 2017 Palantir Technologies, Inc.

# 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
Expand All @@ -7,7 +6,7 @@
# that just contains the computed version number.

# 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."""

Expand Down Expand Up @@ -42,8 +41,8 @@ def get_config():
cfg = VersioneerConfig()
cfg.VCS = "git"
cfg.style = "pep440"
cfg.tag_prefix = "None"
cfg.parentdir_prefix = "None"
cfg.tag_prefix = ""
cfg.parentdir_prefix = ""
cfg.versionfile_source = "pyls/_version.py"
cfg.verbose = False
return cfg
Expand Down
17 changes: 11 additions & 6 deletions versioneer.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# Version: 0.17
# Version: 0.18

"""The Versioneer - like a rocketeer, but for versions.
Expand All @@ -10,7 +10,7 @@
* https://github.com/warner/python-versioneer
* Brian Warner
* 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]
(https://pypip.in/version/versioneer/badge.svg?style=flat)
](https://pypi.python.org/pypi/versioneer/)
Expand Down Expand Up @@ -151,8 +151,8 @@
software (exactly equal to a known tag), the identifier will only contain the
stripped tag, e.g. "0.11".
Other styles are available. See details.md in the Versioneer source tree for
descriptions.
Other styles are available. See [details.md](details.md) in the Versioneer
source tree for descriptions.
## Debugging
Expand Down Expand Up @@ -364,6 +364,7 @@ def get(parser, name):
class NotThisMethod(Exception):
"""Exception raised if a method is not valid for the current scenario."""


# these dictionaries contain VCS-specific tools
LONG_VERSION_PY = {}
HANDLERS = {}
Expand Down Expand Up @@ -415,6 +416,8 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
print("stdout was %s" % stdout)
return None, p.returncode
return stdout, p.returncode


LONG_VERSION_PY['git'] = '''
# 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
Expand All @@ -423,7 +426,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
# that just contains the computed version number.
# 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."""
Expand Down Expand Up @@ -1176,8 +1179,9 @@ def versions_from_parentdir(parentdir_prefix, root, verbose):
(str(rootdirs), parentdir_prefix))
raise NotThisMethod("rootdir doesn't start with parentdir_prefix")


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
# unpacked source archive. Distribution tarballs contain a pre-generated copy
# of this file.
Expand Down Expand Up @@ -1808,6 +1812,7 @@ def scan_setup_py():
errors += 1
return errors


if __name__ == "__main__":
cmd = sys.argv[1]
if cmd == "setup":
Expand Down

0 comments on commit 88712b5

Please sign in to comment.