From 99c14c0df9152bd4222699ad7698583169313520 Mon Sep 17 00:00:00 2001 From: Manuel Barkhau Date: Fri, 22 Feb 2019 22:47:44 +0100 Subject: [PATCH] make fmt --- src/pycalver/__main__.py | 4 +++- src/pycalver/config.py | 2 +- src/pycalver/rewrite.py | 2 +- test/fixtures/project_b/src/module_v1/__init__.py | 1 - test/fixtures/project_b/src/module_v2/__init__.py | 1 - test/test_cli.py | 6 ++++-- test/test_rewrite.py | 5 +---- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/pycalver/__main__.py b/src/pycalver/__main__.py index a605fe4..5dfc7ae 100755 --- a/src/pycalver/__main__.py +++ b/src/pycalver/__main__.py @@ -27,8 +27,9 @@ _VERBOSE = 0 # To enable pretty tracebacks: # echo "export ENABLE_BACKTRACE=1;" >> ~/.bashrc -if os.environ.get('ENABLE_BACKTRACE') == "1": +if os.environ.get('ENABLE_BACKTRACE') == '1': import backtrace + backtrace.hook(align=True, strip_path=True, enable_on_envvar_only=True) @@ -327,5 +328,6 @@ def bump( _bump(cfg, new_version, allow_dirty) + if __name__ == '__main__': cli() diff --git a/src/pycalver/config.py b/src/pycalver/config.py index 6af41a8..ca42884 100644 --- a/src/pycalver/config.py +++ b/src/pycalver/config.py @@ -20,7 +20,7 @@ from . import version log = logging.getLogger("pycalver.config") -Patterns = typ.List[str] +Patterns = typ.List[str] PatternsByGlob = typ.Dict[str, Patterns] SUPPORTED_CONFIGS = ["setup.cfg", "pyproject.toml", "pycalver.toml"] diff --git a/src/pycalver/rewrite.py b/src/pycalver/rewrite.py index f03d1bd..413ebf1 100644 --- a/src/pycalver/rewrite.py +++ b/src/pycalver/rewrite.py @@ -187,7 +187,7 @@ def diff(new_version: str, file_patterns: config.PatternsByGlob) -> str: content = fh.read() try: - rfd = rfd_from_content(pattern_strs, new_version, content) + rfd = rfd_from_content(pattern_strs, new_version, content) except ValueError: errmsg = f"No patterns matched for '{file_path}'" raise ValueError(errmsg) diff --git a/test/fixtures/project_b/src/module_v1/__init__.py b/test/fixtures/project_b/src/module_v1/__init__.py index 155d8a7..542862f 100644 --- a/test/fixtures/project_b/src/module_v1/__init__.py +++ b/test/fixtures/project_b/src/module_v1/__init__.py @@ -1,2 +1 @@ - __version__ = "v201307.0456-beta" diff --git a/test/fixtures/project_b/src/module_v2/__init__.py b/test/fixtures/project_b/src/module_v2/__init__.py index 155d8a7..542862f 100644 --- a/test/fixtures/project_b/src/module_v2/__init__.py +++ b/test/fixtures/project_b/src/module_v2/__init__.py @@ -1,2 +1 @@ - __version__ = "v201307.0456-beta" diff --git a/test/test_cli.py b/test/test_cli.py index db33ead..7e945af 100644 --- a/test/test_cli.py +++ b/test/test_cli.py @@ -166,10 +166,12 @@ def test_incr_invalid(runner): def _add_project_files(*files): if "README.md" in files: with pl.Path("README.md").open(mode="wt", encoding="utf-8") as fh: - fh.write(""" + fh.write( + """ Hello World v201701.0002-alpha ! aka. 201701.2a0 ! - """) + """ + ) if "setup.cfg" in files: with pl.Path("setup.cfg").open(mode="wt", encoding="utf-8") as fh: diff --git a/test/test_rewrite.py b/test/test_rewrite.py index 093995a..af277a4 100644 --- a/test/test_rewrite.py +++ b/test/test_rewrite.py @@ -46,10 +46,7 @@ def test_iter_file_paths(): str(file_path) for file_path, patterns in rewrite._iter_file_paths(cfg.file_patterns) } - assert file_paths == { - "pycalver.toml", - "README.md", - } + assert file_paths == {"pycalver.toml", "README.md"} def test_iter_file_globs():