technofab/bumpver
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/bumpver.git synced 2025-12-12 22:40:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix tag vcs parsing and output

Browse source
This commit is contained in:
Manuel Barkhau 2018-12-21 19:22:50 +01:00
parent 658ef57478
commit d35f5117fc
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pycalver/__main__.py
View file

@ -107,11 +107,15 @@ def _update_cfg_from_vcs(cfg: config.Config, fetch: bool) -> config.Config:
if version_tags: if version_tags:
version_tags.sort(reverse=True) version_tags.sort(reverse=True)
log.debug(f"found {len(version_tags)} tags: {version_tags[:2]}") log.debug(f"found {len(version_tags)} tags: {version_tags[:2]}")
latest_version_tag = version_tags[0] latest_version_tag = version_tags[0]
latest_version_pep440 = version.pycalver_to_pep440(latest_version_tag)
if latest_version_tag > cfg.current_version: if latest_version_tag > cfg.current_version:
log.info(f"Working dir version : {cfg.current_version}") log.info(f"Working dir version : {cfg.current_version}")
log.info(f"Latest version from {_vcs.name:>3} tag: {latest_version_tag}") log.info(f"Latest version from {_vcs.name:>3} tag: {latest_version_tag}")
cfg = cfg._replace(current_version=latest_version_tag) cfg = cfg._replace(
current_version=latest_version_tag, pep440_version=latest_version_pep440
)
else: else:
log.debug("no vcs tags found") log.debug("no vcs tags found")
except OSError: except OSError:

4
src/pycalver/vcs.py
View file

@ -115,7 +115,9 @@ class VCS:
"""List vcs tags on all branches.""" """List vcs tags on all branches."""
ls_tag_lines = self('ls_tags').splitlines() ls_tag_lines = self('ls_tags').splitlines()
log.debug(f"ls_tags output {ls_tag_lines}") log.debug(f"ls_tags output {ls_tag_lines}")
return [line.strip() for line in ls_tag_lines if line.strip().startswith("v")] return [
line.strip().split(" ", 1)[0] for line in ls_tag_lines if line.strip().startswith("v")
]
def add(self, path: str) -> None: def add(self, path: str) -> None:
"""Add updates to be included in next commit.""" """Add updates to be included in next commit."""