mirror of
https://github.com/TECHNOFAB11/bumpver.git
synced 2025-12-12 14:30:09 +01:00
much bugfixing
This commit is contained in:
Manuel Barkhau
parent
56c9f9b36c
commit
49e19fbf89
18 changed files with 687 additions and 451 deletions
|
|
@ -4,6 +4,7 @@ from __future__ import print_function
|
|||
from __future__ import absolute_import
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import re
|
||||
import copy
|
||||
from test import util
|
||||
|
||||
|
|
@ -13,35 +14,77 @@ from pycalver import v1rewrite
|
|||
from pycalver import v1version
|
||||
from pycalver import v2rewrite
|
||||
from pycalver import v2version
|
||||
from pycalver import v1patterns
|
||||
from pycalver import v2patterns
|
||||
|
||||
# pylint:disable=protected-access ; allowed for test code
|
||||
|
||||
|
||||
# Fix for Python<3.7
|
||||
# https://stackoverflow.com/a/56935186/62997
|
||||
copy._deepcopy_dispatch[type(re.compile(''))] = lambda r, _: r
|
||||
|
||||
|
||||
REWRITE_FIXTURE = """
|
||||
# SPDX-License-Identifier: MIT
|
||||
__version__ = "v201809.0002-beta"
|
||||
"""
|
||||
|
||||
|
||||
def test_rewrite_lines():
|
||||
old_lines = REWRITE_FIXTURE.splitlines()
|
||||
patterns = ['__version__ = "{pycalver}"']
|
||||
def test_v1_rewrite_lines_basic():
|
||||
pattern = v1patterns.compile_pattern("{pycalver}", '__version__ = "{pycalver}"')
|
||||
new_vinfo = v1version.parse_version_info("v201911.0003")
|
||||
new_lines = v1rewrite.rewrite_lines(patterns, new_vinfo, old_lines)
|
||||
|
||||
old_lines = REWRITE_FIXTURE.splitlines()
|
||||
new_lines = v1rewrite.rewrite_lines([pattern], new_vinfo, old_lines)
|
||||
|
||||
assert len(new_lines) == len(old_lines)
|
||||
assert "v201911.0003" not in "\n".join(old_lines)
|
||||
assert "v201911.0003" in "\n".join(new_lines)
|
||||
|
||||
|
||||
def test_rewrite_final():
|
||||
def test_v1_rewrite_lines():
|
||||
version_pattern = "{pycalver}"
|
||||
new_vinfo = v1version.parse_version_info("v201811.0123-beta", version_pattern)
|
||||
patterns = [v1patterns.compile_pattern(version_pattern, '__version__ = "{pycalver}"')]
|
||||
lines = v1rewrite.rewrite_lines(patterns, new_vinfo, ['__version__ = "v201809.0002-beta"'])
|
||||
assert lines == ['__version__ = "v201811.0123-beta"']
|
||||
|
||||
patterns = [v1patterns.compile_pattern(version_pattern, '__version__ = "{pep440_version}"')]
|
||||
lines = v1rewrite.rewrite_lines(patterns, new_vinfo, ['__version__ = "201809.2b0"'])
|
||||
assert lines == ['__version__ = "201811.123b0"']
|
||||
|
||||
|
||||
def test_v2_rewrite_lines():
|
||||
version_pattern = "vYYYY0M.BUILD[-RELEASE]"
|
||||
new_vinfo = v2version.parse_version_info("v201811.0123-beta", version_pattern)
|
||||
patterns = [v2patterns.compile_pattern(version_pattern, '__version__ = "{version}"')]
|
||||
lines = v2rewrite.rewrite_lines(patterns, new_vinfo, ['__version__ = "v201809.0002-alpha" '])
|
||||
assert lines == ['__version__ = "v201811.0123-beta" ']
|
||||
|
||||
lines = v2rewrite.rewrite_lines(
|
||||
patterns, new_vinfo, ['__version__ = "v201809.0002-alpha" # comment']
|
||||
)
|
||||
assert lines == ['__version__ = "v201811.0123-beta" # comment']
|
||||
|
||||
patterns = [v2patterns.compile_pattern(version_pattern, '__version__ = "YYYY0M.BLD[PYTAGNUM]"')]
|
||||
old_lines = ['__version__ = "201809.2a0"']
|
||||
lines = v2rewrite.rewrite_lines(patterns, new_vinfo, old_lines)
|
||||
assert lines == ['__version__ = "201811.123b0"']
|
||||
|
||||
|
||||
def test_v1_rewrite_final():
|
||||
# Patterns written with {release_tag} placeholder preserve
|
||||
# the release tag even if the new version is -final
|
||||
|
||||
old_lines = REWRITE_FIXTURE.splitlines()
|
||||
patterns = ['__version__ = "v{year}{month}.{build_no}-{release_tag}"']
|
||||
pattern = v1patterns.compile_pattern(
|
||||
"v{year}{month}.{build_no}-{release_tag}",
|
||||
'__version__ = "v{year}{month}.{build_no}-{release_tag}"',
|
||||
)
|
||||
new_vinfo = v1version.parse_version_info("v201911.0003")
|
||||
new_lines = v1rewrite.rewrite_lines(patterns, new_vinfo, old_lines)
|
||||
|
||||
old_lines = REWRITE_FIXTURE.splitlines()
|
||||
new_lines = v1rewrite.rewrite_lines([pattern], new_vinfo, old_lines)
|
||||
|
||||
assert len(new_lines) == len(old_lines)
|
||||
assert "v201911.0003" not in "\n".join(old_lines)
|
||||
|
|
@ -93,14 +136,19 @@ def test_error_bad_path():
|
|||
assert "setup.py" in str(ex)
|
||||
|
||||
|
||||
def test_error_bad_pattern():
|
||||
def test_v1_error_bad_pattern():
|
||||
with util.Project(project="b") as project:
|
||||
ctx = config.init_project_ctx(project.dir)
|
||||
cfg = config.parse(ctx)
|
||||
assert cfg
|
||||
|
||||
patterns = copy.deepcopy(cfg.file_patterns)
|
||||
patterns["setup.py"] = patterns["setup.py"][0] + "invalid"
|
||||
patterns = copy.deepcopy(cfg.file_patterns)
|
||||
original_pattern = patterns["setup.py"][0]
|
||||
invalid_pattern = v1patterns.compile_pattern(
|
||||
original_pattern.version_pattern,
|
||||
original_pattern.raw_pattern + ".invalid",
|
||||
)
|
||||
patterns["setup.py"] = [invalid_pattern]
|
||||
|
||||
try:
|
||||
old_vinfo = v1version.parse_version_info("v201808.0233")
|
||||
|
|
@ -118,45 +166,163 @@ __version__ = "2018.0002-beta"
|
|||
|
||||
|
||||
def test_v1_optional_release():
|
||||
old_lines = OPTIONAL_RELEASE_FIXTURE.splitlines()
|
||||
pattern = "{year}.{build_no}{release}"
|
||||
patterns = ['__version__ = "{year}.{build_no}{release}"']
|
||||
version_pattern = "{year}.{build_no}{release}"
|
||||
new_vinfo = v1version.parse_version_info("2019.0003", version_pattern)
|
||||
|
||||
new_vinfo = v1version.parse_version_info("2019.0003", pattern)
|
||||
new_lines = v1rewrite.rewrite_lines(patterns, new_vinfo, old_lines)
|
||||
raw_pattern = '__version__ = "{year}.{build_no}{release}"'
|
||||
pattern = v1patterns.compile_pattern(version_pattern, raw_pattern)
|
||||
|
||||
old_lines = OPTIONAL_RELEASE_FIXTURE.splitlines()
|
||||
new_lines = v1rewrite.rewrite_lines([pattern], new_vinfo, old_lines)
|
||||
|
||||
assert len(new_lines) == len(old_lines)
|
||||
assert "2019.0003" not in "\n".join(old_lines)
|
||||
new_text = "\n".join(new_lines)
|
||||
assert "2019.0003" in new_text
|
||||
assert "2019.0003" in "\n".join(new_lines)
|
||||
assert '__version__ = "2019.0003"' in "\n".join(new_lines)
|
||||
|
||||
new_vinfo = v1version.parse_version_info("2019.0004-beta", pattern)
|
||||
new_lines = v1rewrite.rewrite_lines(patterns, new_vinfo, old_lines)
|
||||
new_vinfo = v1version.parse_version_info("2019.0004-beta", version_pattern)
|
||||
new_lines = v1rewrite.rewrite_lines([pattern], new_vinfo, old_lines)
|
||||
|
||||
# make sure optional release tag is added back on
|
||||
assert len(new_lines) == len(old_lines)
|
||||
assert "2019.0004-beta" not in "\n".join(old_lines)
|
||||
assert "2019.0004-beta" in "\n".join(new_lines)
|
||||
assert '__version__ = "2019.0004-beta"' in "\n".join(new_lines)
|
||||
|
||||
|
||||
def test_v2_optional_release():
|
||||
old_lines = OPTIONAL_RELEASE_FIXTURE.splitlines()
|
||||
pattern = "YYYY.BUILD[-RELEASE]"
|
||||
patterns = ['__version__ = "YYYY.BUILD[-RELEASE]"']
|
||||
version_pattern = "YYYY.BUILD[-RELEASE]"
|
||||
new_vinfo = v2version.parse_version_info("2019.0003", version_pattern)
|
||||
|
||||
new_vinfo = v2version.parse_version_info("2019.0003", pattern)
|
||||
new_lines = v2rewrite.rewrite_lines(patterns, new_vinfo, old_lines)
|
||||
raw_pattern = '__version__ = "YYYY.BUILD[-RELEASE]"'
|
||||
pattern = v2patterns.compile_pattern(version_pattern, raw_pattern)
|
||||
|
||||
old_lines = OPTIONAL_RELEASE_FIXTURE.splitlines()
|
||||
new_lines = v2rewrite.rewrite_lines([pattern], new_vinfo, old_lines)
|
||||
|
||||
assert len(new_lines) == len(old_lines)
|
||||
assert "2019.0003" not in "\n".join(old_lines)
|
||||
new_text = "\n".join(new_lines)
|
||||
assert "2019.0003" in new_text
|
||||
assert '__version__ = "2019.0003"' in new_text
|
||||
assert "2019.0003" in "\n".join(new_lines)
|
||||
assert '__version__ = "2019.0003"' in "\n".join(new_lines)
|
||||
|
||||
new_vinfo = v2version.parse_version_info("2019.0004-beta", pattern)
|
||||
new_lines = v2rewrite.rewrite_lines(patterns, new_vinfo, old_lines)
|
||||
new_vinfo = v2version.parse_version_info("2019.0004-beta", version_pattern)
|
||||
new_lines = v2rewrite.rewrite_lines([pattern], new_vinfo, old_lines)
|
||||
|
||||
# make sure optional release tag is added back on
|
||||
assert len(new_lines) == len(old_lines)
|
||||
assert "2019.0004-beta" not in "\n".join(old_lines)
|
||||
assert "2019.0004-beta" in "\n".join(new_lines)
|
||||
assert '__version__ = "2019.0004-beta"' in "\n".join(new_lines)
|
||||
|
||||
|
||||
def test_v1_iter_rewritten():
|
||||
version_pattern = "{pycalver}"
|
||||
new_vinfo = v1version.parse_version_info("v201809.0123")
|
||||
|
||||
file_patterns = {
|
||||
"src/pycalver/__init__.py": [
|
||||
v1patterns.compile_pattern(version_pattern, '__version__ = "{pycalver}"'),
|
||||
]
|
||||
}
|
||||
rewritten_datas = v1rewrite.iter_rewritten(file_patterns, new_vinfo)
|
||||
rfd = list(rewritten_datas)[0]
|
||||
expected = [
|
||||
"# This file is part of the pycalver project",
|
||||
"# https://github.com/mbarkhau/pycalver",
|
||||
"#",
|
||||
"# Copyright (c) 2018-2020 Manuel Barkhau (mbarkhau@gmail.com) - MIT License",
|
||||
"# SPDX-License-Identifier: MIT",
|
||||
'"""PyCalVer: CalVer for Python Packages."""',
|
||||
'',
|
||||
'__version__ = "v201809.0123"',
|
||||
'',
|
||||
]
|
||||
assert rfd.new_lines == expected
|
||||
|
||||
|
||||
def test_v2_iter_rewritten():
|
||||
version_pattern = "vYYYY0M.BUILD[-RELEASE]"
|
||||
new_vinfo = v2version.parse_version_info("v201809.0123", version_pattern)
|
||||
|
||||
file_patterns = {
|
||||
"src/pycalver/__init__.py": [
|
||||
v2patterns.compile_pattern(version_pattern, '__version__ = "vYYYY0M.BUILD[-RELEASE]"'),
|
||||
]
|
||||
}
|
||||
|
||||
rewritten_datas = v2rewrite.iter_rewritten(file_patterns, new_vinfo)
|
||||
rfd = list(rewritten_datas)[0]
|
||||
expected = [
|
||||
"# This file is part of the pycalver project",
|
||||
"# https://github.com/mbarkhau/pycalver",
|
||||
"#",
|
||||
"# Copyright (c) 2018-2020 Manuel Barkhau (mbarkhau@gmail.com) - MIT License",
|
||||
"# SPDX-License-Identifier: MIT",
|
||||
'"""PyCalVer: CalVer for Python Packages."""',
|
||||
'',
|
||||
'__version__ = "v201809.0123"',
|
||||
'',
|
||||
]
|
||||
assert rfd.new_lines == expected
|
||||
|
||||
|
||||
def test_v1_diff():
|
||||
version_pattern = "{pycalver}"
|
||||
raw_pattern = '__version__ = "{pycalver}"'
|
||||
pattern = v1patterns.compile_pattern(version_pattern, raw_pattern)
|
||||
file_patterns = {"src/pycalver/__init__.py": [pattern]}
|
||||
|
||||
old_vinfo = v1version.parse_version_info("v201809.0123")
|
||||
new_vinfo = v1version.parse_version_info("v201910.1124")
|
||||
|
||||
diff_str = v1rewrite.diff(old_vinfo, new_vinfo, file_patterns)
|
||||
lines = diff_str.split("\n")
|
||||
|
||||
assert lines[:2] == ["--- src/pycalver/__init__.py", "+++ src/pycalver/__init__.py"]
|
||||
|
||||
assert lines[6].startswith('-__version__ = "v20')
|
||||
assert lines[7].startswith('+__version__ = "v20')
|
||||
|
||||
assert not lines[6].startswith('-__version__ = "v201809.0123"')
|
||||
|
||||
assert lines[7] == '+__version__ = "v201910.1124"'
|
||||
|
||||
raw_pattern = "Copyright (c) 2018-{year}"
|
||||
pattern = v1patterns.compile_pattern(version_pattern, raw_pattern)
|
||||
file_patterns = {'LICENSE': [pattern]}
|
||||
diff_str = v1rewrite.diff(old_vinfo, new_vinfo, file_patterns)
|
||||
|
||||
lines = diff_str.split("\n")
|
||||
assert lines[3].startswith("-MIT License Copyright (c) 2018-20")
|
||||
assert lines[4].startswith("+MIT License Copyright (c) 2018-2019")
|
||||
|
||||
|
||||
def test_v2_diff():
|
||||
version_pattern = "vYYYY0M.BUILD[-RELEASE]"
|
||||
raw_pattern = '__version__ = "vYYYY0M.BUILD[-RELEASE]"'
|
||||
pattern = v2patterns.compile_pattern(version_pattern, raw_pattern)
|
||||
file_patterns = {"src/pycalver/__init__.py": [pattern]}
|
||||
|
||||
old_vinfo = v2version.parse_version_info("v201809.0123", version_pattern)
|
||||
new_vinfo = v2version.parse_version_info("v201910.1124", version_pattern)
|
||||
|
||||
diff_str = v2rewrite.diff(old_vinfo, new_vinfo, file_patterns)
|
||||
lines = diff_str.split("\n")
|
||||
|
||||
assert lines[:2] == ["--- src/pycalver/__init__.py", "+++ src/pycalver/__init__.py"]
|
||||
|
||||
assert lines[6].startswith('-__version__ = "v20')
|
||||
assert lines[7].startswith('+__version__ = "v20')
|
||||
|
||||
assert not lines[6].startswith('-__version__ = "v201809.0123"')
|
||||
|
||||
assert lines[7] == '+__version__ = "v201910.1124"'
|
||||
|
||||
raw_pattern = "Copyright (c) 2018-YYYY"
|
||||
pattern = v2patterns.compile_pattern(version_pattern, raw_pattern)
|
||||
file_patterns = {'LICENSE': [pattern]}
|
||||
diff_str = v2rewrite.diff(old_vinfo, new_vinfo, file_patterns)
|
||||
|
||||
lines = diff_str.split("\n")
|
||||
assert lines[3].startswith("-MIT License Copyright (c) 2018-20")
|
||||
assert lines[4].startswith("+MIT License Copyright (c) 2018-2019")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue