From f980139e82d1d44f66680e856e96fb529bb0089b Mon Sep 17 00:00:00 2001 From: Manuel Barkhau Date: Fri, 21 Dec 2018 19:17:58 +0100 Subject: [PATCH] cleanup and formatting --- makefile.extra.make | 1 + setup.py | 4 ++-- src/pycalver/parse.py | 6 ++++-- test/test_parse.py | 10 ++++++---- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/makefile.extra.make b/makefile.extra.make index 0d25ea6..6ac0cd3 100644 --- a/makefile.extra.make +++ b/makefile.extra.make @@ -24,6 +24,7 @@ test_compat: $(COMPAT_TEST_FILES) cp -R test/fixtures compat_test/ # install the package and run the test suite against it. + rm -rf build/test_wheel; mkdir -p build/test_wheel; $(DEV_ENV_PY) setup.py bdist_wheel --dist-dir build/test_wheel; diff --git a/setup.py b/setup.py index 39949bf..195b091 100644 --- a/setup.py +++ b/setup.py @@ -31,6 +31,7 @@ package_dir = {"": "src"} if any(arg.startswith("bdist") for arg in sys.argv): import lib3to6 + package_dir = lib3to6.fix(package_dir) @@ -44,12 +45,11 @@ setuptools.setup( author_email="mbarkhau@gmail.com", url="https://gitlab.com/mbarkhau/pycalver", version="201812.11b0", - keywords="version versioning bumpversion calver", description="CalVer versioning for python libraries.", long_description=long_description, long_description_content_type="text/markdown", - packages=["pycalver"], + packages=['pycalver'], package_dir=package_dir, install_requires=install_requires, entry_points=""" diff --git a/src/pycalver/parse.py b/src/pycalver/parse.py index 9b0b59c..91152b8 100644 --- a/src/pycalver/parse.py +++ b/src/pycalver/parse.py @@ -58,7 +58,7 @@ class PatternMatch(typ.NamedTuple): PatternMatches = typ.Iterable[PatternMatch] -def compile_pattern(pattern: str) -> typ.Pattern[str] : +def compile_pattern(pattern: str) -> typ.Pattern[str]: pattern_tmpl = pattern 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 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) return re.compile(pattern_str) diff --git a/test/test_parse.py b/test/test_parse.py index a7b53c8..8b38975 100644 --- a/test/test_parse.py +++ b/test/test_parse.py @@ -126,7 +126,7 @@ CLI_MAIN_FIXTURE = """ def test_pattern_escapes(): 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")' @@ -136,7 +136,9 @@ package_metadata = {"name": "mypackage", "version": "v201812.0123-beta"} 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) - match = pattern_re.search(CURLY_BRACE_FIXTURE) - assert match.group(0) == 'package_metadata = {"name": "mypackage", "version": "v201812.0123-beta"}' + match = pattern_re.search(CURLY_BRACE_FIXTURE) + assert ( + match.group(0) == 'package_metadata = {"name": "mypackage", "version": "v201812.0123-beta"}' + )