From 27b64316a3ad8b4d8450ea27d51e8bf764266b55 Mon Sep 17 00:00:00 2001 From: Phillip Alday Date: Wed, 15 Nov 2023 14:34:29 -0700 Subject: [PATCH 1/5] Aqua 0.8 --- Project.toml | 4 +++- test/runtests.jl | 8 +++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Project.toml b/Project.toml index 8cb4cb7..d2e5723 100644 --- a/Project.toml +++ b/Project.toml @@ -24,13 +24,14 @@ EffectsGLMExt = "GLM" EffectsMixedModelsExt = ["GLM", "MixedModels"] [compat] -Aqua = "0.5, 0.6" +Aqua = "0.8" Combinatorics = "1" DataFrames = "0.22, 1.0, 1.1" DataStructures = "0.18" Distributions = "0.25" ForwardDiff = "0.10" GLM = "1.5.1" +LinearAlgebra = "1" MixedModels = "3.9, 4" MultipleTesting = "0.5, 0.6" RDatasets = "0.7.7" @@ -41,6 +42,7 @@ StatsAPI = "1.6" StatsBase = "0.33, 0.34" StatsModels = "0.6.23, 0.7" Tables = "1" +Test = "1" Vcov = "0.7" julia = "1.6" diff --git a/test/runtests.jl b/test/runtests.jl index c40fb4a..8c9b66c 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -3,9 +3,7 @@ using Effects using Test @testset "Aqua" begin - # layout of weakdeps and extensions etc. differs between pre 1.9 and 1.9+ - project_toml_formatting = VERSION >= v"1.9" - Aqua.test_all(Effects; ambiguities=false, project_toml_formatting) + Aqua.test_all(Effects; ambiguities=false) end @testset "TypicalTerm" begin @@ -16,8 +14,8 @@ end include("linear_regression.jl") end -@testset "delta method" begin - include("delta_method.jl") + @testset "delta method" begin + include("delta_method.jl") end @testset "emmeans" begin From 97419e0b14b4908a44e097e02cf4297100a9bea9 Mon Sep 17 00:00:00 2001 From: Phillip Alday Date: Wed, 15 Nov 2023 14:37:25 -0700 Subject: [PATCH 2/5] format --- test/runtests.jl | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index 8c9b66c..0968c4a 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -6,18 +6,10 @@ using Test Aqua.test_all(Effects; ambiguities=false) end -@testset "TypicalTerm" begin - include("typical.jl") -end +@testset "TypicalTerm" include("typical.jl") -@testset "linear regression" begin - include("linear_regression.jl") -end +@testset "linear regression" include("linear_regression.jl") - @testset "delta method" begin - include("delta_method.jl") -end +@testset "delta method" include("delta_method.jl") -@testset "emmeans" begin - include("emmeans.jl") -end +@testset "emmeans" include("emmeans.jl") From 99cb896f8955dad22cc0bd4dae98a43c4de4c294 Mon Sep 17 00:00:00 2001 From: Phillip Alday Date: Wed, 15 Nov 2023 14:51:33 -0700 Subject: [PATCH 3/5] Revert "format" This reverts commit 97419e0b14b4908a44e097e02cf4297100a9bea9. --- test/runtests.jl | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index 0968c4a..8c9b66c 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -6,10 +6,18 @@ using Test Aqua.test_all(Effects; ambiguities=false) end -@testset "TypicalTerm" include("typical.jl") +@testset "TypicalTerm" begin + include("typical.jl") +end -@testset "linear regression" include("linear_regression.jl") +@testset "linear regression" begin + include("linear_regression.jl") +end -@testset "delta method" include("delta_method.jl") + @testset "delta method" begin + include("delta_method.jl") +end -@testset "emmeans" include("emmeans.jl") +@testset "emmeans" begin + include("emmeans.jl") +end From e023bad7610061b6625741259a43b4b4db5ef64f Mon Sep 17 00:00:00 2001 From: Phillip Alday Date: Wed, 15 Nov 2023 14:51:54 -0700 Subject: [PATCH 4/5] 1.6 compatible format --- test/runtests.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index 8c9b66c..6dbc1de 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -14,8 +14,8 @@ end include("linear_regression.jl") end - @testset "delta method" begin - include("delta_method.jl") +@testset "delta method" begin + include("delta_method.jl") end @testset "emmeans" begin From e9e3d5b768d41080f740aac53386d84de79cb1c5 Mon Sep 17 00:00:00 2001 From: Phillip Alday Date: Thu, 16 Nov 2023 08:56:46 -0600 Subject: [PATCH 5/5] patch bump --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index d2e5723..93ede26 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Effects" uuid = "8f03c58b-bd97-4933-a826-f71b64d2cca2" authors = ["Beacon Biosignals, Inc."] -version = "1.1.0" +version = "1.1.1" [deps] Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"