module reorg

This commit is contained in:
Manuel Barkhau 2020-09-19 22:35:48 +00:00
parent e1aaf7629b
commit 8af5047244
23 changed files with 1658 additions and 1532 deletions

View file

@ -13,8 +13,8 @@ import pytest
import pathlib2 as pl
from click.testing import CliRunner
import pycalver.config as config
import pycalver.patterns as v1patterns
from pycalver import config
from pycalver import v1patterns
from pycalver.__main__ import cli
# pylint:disable=redefined-outer-name ; pytest fixtures

View file

@ -4,8 +4,8 @@ from __future__ import print_function
from __future__ import absolute_import
from __future__ import unicode_literals
import pycalver.patterns as v1patterns
from pycalver import parse
from pycalver import v1patterns
SETUP_PY_FIXTURE = """
# setup.py

View file

@ -8,8 +8,8 @@ import re
import pytest
import pycalver.patterns as v1patterns
import pycalver2.patterns as v2patterns
from pycalver import v1patterns
from pycalver import v2patterns
# TODO (mb 2020-09-06): test for v2patterns

View file

@ -8,10 +8,11 @@ import copy
from test import util
from pycalver import config
from pycalver import rewrite as v1rewrite
from pycalver import version as v1version
from pycalver2 import rewrite as v2rewrite
from pycalver2 import version as v2version
from pycalver import rewrite
from pycalver import v1rewrite
from pycalver import v1version
from pycalver import v2rewrite
from pycalver import v2version
# pylint:disable=protected-access ; allowed for test code
@ -54,7 +55,7 @@ def test_iter_file_paths():
cfg = config.parse(ctx)
assert cfg
_paths_and_patterns = v1rewrite.iter_file_paths(cfg.file_patterns)
_paths_and_patterns = rewrite.iter_path_patterns_items(cfg.file_patterns)
file_paths = {str(file_path) for file_path, patterns in _paths_and_patterns}
assert file_paths == {"pycalver.toml", "README.md"}
@ -66,7 +67,7 @@ def test_iter_file_globs():
cfg = config.parse(ctx)
assert cfg
_paths_and_patterns = v1rewrite.iter_file_paths(cfg.file_patterns)
_paths_and_patterns = rewrite.iter_path_patterns_items(cfg.file_patterns)
file_paths = {str(file_path) for file_path, patterns in _paths_and_patterns}
assert file_paths == {
@ -86,7 +87,7 @@ def test_error_bad_path():
(project.dir / "setup.py").unlink()
try:
list(v1rewrite.iter_file_paths(cfg.file_patterns))
list(rewrite.iter_path_patterns_items(cfg.file_patterns))
assert False, "expected IOError"
except IOError as ex:
assert "setup.py" in str(ex)
@ -102,10 +103,11 @@ def test_error_bad_pattern():
patterns["setup.py"] = patterns["setup.py"][0] + "invalid"
try:
old_vinfo = v1version.parse_version_info("v201808.0233")
new_vinfo = v1version.parse_version_info("v201809.1234")
list(v1rewrite.diff(new_vinfo, patterns))
assert False, "expected v1rewrite.NoPatternMatch"
except v1rewrite.NoPatternMatch as ex:
list(v1rewrite.diff(old_vinfo, new_vinfo, patterns))
assert False, "expected rewrite.NoPatternMatch"
except rewrite.NoPatternMatch as ex:
assert "setup.py" in str(ex)

View file

@ -9,9 +9,10 @@ import datetime as dt
import pytest
import pycalver.version as v1version
import pycalver2.version as v2version
import pycalver.patterns as v1patterns
from pycalver import version
from pycalver import v1version
from pycalver import v2version
from pycalver import v1patterns
# import pycalver2.patterns as v2patterns
@ -51,7 +52,7 @@ def test_bump_random(monkeypatch):
cur_date = dt.date(2016, 1, 1) + dt.timedelta(days=random.randint(1, 2000))
cur_version = cur_date.strftime("v%Y%m") + ".0001-dev"
monkeypatch.setattr(v1version, 'TODAY', cur_date)
monkeypatch.setattr(version, 'TODAY', cur_date)
for _ in range(1000):
cur_date += dt.timedelta(days=int((1 + random.random()) ** 10))
@ -120,7 +121,7 @@ def test_parse_error_empty():
try:
v1version.parse_version_info("")
assert False
except v1version.PatternError as err:
except version.PatternError as err:
assert "Invalid version string" in str(err)
@ -128,7 +129,7 @@ def test_parse_error_noprefix():
try:
v1version.parse_version_info("201809.0002")
assert False
except v1version.PatternError as err:
except version.PatternError as err:
assert "Invalid version string" in str(err)
@ -136,7 +137,7 @@ def test_parse_error_nopadding():
try:
v1version.parse_version_info("v201809.2b0")
assert False
except v1version.PatternError as err:
except version.PatternError as err:
assert "Invalid version string" in str(err)
@ -151,7 +152,7 @@ def test_part_field_mapping_v1():
assert not any(b_extra_names), sorted(b_extra_names)
a_fields = set(v1patterns.PATTERN_PART_FIELDS.values())
b_fields = set(v1version.VersionInfo._fields)
b_fields = set(version.V1VersionInfo._fields)
a_extra_fields = a_fields - b_fields
b_extra_fields = b_fields - a_fields
@ -200,7 +201,7 @@ def test_v1_parse_versions(pattern_str, line, expected_vinfo):
# def test_v2_parse_versions(pattern_str, line, expected_vinfo):
def test_v2_parse_versions():
_vnfo = v2version.parse_version_info("v201712.0033", pattern="vYYYY0M.BUILD[-TAG[NUM]]")
_vnfo = v2version.parse_version_info("v201712.0033", raw_pattern="vYYYY0M.BUILD[-TAG[NUM]]")
fvals = {'year_y': 2017, 'month': 12, 'bid': "0033"}
assert _vnfo == v2version._parse_version_info(fvals)
@ -217,24 +218,24 @@ def test_make_segments():
def test_v2_format_version():
pattern = "vYYYY0M.BUILD[-TAG[NUM]]"
version_pattern = "vYYYY0M.BUILD[-TAG[NUM]]"
in_version = "v200701.0033-beta"
vinfo = v2version.parse_version_info(in_version, pattern=pattern)
out_version = v2version.format_version(vinfo, pattern=pattern)
vinfo = v2version.parse_version_info(in_version, raw_pattern=version_pattern)
out_version = v2version.format_version(vinfo, raw_pattern=version_pattern)
assert in_version == out_version
result = v2version.format_version(vinfo, pattern="v0Y.BUILD[-TAG]")
result = v2version.format_version(vinfo, raw_pattern="v0Y.BUILD[-TAG]")
assert result == "v07.0033-beta"
result = v2version.format_version(vinfo, pattern="vYY.BLD[-TAG]")
result = v2version.format_version(vinfo, raw_pattern="vYY.BLD[-TAG]")
assert result == "v7.33-beta"
result = v2version.format_version(vinfo, pattern="vYY.BLD-TAG")
result = v2version.format_version(vinfo, raw_pattern="vYY.BLD-TAG")
assert result == "v7.33-beta"
result = v2version.format_version(vinfo, pattern='__version__ = "YYYY.BUILD[-TAG]"')
result = v2version.format_version(vinfo, raw_pattern='__version__ = "YYYY.BUILD[-TAG]"')
assert result == '__version__ = "2007.0033-beta"'
result = v2version.format_version(vinfo, pattern='__version__ = "YYYY.BLD"')
result = v2version.format_version(vinfo, raw_pattern='__version__ = "YYYY.BLD"')
assert result == '__version__ = "2007.33"'