Skip to content

Commit

Permalink
fix: Support pre-releases with multiple digits
Browse files Browse the repository at this point in the history
Previously regexp for parsing pre-releases failed for Python as there is
no delimiter between pre-release type (`a`, `b`, `rc`) and version.

Cause of that change the regexp for type to expect only non-digit
symbols (`\D+`) instead of expecting any symbols (`.+`)

Fixes: #64
  • Loading branch information
playpauseandstop committed May 12, 2021
1 parent df2755b commit 97c4762
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/badabump/versions/pre_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"NUMBER": "{number}",
}
SCHEMA_PARTS_PARSING = {
"TYPE": r"(?P<type>.+)",
"TYPE": r"(?P<type>\D+)",
"NUMBER": r"(?P<number>\d+)",
}

Expand Down
20 changes: 20 additions & 0 deletions tests/test_versions_pre_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
ProjectTypeEnum.python,
"a0",
),
(
PreRelease(pre_release_type=PreReleaseTypeEnum.alpha, number=10),
ProjectTypeEnum.python,
"a10",
),
(
PreRelease(pre_release_type=PreReleaseTypeEnum.alpha, number=0),
ProjectTypeEnum.javascript,
Expand All @@ -28,16 +33,31 @@
ProjectTypeEnum.javascript,
"-beta.1",
),
(
PreRelease(pre_release_type=PreReleaseTypeEnum.beta, number=42),
ProjectTypeEnum.javascript,
"-beta.42",
),
(
PreRelease(pre_release_type=PreReleaseTypeEnum.rc, number=2),
ProjectTypeEnum.python,
"rc2",
),
(
PreRelease(pre_release_type=PreReleaseTypeEnum.rc, number=15),
ProjectTypeEnum.python,
"rc15",
),
(
PreRelease(pre_release_type=PreReleaseTypeEnum.rc, number=2),
ProjectTypeEnum.javascript,
"-rc.2",
),
(
PreRelease(pre_release_type=PreReleaseTypeEnum.rc, number=25),
ProjectTypeEnum.javascript,
"-rc.25",
),
)


Expand Down

0 comments on commit 97c4762

Please sign in to comment.