diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 89091167..749d917a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,9 +10,8 @@ jobs: fail-fast: false matrix: version: - - '1.6' + - '1.10' - '1.12' - - 'nightly' os: - ubuntu-latest - macOS-latest diff --git a/Project.toml b/Project.toml index f319225a..43285171 100644 --- a/Project.toml +++ b/Project.toml @@ -7,6 +7,7 @@ Chain = "8be319e6-bccf-4806-a6f7-6fae938471bc" DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" +PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" TableMetadataTools = "9ce81f87-eacc-4366-bf80-b621a3098ee2" @@ -15,9 +16,10 @@ Chain = "0.5, 0.6, 1" DataFrames = "1" MacroTools = "0.5" OrderedCollections = "1" +PrettyTables = "2, 3" Reexport = "0.2, 1" -julia = "1.6" TableMetadataTools = "0.1" +julia = "1.10" [extras] CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597" diff --git a/src/metadata.jl b/src/metadata.jl index 474bf1e8..801176f5 100644 --- a/src/metadata.jl +++ b/src/metadata.jl @@ -218,10 +218,21 @@ function printlabels(df, cols=All(); unlabelled = true) end end t = DataFrame(Column = cs, Label = ls) - pretty_table(t; show_subheader = false) + _print_labels(t) return nothing end +# Support older PrettyTables for now +# (Will change when DataFrames.jl drops support) +# I can't just use keyword arguments provided by +# DataFrames.jl because I like the lines of the default +# printing +@static if pkgversion(PrettyTables).major == 2 + _print_labels(t) = pretty_table(t; show_subheader = false) +else + _print_labels(t) = pretty_table(t; show_first_column_label_only = true) +end + """ printnotes(df, cols = All(); unnoted = false)