Skip to content

Commit

Permalink
鈾伙笍 Use semver's _bump methods to increment version
Browse files Browse the repository at this point in the history
  • Loading branch information
fiendish committed May 19, 2020
1 parent 485eb78 commit 73355d5
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions d3b_release_maker/release_maker.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
MAJOR = "major"
MINOR = "minor"
PATCH = "patch"
release_options = [MAJOR, MINOR, PATCH]
RELEASE_OPTIONS = [MAJOR, MINOR, PATCH]

release_pattern = r"\s*[" + config.RELEASE_EMOJIS + r"]\s*[Rr]elease"
emoji_categories = {
Expand Down Expand Up @@ -179,20 +179,20 @@ def _next_release_version(self, prev_version, release_type):
"""
Get next release version based on prev version using semver format
"""
parts = [int(p) for p in prev_version.split(".")]
prev_version = semver.VersionInfo.parse(prev_version).finalize_version()
if release_type == MAJOR:
new_version = f"{parts[0]+1}.0.0"
new_version = prev_version.bump_major()
elif release_type == MINOR:
new_version = f"{parts[0]}.{parts[1]+1}.0"
new_version = prev_version.bump_minor()
elif release_type == PATCH:
new_version = f"{parts[0]}.{parts[1]}.{parts[2]+1}"
new_version = prev_version.bump_patch()
else:
raise ValueError(
f"Invalid release type: {release_type}! Release type "
f"must be one of {release_options}!"
f"must be one of {RELEASE_OPTIONS}!"
)

return new_version
return str(new_version)

def _to_markdown(self, repo, counts, prs):
"""
Expand Down Expand Up @@ -263,12 +263,12 @@ def build_release_notes(self, repo, blurb=None):

while True:
release_type = input(
f"What type of semantic versioning release is this {release_options}? "
f"What type of semantic versioning release is this {RELEASE_OPTIONS}? "
).lower()
if release_type in release_options:
if release_type in RELEASE_OPTIONS:
break
else:
print(f"'{release_type}' is not one of {release_options}")
print(f"'{release_type}' is not one of {RELEASE_OPTIONS}")

# Update release version
prefix, prev_version = split_at_pattern(latest_tag["name"], r"\d")
Expand Down

0 comments on commit 73355d5

Please sign in to comment.