Skip to content

Commit 300fb34

Browse files
authored
Try #411:
2 parents 1b46ec0 + 47be28c commit 300fb34

File tree

4 files changed

+23
-3
lines changed

4 files changed

+23
-3
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "CompatHelper"
22
uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
33
authors = ["Dilum Aluthge", "Brown Center for Biomedical Informatics", "contributors"]
4-
version = "3.1.0"
4+
version = "3.2.0"
55

66
[deps]
77
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

src/main.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ function main(
5757
unsub_from_prs=false,
5858
cc_user=false,
5959
bump_version=false,
60+
strict_version::Bool=false
6061
)
6162
generated_prs = Vector{Union{GitHub.PullRequest,GitLab.MergeRequest}}()
6263

@@ -93,6 +94,7 @@ function main(
9394
unsub_from_prs=unsub_from_prs,
9495
cc_user=cc_user,
9596
bump_version=bump_version,
97+
strict_version=strict_version
9698
)
9799

98100
if !isnothing(pr)

src/utilities/new_versions.jl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ function new_compat_entry(::EntryType, old_compat::Nothing, new_compat::Abstract
2828
return "$(strip(new_compat))"
2929
end
3030

31-
function compat_version_number(ver::VersionNumber)
31+
function compat_version_number(ver::VersionNumber, handle_equality_in_entries::Bool=false)
32+
handle_equality_in_entries && return "= $(ver.major).$(ver.minor).$(ver.patch)"
3233
(ver.major > 0) && return "$(ver.major)"
3334
(ver.minor > 0) && return "0.$(ver.minor)"
3435

@@ -213,13 +214,17 @@ function make_pr_for_new_version(
213214
unsub_from_prs=false,
214215
cc_user=false,
215216
bump_version=false,
217+
strict_version::Bool=false
216218
)
217219
if !continue_with_pr(dep, bump_compat_containing_equality_specifier)
218220
return nothing
219221
end
220222

221223
# Get new compat entry version, pr title, and pr body text
222-
compat_entry_for_latest_version = compat_version_number(dep.latest_version)
224+
handle_equality_in_entries = skip_equality_specifiers(
225+
bump_compat_containing_equality_specifier, dep.version_verbatim
226+
) && strict_version
227+
compat_entry_for_latest_version = compat_version_number(dep.latest_version, handle_equality_in_entries)
223228
brand_new_compat = new_compat_entry(
224229
entry_type, dep.version_verbatim, compat_entry_for_latest_version
225230
)

test/utilities/new_versions.jl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,19 @@ end
7979
@test CompatHelper.compat_version_number(vn) == expected
8080
end
8181

82+
@testset "Strict compat_version_number -- $(vn)" for (vn, expected) in [
83+
(VersionNumber("1.0.0"), "= 1.0.0"),
84+
(VersionNumber("1.1.1"), "= 1.1.1"),
85+
(VersionNumber("1.1.0"), "= 1.1.0"),
86+
(VersionNumber("0.1.0"), "= 0.1.0"),
87+
(VersionNumber("0.1.1"), "= 0.1.1"),
88+
(VersionNumber("0.0.1"), "= 0.0.1"),
89+
(VersionNumber("0.0.0"), "= 0.0.0"),
90+
]
91+
handle_equality_in_entries=true
92+
@test CompatHelper.compat_version_number(vn, handle_equality_in_entries) == expected
93+
end
94+
8295
@testset "subdir_string -- $(subdir)" for (subdir, expected) in [
8396
("foobar", "foobar"), ("foo/bar", "bar"), ("1", "1"), ("", "")
8497
]

0 commit comments

Comments
 (0)