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

cleanup and formatting

Browse source
This commit is contained in:
Manuel Barkhau 2018-12-21 19:17:58 +01:00
parent 70c2b27157
commit f980139e82
4 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
makefile.extra.make
View file

@ -24,6 +24,7 @@ test_compat: $(COMPAT_TEST_FILES)
cp -R test/fixtures compat_test/ cp -R test/fixtures compat_test/
# install the package and run the test suite against it. # install the package and run the test suite against it.
rm -rf build/test_wheel;
mkdir -p build/test_wheel; mkdir -p build/test_wheel;
$(DEV_ENV_PY) setup.py bdist_wheel --dist-dir build/test_wheel; $(DEV_ENV_PY) setup.py bdist_wheel --dist-dir build/test_wheel;

4
setup.py
View file

@ -31,6 +31,7 @@ package_dir = {"": "src"}
if any(arg.startswith("bdist") for arg in sys.argv): if any(arg.startswith("bdist") for arg in sys.argv):
import lib3to6 import lib3to6
package_dir = lib3to6.fix(package_dir) package_dir = lib3to6.fix(package_dir)
@ -44,12 +45,11 @@ setuptools.setup(
author_email="mbarkhau@gmail.com", author_email="mbarkhau@gmail.com",
url="https://gitlab.com/mbarkhau/pycalver", url="https://gitlab.com/mbarkhau/pycalver",
version="201812.11b0", version="201812.11b0",
keywords="version versioning bumpversion calver", keywords="version versioning bumpversion calver",
description="CalVer versioning for python libraries.", description="CalVer versioning for python libraries.",
long_description=long_description, long_description=long_description,
long_description_content_type="text/markdown", long_description_content_type="text/markdown",
packages=["pycalver"], packages=['pycalver'],
package_dir=package_dir, package_dir=package_dir,
install_requires=install_requires, install_requires=install_requires,
entry_points=""" entry_points="""

6
src/pycalver/parse.py
View file

@ -58,7 +58,7 @@ class PatternMatch(typ.NamedTuple):
PatternMatches = typ.Iterable[PatternMatch] PatternMatches = typ.Iterable[PatternMatch]
def compile_pattern(pattern: str) -> typ.Pattern[str] : def compile_pattern(pattern: str) -> typ.Pattern[str]:
pattern_tmpl = pattern pattern_tmpl = pattern
for char, escaped in PATTERN_ESCAPES: for char, escaped in PATTERN_ESCAPES:
@ -66,7 +66,9 @@ def compile_pattern(pattern: str) -> typ.Pattern[str] :
# undo escaping only for valid part names # undo escaping only for valid part names
for part_name in RE_PATTERN_PARTS.keys(): for part_name in RE_PATTERN_PARTS.keys():
pattern_tmpl = pattern_tmpl.replace("\u005c{{" + part_name + "\u005c}}", "{" + part_name + "}") pattern_tmpl = pattern_tmpl.replace(
"\u005c{{" + part_name + "\u005c}}", "{" + part_name + "}"
)
pattern_str = pattern_tmpl.format(**RE_PATTERN_PARTS) pattern_str = pattern_tmpl.format(**RE_PATTERN_PARTS)
return re.compile(pattern_str) return re.compile(pattern_str)

10
test/test_parse.py
View file

@ -126,7 +126,7 @@ CLI_MAIN_FIXTURE = """
def test_pattern_escapes(): def test_pattern_escapes():
pattern_re = parse.compile_pattern(r'click.version_option(version="{version}")') pattern_re = parse.compile_pattern(r'click.version_option(version="{version}")')
match = pattern_re.search(CLI_MAIN_FIXTURE) match = pattern_re.search(CLI_MAIN_FIXTURE)
assert match.group(0) == 'click.version_option(version="v201812.0123-beta")' assert match.group(0) == 'click.version_option(version="v201812.0123-beta")'
@ -136,7 +136,9 @@ package_metadata = {"name": "mypackage", "version": "v201812.0123-beta"}
def test_curly_escapes(): def test_curly_escapes():
pattern = r'package_metadata = {"name": "mypackage", "version": "{version}"}' pattern = r'package_metadata = {"name": "mypackage", "version": "{version}"}'
pattern_re = parse.compile_pattern(pattern) pattern_re = parse.compile_pattern(pattern)
match = pattern_re.search(CURLY_BRACE_FIXTURE) match = pattern_re.search(CURLY_BRACE_FIXTURE)
assert match.group(0) == 'package_metadata = {"name": "mypackage", "version": "v201812.0123-beta"}' assert (
match.group(0) == 'package_metadata = {"name": "mypackage", "version": "v201812.0123-beta"}'
)