wip: misc project updates

This commit is contained in:
Manuel Barkhau 2018-11-04 21:11:42 +01:00
parent 2ca615d19b
commit e888be1f71
14 changed files with 219 additions and 438 deletions

View file

@ -25,13 +25,13 @@ log = logging.getLogger("pycalver.__main__")
def _init_loggers(verbose: bool) -> None:
if DEBUG:
log_formatter = logging.Formatter('%(levelname)s - %(name)s - %(message)s')
log_level = logging.DEBUG
log_level = logging.DEBUG
elif verbose:
log_formatter = logging.Formatter('%(levelname)s - %(message)s')
log_level = logging.INFO
log_level = logging.INFO
else:
log_formatter = logging.Formatter('%(message)s')
log_level = logging.WARNING
log_level = logging.WARNING
loggers = [log, vcs.log, parse.log, config.log, rewrite.log, version.log]
@ -66,10 +66,7 @@ def show() -> None:
@cli.command()
@click.argument("old_version")
@click.option(
"--release",
default=None,
metavar="<name>",
help="Override release name of current_version",
"--release", default=None, metavar="<name>", help="Override release name of current_version"
)
def incr(old_version: str, release: str = None) -> None:
_init_loggers(verbose=False)
@ -79,25 +76,22 @@ def incr(old_version: str, release: str = None) -> None:
log.error(f"Valid arguments are: {', '.join(parse.VALID_RELESE_VALUES)}")
sys.exit(1)
new_version = version.bump(old_version, release=release)
new_version = version.bump(old_version, release=release)
new_version_nfo = parse.parse_version_info(new_version)
print("PyCalVer Version:", new_version)
print("PEP440 Version:", new_version_nfo.pep440_version)
print("PEP440 Version:" , new_version_nfo.pep440_version)
@cli.command()
@click.option(
"--dry",
default=False,
is_flag=True,
help="Display diff of changes, don't rewrite files.",
"--dry", default=False, is_flag=True, help="Display diff of changes, don't rewrite files."
)
def init(dry: bool) -> None:
"""Initialize [pycalver] configuration in setup.cfg"""
_init_loggers(verbose=False)
cfg: config.MaybeConfig = config.parse()
cfg : config.MaybeConfig = config.parse()
if cfg:
log.error("Configuration already initialized in setup.cfg")
sys.exit(1)
@ -123,35 +117,14 @@ def init(dry: bool) -> None:
@cli.command()
@click.option(
"--release",
default=None,
metavar="<name>",
help="Override release name of current_version",
"--release", default=None, metavar="<name>", help="Override release name of current_version"
)
@click.option("--verbose", default=False, is_flag=True, help="Log applied changes to stderr")
@click.option(
"--verbose",
default=False,
is_flag=True,
help="Log applied changes to stderr",
)
@click.option(
"--dry",
default=False,
is_flag=True,
help="Display diff of changes, don't rewrite files.",
)
@click.option(
"--commit",
default=True,
is_flag=True,
help="Commit after updating version strings.",
)
@click.option(
"--tag",
default=True,
is_flag=True,
help="Tag the commit.",
"--dry", default=False, is_flag=True, help="Display diff of changes, don't rewrite files."
)
@click.option("--commit", default=True, is_flag=True, help="Commit after updating version strings.")
@click.option("--tag" , default=True, is_flag=True, help="Tag the commit.")
@click.option(
"--allow-dirty",
default=False,
@ -163,12 +136,7 @@ def init(dry: bool) -> None:
),
)
def bump(
release: str,
verbose: bool,
dry: bool,
commit: bool,
tag: bool,
allow_dirty: bool,
release: str, verbose: bool, dry: bool, commit: bool, tag: bool, allow_dirty: bool
) -> None:
_init_loggers(verbose)
@ -193,7 +161,7 @@ def bump(
log.info("Running with '--dry', showing diffs instead of updating files.")
file_patterns = cfg.file_patterns
filepaths = set(file_patterns.keys())
filepaths = set(file_patterns.keys())
_vcs = vcs.get_vcs()
if _vcs is None: