Skip to content

be more conservative about non-version chars #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevengj merged 1 commit into from
Jan 23, 2022
Merged

be more conservative about non-version chars #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/VersionParsing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,8 @@ function vparse(s_::String)
if occursin(r"^\d:\d+", s) # debian-style version number
s = replace(s, r"^\d:"=>"") # strip epoch
end
i = findfirst(isspace, s)
if i !== nothing
s = s[1:prevind(s,i)]
end
s = replace(s, r"[^A-Za-z0-9.+-]*"=>"") # strip invalid version chars
s = replace(s, '_'=>'-') # treat underscores as dashes
s = replace(s, r"[^A-Za-z0-9.+-].*"=>"") # strip anything after invalid version chars
try
return VersionNumber(s) # first look for semver-compliant version
catch
Expand Down
6 changes: 5 additions & 1 deletion test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ using VersionParsing
using Test

@test vparse("3.7.2a4") == v"3.7.2-a4" == vparse("version 3.7.2a4: the best version")
@test vparse("2.1.0-python3_5") == v"2.1.0-python35" # Plots.jl#1432
@test vparse("2.1.0-python3_5") == v"2.1.0-python3-5" # Plots.jl#1432
@test vparse("0.99.1.1") == v"0.99.1+1" # julia#7282
@test vparse("2.1.0.post806+g905465b") == v"2.1.0+post806.g905465b" # from julia#7282

Expand All @@ -26,3 +26,7 @@ using Test
@test vparse("A darn good version. 1.2") == v"1.2.0"
@test vparse("A darn good version. .2") == v"0.2.0"
@test_throws ArgumentError vparse("..2")

@test vparse("6.4.0_3f928be_2022.01.21") == v"6.4.0-3f928be-2022.1.21" # GMT.jl#819

@test vparse("1.2:3") == v"1.2" == vparse("1.2 3")