Skip to content

Commit

Permalink
Fix version parsing (#739)
Browse files Browse the repository at this point in the history
* Fix version parsing

* Avoid setting releaselevel to final as much as possible
  • Loading branch information
fcollonval committed Nov 21, 2023
1 parent b573249 commit 89548a7
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions nbdime/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,21 @@

__version__ = "4.0.0"

parser = re.compile(r"^(?P<major>\d+)\.(?P<minor>\d+)\.(?P<micro>\d+)((?P<releaselevel>a|b|rc)(?P<serial>\d+))?$")
parser = re.compile(
r"^(?P<major>\d+)\.(?P<minor>\d+)\.(?P<micro>\d+)((?P<releaselevel>[A-z]+)(?P<serial>\d+))?$"
)

parsed_version = parser.match(__version__)
groups = parsed_version.groupdict()

release_level = groups.get("releaselevel", "") or ""

version_info = VersionInfo(
int(groups["major"]),
int(groups["minor"]),
int(groups["micro"]),
_specifier_[groups.get("releaselevel", "")],
# This will be whatever word is set to ensure `final`
# is only set when releaselevel pattern is not found
_specifier_.get(release_level, release_level),
groups.get("serial", ""),
)

0 comments on commit 89548a7

Please sign in to comment.