From f3eb5dc29b813b02796ce5b03161172b278c0f61 Mon Sep 17 00:00:00 2001 From: Jacob Adenbaum Date: Tue, 18 Jul 2023 13:48:48 +0100 Subject: [PATCH] Update Compat Bounds (#36) * Fix tests: don't rely on Random.seed! random number generation can change across julia implementations * Update compat bounds * Update version for new bugfix release --- Project.toml | 8 ++++---- test/composite_tables.jl | 12 +++++++++--- test/indexing.jl | 24 ++++++++++++++++++------ test/printing.jl | 24 ++++++++++++++++++------ 4 files changed, 49 insertions(+), 19 deletions(-) diff --git a/Project.toml b/Project.toml index 4c1f2e2..e07f24f 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "TexTables" uuid = "ebf5ac4f-3ec1-555f-9ac9-3d72ed88c471" -version = "0.2.6" +version = "0.2.7" [deps] Compat = "34da2185-b29b-5c13-b0c7-acf172513d20" @@ -14,15 +14,15 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" StatsModels = "3eaba693-59b7-5ba5-a881-562e759f1c8d" [compat] -Compat = "^3.0" +Compat = "3, 4" DataFrames = "0.21, 0.22, 1.0" DataStructures = "0.17, 0.18" Distributions = "0.20, 0.21, 0.22, 0.23, 0.24, 0.25" Formatting = "^0.3.3, 0.4" GLM = "^1.0" Parameters = "0.12" -StatsBase = "0.33" -StatsModels = "0.6" +StatsBase = "0.33, 0.34" +StatsModels = "0.6, 0.7" julia = "1" [extras] diff --git a/test/composite_tables.jl b/test/composite_tables.jl index 063bf56..444fd0f 100644 --- a/test/composite_tables.jl +++ b/test/composite_tables.jl @@ -1,12 +1,18 @@ # Baseline check using Random -Random.seed!(1234) -x = randn(10) +x = [0.8673472019512456, -0.9017438158568171, -0.4944787535042339, + -0.9029142938652416, 0.8644013132535154, 2.2118774995743475, + 0.5328132821695382, -0.27173539603462066, 0.5023344963886675, + -0.5169836206932686] +x2 = [-0.5605013381807765, -0.019291781689849075, 0.12806443451512645, + 1.852782957725545, -0.8277634318169205, 0.11009612632217552, + -0.2511757400198831, 0.3697140350317453, 0.07211635315125874, + -1.503429457351051] y = [Symbol(:key, i) for i=1:10] t1 = TableCol("test", y, x) t2 = TableCol("test2", y[2:9], x[2:9]) -t3 = TableCol("test3", y, x, randn(10) .|> abs .|> sqrt) +t3 = TableCol("test3", y, x, x2 .|> abs .|> sqrt) sub_tab1= hcat(t1, t2, t3) # Composite Table Checks diff --git a/test/indexing.jl b/test/indexing.jl index f688951..eeaba1a 100644 --- a/test/indexing.jl +++ b/test/indexing.jl @@ -30,12 +30,18 @@ gv = get_vals @testset "IndexedTable Indexing" begin # Construct some random tables - Random.seed!(1234) - x = randn(10) + x = [0.8673472019512456, -0.9017438158568171, -0.4944787535042339, + -0.9029142938652416, 0.8644013132535154, 2.2118774995743475, + 0.5328132821695382, -0.27173539603462066, 0.5023344963886675, + -0.5169836206932686] + x2 = [-0.5605013381807765, -0.019291781689849075, 0.12806443451512645, + 1.852782957725545, -0.8277634318169205, 0.11009612632217552, + -0.2511757400198831, 0.3697140350317453, 0.07211635315125874, + -1.503429457351051] y = [Symbol(:key, i) for i=1:10] t1 = TableCol("test", y, x) t2 = TableCol("test2", y[2:9], x[2:9]) - t3 = TableCol("test3", y, x, randn(10) .|> abs .|> sqrt) + t3 = TableCol("test3", y, x, x2 .|> abs .|> sqrt) sub_tab1= hcat(t1, t2, t3) # Composite Table Checks @@ -143,12 +149,18 @@ gv = get_vals @testset "IndexedTable Indexing" begin # Baseline check - Random.seed!(1234) - x = randn(10) + x = [0.8673472019512456, -0.9017438158568171, -0.4944787535042339, + -0.9029142938652416, 0.8644013132535154, 2.2118774995743475, + 0.5328132821695382, -0.27173539603462066, 0.5023344963886675, + -0.5169836206932686] + x2 = [-0.5605013381807765, -0.019291781689849075, 0.12806443451512645, + 1.852782957725545, -0.8277634318169205, 0.11009612632217552, + -0.2511757400198831, 0.3697140350317453, 0.07211635315125874, + -1.503429457351051] y = [Symbol(:key, i) for i=1:10] t1 = TableCol("test", y, x) |> IndexedTable t2 = TableCol("test2", y[2:9], x[2:9]) |> IndexedTable - t3 = TableCol("test3", y, x, randn(10).|>abs.|>sqrt) |> IndexedTable + t3 = TableCol("test3", y, x, x2.|>abs.|>sqrt) |> IndexedTable t4 = TableCol("test" , Dict("Fixed Effects"=>"Yes")) |> IndexedTable t5 = TableCol("test2", Dict("Fixed Effects"=>"No")) |> IndexedTable t6 = TableCol("test3", Dict("Fixed Effects"=>"Yes")) |> IndexedTable diff --git a/test/printing.jl b/test/printing.jl index 6317e5b..12ba34e 100644 --- a/test/printing.jl +++ b/test/printing.jl @@ -3,12 +3,18 @@ import TexTables: get_level, generate_schema, check_table_type, @testset "Extracting Index Levels" begin # Standard Composite Tables - Random.seed!(1234) - x = randn(10) + x = [0.8673472019512456, -0.9017438158568171, -0.4944787535042339, + -0.9029142938652416, 0.8644013132535154, 2.2118774995743475, + 0.5328132821695382, -0.27173539603462066, 0.5023344963886675, + -0.5169836206932686] + x2 = [-0.5605013381807765, -0.019291781689849075, 0.12806443451512645, + 1.852782957725545, -0.8277634318169205, 0.11009612632217552, + -0.2511757400198831, 0.3697140350317453, 0.07211635315125874, + -1.503429457351051] y = [Symbol(:key, i) for i=1:10] t1 = TableCol("test", y, x) t2 = TableCol("test2", y[2:9], x[2:9]) - t3 = TableCol("test3", y, x, randn(10) .|> abs .|> sqrt) + t3 = TableCol("test3", y, x, x2 .|> abs .|> sqrt) t4 = TableCol("test" , Dict("Fixed Effects"=>"Yes")) t5 = TableCol("test2", Dict("Fixed Effects"=>"No")) t6 = TableCol("test3", Dict("Fixed Effects"=>"Yes")) @@ -42,12 +48,18 @@ end @testset "Index Schemas" begin # Standard Composite Tables - Random.seed!(1234) - x = randn(10) + x = [0.8673472019512456, -0.9017438158568171, -0.4944787535042339, + -0.9029142938652416, 0.8644013132535154, 2.2118774995743475, + 0.5328132821695382, -0.27173539603462066, 0.5023344963886675, + -0.5169836206932686] + x2 = [-0.5605013381807765, -0.019291781689849075, 0.12806443451512645, + 1.852782957725545, -0.8277634318169205, 0.11009612632217552, + -0.2511757400198831, 0.3697140350317453, 0.07211635315125874, + -1.503429457351051] y = [Symbol(:key, i) for i=1:10] t1 = TableCol("test", y, x) t2 = TableCol("test2", y[2:9], x[2:9]) - t3 = TableCol("test3", y, x, randn(10) .|> abs .|> sqrt) + t3 = TableCol("test3", y, x, x2 .|> abs .|> sqrt) t4 = TableCol("test" , Dict("Fixed Effects"=>"Yes")) t5 = TableCol("test2", Dict("Fixed Effects"=>"No")) t6 = TableCol("test3", Dict("Fixed Effects"=>"Yes"))