Skip to content

Commit

Permalink
Merge branch 'dev' into tagsystem
Browse files Browse the repository at this point in the history
  • Loading branch information
VarLad authored Mar 29, 2024
2 parents a3bb1ab + 30ffa3d commit 2b551cf
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions perf/PatternFolds/allocs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ using PrettyTables
d = Dict(:targets => ["PatternFolds"], :path => @__DIR__, :tags => [:patterns, :intervals], :pkgs => ("PatternFolds", :custom, [v"0.2.3", v"0.2.2"], true))

x = @check :alloc d begin

using PatternFolds
end begin
itv = Interval{Open,Closed}(0.0, 1.0)
Expand Down
2 changes: 2 additions & 0 deletions src/check.jl
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ macro check(x, d, block1, block2)

for i in 1:len
p = remotecall_fetch(Core.eval, 1, Main,

Expr(:toplevel, quote
import Distributed
d = $di
Expand Down Expand Up @@ -82,6 +83,7 @@ macro check(x, d, block1, block2)
if !(devop && i == len)
push!(results.pkgs, pkgs[i])
end

end
results
end
Expand Down
4 changes: 1 addition & 3 deletions src/versions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ const VerConfig = Tuple{String, Symbol, Vector{VersionNumber}, Bool}

"""
Outputs the last patch or first patch of a version.
If the input is 1.2.3, then the output is 1.2.0 or 1.2.9 (assuming both exist, and both are the first and last patch of the version)
"""
function arrange_patches(a::VersionNumber, v::Vector{VersionNumber}, ::Bool)
a = filter(x -> a.minor == x.minor && a.major == x.major, v)
Expand All @@ -52,7 +51,6 @@ end

"""
Outputs the last breaking or next breaking version.
If the input is 1.2.3, then the output is 1.2.0 or 1.3.0 (assuming both exist)
"""
function arrange_breaking(a::VersionNumber, v::Vector{VersionNumber}, maxo::Bool)
if a.major == 0
Expand All @@ -62,7 +60,6 @@ function arrange_breaking(a::VersionNumber, v::Vector{VersionNumber}, maxo::Bool
end
end


"""
Outputs the earlier or next major version.
"""
Expand All @@ -81,6 +78,7 @@ end

function get_versions(pkgconf::VerConfig, regname::Union{Nothing, Vector{String}} = nothing)
versions = get_pkg_versions(pkgconf[1], regname)

s = pkgconf[2]
f = if s == :patches
arrange_patches
Expand Down

0 comments on commit 2b551cf

Please sign in to comment.