From 535da18e59bff8db5d6c6d6b18bc6472926b9aac Mon Sep 17 00:00:00 2001 From: Christian Verkerk Date: Sat, 24 Aug 2019 18:31:46 -0700 Subject: [PATCH] fix rebase --- Makefile | 3 +++ bumpversion/cli.py | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ec555a6..7e411f4 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,9 @@ test: docker-compose build test docker-compose run test +local_test: + PYTHONPATH=. py.test tests/ + lint: pip install pylint pylint bumpversion diff --git a/bumpversion/cli.py b/bumpversion/cli.py index 859fd50..5a7d531 100644 --- a/bumpversion/cli.py +++ b/bumpversion/cli.py @@ -115,7 +115,7 @@ def main(original_args=None): # commit and tag if vcs: - context = _commit_to_vcs(files, context, config_file, config_file_exists, vcs, args) + context = _commit_to_vcs(files, context, config_file, config_file_exists, vcs, args, current_version, new_version) _tag_in_vcs(vcs, context, args) @@ -653,8 +653,8 @@ def _commit_to_vcs(files, context, config_file, config_file_exists, vcs, args, c vcs.add_path(path) context = { - "current_version": current_version, - "new_version": new_version, + "current_version": args.current_version, + "new_version": args.new_version, } context.update(time_context) context.update(prefixed_environ())