flake8 pacification

This commit is contained in:
Manuel Barkhau 2019-03-29 02:21:38 +01:00
parent 20c5f9d103
commit b036a68a26

View file

@ -245,6 +245,18 @@ def _bump(cfg: config.Config, new_version: str, allow_dirty: bool = False) -> No
_vcs.push(new_version) _vcs.push(new_version)
def _try_bump(cfg: config.Config, new_version: str, allow_dirty: bool = False) -> None:
try:
_bump(cfg, new_version, allow_dirty)
except sp.CalledProcessError as ex:
log.error(f"Error running subcommand: {ex.cmd}")
if ex.stdout:
sys.stdout.write(ex.stdout.decode('utf-8'))
if ex.stderr:
sys.stderr.write(ex.stderr.decode('utf-8'))
sys.exit(1)
def _print_diff(cfg: config.Config, new_version: str) -> None: def _print_diff(cfg: config.Config, new_version: str) -> None:
new_vinfo = version.parse_version_info(new_version, cfg.version_pattern) new_vinfo = version.parse_version_info(new_version, cfg.version_pattern)
diff: str = rewrite.diff(new_vinfo, cfg.file_patterns) diff: str = rewrite.diff(new_vinfo, cfg.file_patterns)
@ -265,6 +277,14 @@ def _print_diff(cfg: config.Config, new_version: str) -> None:
print(diff) print(diff)
def _try_print_diff(cfg: config.Config, new_version: str) -> None:
try:
_print_diff(cfg, new_version)
except Exception as ex:
log.error(str(ex))
sys.exit(1)
@cli.command() @cli.command()
@click.option("-v", "--verbose", count=True, help="Control log level. -vv for debug level.") @click.option("-v", "--verbose", count=True, help="Control log level. -vv for debug level.")
@click.option( @click.option(
@ -338,24 +358,12 @@ def bump(
log.info(f"New Version: {new_version}") log.info(f"New Version: {new_version}")
if dry or verbose >= 2: if dry or verbose >= 2:
try: _try_print_diff(cfg, new_version)
_print_diff(cfg, new_version)
except Exception as ex:
log.error(str(ex))
sys.exit(1)
if dry: if dry:
return return
try: _try_bump(cfg, new_version, allow_dirty)
_bump(cfg, new_version, allow_dirty)
except sp.CalledProcessError as ex:
log.error(f"Error running subcommand: {ex.cmd}")
if ex.stdout:
sys.stdout.write(ex.stdout.decode('utf-8'))
if ex.stderr:
sys.stderr.write(ex.stderr.decode('utf-8'))
sys.exit(1)
if __name__ == '__main__': if __name__ == '__main__':