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

bugfixes for semver

Browse source
This commit is contained in:
Manuel Barkhau 2020-10-15 22:26:30 +00:00
parent a3499c19a6
commit 1c21e22720
3 changed files with 53 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pycalver2/cli.py
View file

@ -175,7 +175,7 @@ def cli(verbose: int = 0) -> None:
@cli.command()
@click.argument("old_version")
@click.argument("pattern", default="vYYYY.BUILD[-TAG]")
@click.argument("pattern")
@click.option('-v' , '--verbose', count=True, help="Control log level. -vv for debug level.")
@click.option("--major", is_flag=True, default=False, help="Increment major component.")
@click.option("-m" , "--minor", is_flag=True, default=False, help="Increment minor component.")
@ -204,7 +204,7 @@ def cli(verbose: int = 0) -> None:
)
def test(
old_version: str,
pattern : str = "vYYYY.BUILD[-TAG]",
pattern : str,
verbose : int = 0,
tag : str = None,
major : bool = False,

26
src/pycalver2/v2version.py
View file

@ -617,6 +617,24 @@ def _incr_numeric(
tag : typ.Optional[str],
tag_num : bool,
) -> version.V2VersionInfo:
"""Increment (and reset to zero) non CalVer parts.
>>> raw_pattern = 'MAJOR.MINOR.PATCH[PYTAGNUM]'
>>> old_vinfo = parse_field_values_to_vinfo({'major': "1", 'minor': "2", 'patch': "3"})
>>> cur_vinfo = old_vinfo
>>> new_vinfo = _incr_numeric(
... raw_pattern,
... cur_vinfo,
... old_vinfo,
... major=False,
... minor=False,
... patch=True,
... tag='beta',
... tag_num=False,
... )
>>> (new_vinfo.major, new_vinfo.minor, new_vinfo.patch, new_vinfo.tag, new_vinfo.pytag, new_vinfo.num)
(1, 2, 4, 'beta', 'b', 0)
"""
# Reset major/minor/patch/num/inc to zero if any part to the left of it is incremented
fields = _parse_pattern_fields(raw_pattern)
reset_fields = dict(_iter_reset_field_items(fields, old_vinfo, cur_vinfo))
@ -653,6 +671,14 @@ def _incr_numeric(
if tag != cur_vinfo.tag:
cur_vinfo = cur_vinfo._replace(num=0)
cur_vinfo = cur_vinfo._replace(tag=tag)
if cur_vinfo.tag and not cur_vinfo.pytag:
pytag = version.PEP440_TAG_BY_TAG[cur_vinfo.tag]
cur_vinfo = cur_vinfo._replace(pytag=pytag)
elif cur_vinfo.pytag and not cur_vinfo.tag:
tag = version.TAG_BY_PEP440_TAG[cur_vinfo.pytag]
cur_vinfo = cur_vinfo._replace(tag=tag)
return cur_vinfo