Skip to content

Commit 45b867d

Browse files
committed
gh semver bump --minor seems to take the prerelease versions as the basis for the next version - resolves #294
b7435b6: Use the enum - #294
1 parent 6f826b6 commit 45b867d

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

gh_tt/classes/semver.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def bump(
182182

183183
message = f"\n{message}" if message else ""
184184

185-
pre = 'pre' if release_type else ''
185+
pre = 'pre' if release_type is ReleaseType.PRERELEASE else ''
186186

187187
lookup_next = f"next_{pre}release_{level}"
188188
lookup_current = f"current_{pre}release"
@@ -216,7 +216,7 @@ def list(self, release_type: ReleaseType = ReleaseType.RELEASE):
216216
print(temp[k])
217217

218218

219-
def note(self, prerelease: ReleaseType = ReleaseType.RELEASE, filename: str | None = None) -> str:
219+
def note(self, release_type: ReleaseType = ReleaseType.RELEASE, filename: str | None = None) -> str:
220220
"""Generates a release note either for a release or a prerelease, based on the set of current semver tags.
221221
222222
Args:
@@ -235,7 +235,7 @@ def note(self, prerelease: ReleaseType = ReleaseType.RELEASE, filename: str | No
235235

236236
self.__load_tags()
237237

238-
if prerelease is ReleaseType.PRERELEASE:
238+
if release_type is ReleaseType.PRERELEASE:
239239
from_ref = self.get_current_semver()
240240
to_ref = self.get_current_semver(release_type=ReleaseType.PRERELEASE)
241241
else:

gh_tt/modules/tt_handlers.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ def handle_responsibles(args):
8282
def handle_semver(args):
8383
"""Handle the semver command"""
8484
semver = Semver()
85+
release_type = ReleaseType.PRERELEASE if args.prerelease else ReleaseType.RELEASE
8586

8687
if args.semver_command == 'bump':
8788
semver.bump(
@@ -90,20 +91,20 @@ def handle_semver(args):
9091
suffix=args.suffix,
9192
prefix=args.prefix,
9293
initial=args.initial,
93-
release_type=ReleaseType.PRERELEASE if args.prerelease else ReleaseType.RELEASE,
94+
release_type=release_type,
9495
execution_mode=ExecutionMode.LIVE if args.run else ExecutionMode.DRY_RUN
9596
)
9697
elif args.semver_command == 'list':
97-
semver.list(release_type=ReleaseType.PRERELEASE if args.prerelease else ReleaseType.RELEASE)
98+
semver.list(release_type=release_type)
9899
elif args.semver_command == 'note':
99100
if args.filename:
100-
note = semver.note(prerelease=ReleaseType.PRERELEASE if args.prerelease else ReleaseType.RELEASE, filename=args.filename)
101+
note = semver.note(release_type=release_type, filename=args.filename)
101102
print(f"{args.filename}")
102103
else:
103-
note = semver.note(prerelease=ReleaseType.PRERELEASE if args.prerelease else ReleaseType.RELEASE)
104+
note = semver.note(release_type=release_type)
104105
print(note)
105106
elif args.semver_command is None:
106-
current_semver = semver.get_current_semver(release_type=args.prerelease)
107+
current_semver = semver.get_current_semver(release_type=release_type)
107108
print(f"{current_semver}")
108109

109110

0 commit comments

Comments
 (0)