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

more obvious handling of tag and push

Browse source
This commit is contained in:
Manuel Barkhau 2018-12-22 00:37:27 +01:00
parent d46d8f075a
commit fe4b381b5b
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pycalver/__main__.py
View file

@ -214,8 +214,10 @@ def _bump(cfg: config.Config, new_version: str, allow_dirty: bool = False) -> No
_vcs.commit(f"bump version to {new_version}") _vcs.commit(f"bump version to {new_version}")
if cfg.tag: if cfg.commit and cfg.tag:
_vcs.tag(new_version) _vcs.tag(new_version)
if cfg.commit and cfg.tag and cfg.push:
_vcs.push(new_version) _vcs.push(new_version)

4
src/pycalver/config.py
View file

@ -79,8 +79,8 @@ class Config(typ.NamedTuple):
current_version: str current_version: str
pep440_version : str pep440_version : str
tag : bool
commit: bool commit: bool
tag : bool
push : bool push : bool
file_patterns: PatternsByFilePath file_patterns: PatternsByFilePath
@ -91,8 +91,8 @@ def _debug_str(cfg: Config) -> str:
f"Config Parsed: Config(", f"Config Parsed: Config(",
f"current_version='{cfg.current_version}'", f"current_version='{cfg.current_version}'",
f"pep440_version='{cfg.pep440_version}'", f"pep440_version='{cfg.pep440_version}'",
f"tag={cfg.tag}",
f"commit={cfg.commit}", f"commit={cfg.commit}",
f"tag={cfg.tag}",
f"push={cfg.push}", f"push={cfg.push}",
"file_patterns={", "file_patterns={",
] ]

7
src/pycalver/vcs.py
View file

@ -64,7 +64,10 @@ class VCS:
"""Invoke subcommand and return output.""" """Invoke subcommand and return output."""
cmd_tmpl = self.subcommands[cmd_name] cmd_tmpl = self.subcommands[cmd_name]
cmd_str = cmd_tmpl.format(**kwargs) cmd_str = cmd_tmpl.format(**kwargs)
log.debug(cmd_str) if cmd_name in ("commit", "tag", "push_tag"):
log.info(cmd_str)
else:
log.debug(cmd_str)
output_data = sp.check_output(cmd_str.split(), env=env, stderr=sp.STDOUT) output_data = sp.check_output(cmd_str.split(), env=env, stderr=sp.STDOUT)
# TODO (mb 2018-11-15): Detect encoding of output? # TODO (mb 2018-11-15): Detect encoding of output?
@ -122,7 +125,6 @@ class VCS:
def add(self, path: str) -> None: def add(self, path: str) -> None:
"""Add updates to be included in next commit.""" """Add updates to be included in next commit."""
log.info(f"{self.name} add {path}")
try: try:
self('add_path', path=path) self('add_path', path=path)
except sp.CalledProcessError as ex: except sp.CalledProcessError as ex:
@ -134,7 +136,6 @@ class VCS:
def commit(self, message: str) -> None: def commit(self, message: str) -> None:
"""Commit added files.""" """Commit added files."""
log.info(f"{self.name} commit -m '{message}'")
message_data = message.encode("utf-8") message_data = message.encode("utf-8")
tmp_file = tempfile.NamedTemporaryFile("wb", delete=False) tmp_file = tempfile.NamedTemporaryFile("wb", delete=False)