diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 39a9d55..0b9aed5 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -3,7 +3,7 @@ current_version = 0.0.0 commit = False tag = True tag_name = {new_version} -message = Bump version: {current_version} -> {new_version} +tag_message = Bump version: {current_version} -> {new_version} [bumpversion:file:semver/__init__.py] search = version = '{current_version}' diff --git a/semver/__init__.py b/semver/__init__.py index 6866a88..e413dfe 100644 --- a/semver/__init__.py +++ b/semver/__init__.py @@ -103,17 +103,17 @@ class SemVer(object): with open(".bumpversion.cfg", "r") as file: config_file = file.read() # Update .bumpconfig - pattern = re.compile("current_version = [0-9.]*") - current_config = re.search(pattern, config_file) - if current_config: - config_file.replace(current_config.group(0), "current_version = " + get_tag_version()) - else: - config_file.replace("[bumpversion]","[bumpversion]\ncurrent_version = " + get_tag_version()) - with open(".bumpversion.cfg", "w") as file: - file.write(config_file) + #pattern = re.compile("current_version = [0-9.]*") + #current_config = re.search(pattern, config_file) + #if current_config: + #config_file.replace(current_config.group(0), "current_version = " + get_tag_version()) + #else: + #config_file.replace("[bumpversion]","[bumpversion]\ncurrent_version = " + get_tag_version()) + #with open(".bumpversion.cfg", "w") as file: + #file.write(config_file) # version repo - p = subprocess.Popen(['bumpversion', self.version_type], + p = subprocess.Popen(['bumpversion', '--current-version', get_tag_version(), self.version_type], cwd='.') p.wait() return self diff --git a/semver/merged_branch.py b/semver/merged_branch.py deleted file mode 100644 index e69de29..0000000 diff --git a/setup.py b/setup.py index c6053f6..9c9f5cb 100644 --- a/setup.py +++ b/setup.py @@ -98,7 +98,7 @@ setup( # requirements files see: # https://packaging.python.org/en/latest/requirements.html install_requires=[ - 'bumpversion==0.5.3', + 'bump2version>=0.5.11', 'argparse>=1.2.1' ],