bump PrettyTables.jl to v3 (#394)

* bump PrettyTables.jl to v3

* fix lower bound for DF.jl

* bump SA.jl lower bound

* remove flaky tests

Author: Moelf

Project.toml

@@ -41,7 +41,7 @@ BitIntegers = "^0.3"
 CodecLz4 = "^0.4"
 CodecXz = "^0.7"
 CodecZstd = "^0.8"
-DataFrames = "^1.5"
+DataFrames = "^1.8"
 FHist = "^0.10, ^0.11"
 HTTP = "^1.10"
 InteractiveUtils = "^1.0"
@@ -55,11 +55,11 @@ Mmap = "^1.0"
 Parameters = "^0.12"
 Pkg = "^1.0"
 PrecompileTools = "^1.2.0"
-PrettyTables = "^2.1"
+PrettyTables = "^3"
 Random = "^1.0"
 SHA = "^0.7, ^1.0"
 SentinelArrays = "^1.3"
-StaticArrays = "^1.5"
+StaticArrays = "^1.6"
 StructArrays = "0.6, 0.7"
 TOML = "^1.0"
 Tables = "^1.9"

src/displays.jl

@@ -60,7 +60,7 @@ printnode(io::IO, f::ROOTFile) = print(io, f.filename)
 printnode(io::IO, f::ROOTDirectory) = print(io, "$(f.name) (TDirectory)")
 printnode(io::IO, k::TKeyNode) = print(io, "$(k.name) ($(k.classname))")
 
-Base.show(tree::LazyTree; kwargs...) = _show(stdout, tree; crop=:both, kwargs...)
+Base.show(tree::LazyTree; kwargs...) = _show(stdout, tree; kwargs...)
 Base.show(io::IO, tree::LazyTree; kwargs...) = _show(io, tree; kwargs...)
 Base.show(io::IO, ::MIME"text/plain", tree::LazyTree) = _show(io, tree)
 function _show(io::IO, tree::LazyTree; kwargs...)
@@ -69,16 +69,13 @@ function _show(io::IO, tree::LazyTree; kwargs...)
     PrettyTables.pretty_table(
         io,
         Tables.columns(tree);
-        header=_hs,
+        column_labels=_hs,
         alignment=:l,
-        vlines=[1],
-        hlines=[:header],
         reserved_display_lines=2,
-        row_number_alignment=:l,
-        row_number_column_title="Row",
-        show_row_number=true,
+        row_number_column_alignment = :l,
+        show_row_number_column=true,
         compact_printing=false,
-        formatters=(v, i, j) -> _treeformat(v, _ds[2] ÷ min(8, length(_hs[1]))),
+        formatters=[(v, i, j) -> _treeformat(v, _ds[2] ÷ min(8, length(_hs[1])))],
         display_size=(min(_ds[1], 40), min(_ds[2], 160)),
         kwargs...
     )
@@ -131,14 +128,13 @@ function Base.show(io::IO, ::MIME"text/html", tree::LazyTree)
     PrettyTables.pretty_table(
         io,
         t;
-        header=_hs,
+        column_labels=_hs,
         alignment=:l,
-        row_number_column_title="",
-        show_row_number=true,
+        row_number_column_alignment = :l,
+        show_row_number_column=true,
         compact_printing=false,
-        formatters=(v, i, j) -> _treeformat(v, 100),
-        tf = PrettyTables.HtmlTableFormat(css = """th { color: #000; background-color: #fff; }"""),
-        backend=Val(:html),
+        formatters=[(v, i, j) -> _treeformat(v, 100)],
+        backend=:html,
     )
     nothing
 end
@@ -147,7 +143,7 @@ function _make_header(t)
     pn = propertynames(t)
     header = _symtup2str(pn)
     subheader = _symtup2str(eltype.(values(Tables.columns(t))))
-    (header, subheader)
+    [header, subheader]
 end
 function _treeformat(val, trunc)
     s = if val isa AbstractArray{T} where T<:Integer

test/displays.jl

@@ -36,10 +36,9 @@ end
     _io = IOBuffer()
     show(_io, t)
     _iostring = String(take!(_io))
-    @test length(split(_iostring,'\n')) > length(t)
     @test occursin("───────", _iostring)
     @test !occursin("NamedTuple", _iostring)
-    show(_io, t; crop=:both)
+    show(_io, t)
     @test length(split(String(take!(_io)),'\n')) <= Base.displaysize()[1]
     _io = IOBuffer()
     show(_io, MIME"text/html"(), t)

test/views.jl

@@ -12,9 +12,6 @@ SAMPLES_DIR = joinpath(@__DIR__, "samples")
     alloc2 = @allocated v = @view data[3:90]
     v = @view data[3:80]
     @test alloc2 < alloc1/100
-    @static if VERSION >= v"1.8"
-        @test alloc2 < 50
-    end
     @test all(v.int32_array .== data.int32_array[3:80])
 
     v2 = @view data[[1,3,5]]