From 1086e75824b13c81db773edbfba93b245f02508b Mon Sep 17 00:00:00 2001 From: Yoni Nazarathy Date: Tue, 19 Sep 2023 06:21:50 +1000 Subject: [PATCH 1/2] usage of ProgressUnknown fixed (#720) * usage of ProgressUnknown fixed * whitspace * Formatting * patch bump --------- Co-authored-by: Phillip Alday Co-authored-by: Phillip Alday --- Project.toml | 2 +- src/generalizedlinearmixedmodel.jl | 2 +- src/linearmixedmodel.jl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Project.toml b/Project.toml index af77cf7d5..7d714ea68 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "MixedModels" uuid = "ff71e718-51f3-5ec2-a782-8ffcbfa3c316" author = ["Phillip Alday ", "Douglas Bates ", "Jose Bayoan Santiago Calderon "] -version = "4.22.0" +version = "4.22.1" [deps] Arrow = "69666777-d1a9-59fb-9406-91d4454c9d45" diff --git a/src/generalizedlinearmixedmodel.jl b/src/generalizedlinearmixedmodel.jl index 568740f4e..6486fd4a0 100644 --- a/src/generalizedlinearmixedmodel.jl +++ b/src/generalizedlinearmixedmodel.jl @@ -278,7 +278,7 @@ function StatsAPI.fit!( optsum.final = copy(optsum.initial) end setpar! = fast ? setθ! : setβθ! - prog = ProgressUnknown("Minimizing"; showspeed=true) + prog = ProgressUnknown(; desc="Minimizing", showspeed=true) # start from zero for the initial call to obj before optimization iter = 0 fitlog = optsum.fitlog diff --git a/src/linearmixedmodel.jl b/src/linearmixedmodel.jl index 112421bc6..74251d6b7 100644 --- a/src/linearmixedmodel.jl +++ b/src/linearmixedmodel.jl @@ -457,7 +457,7 @@ function StatsAPI.fit!( end opt = Opt(optsum) optsum.REML = REML - prog = ProgressUnknown("Minimizing"; showspeed=true) + prog = ProgressUnknown(; desc="Minimizing", showspeed=true) # start from zero for the initial call to obj before optimization iter = 0 fitlog = optsum.fitlog From 84d21f411e39ab125bbade8fee88b58f526e757e Mon Sep 17 00:00:00 2001 From: Douglas Bates Date: Tue, 19 Sep 2023 17:05:22 +0200 Subject: [PATCH 2/2] compat entry checked by Aqua in 1.11 (#721) --- Project.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Project.toml b/Project.toml index 7d714ea68..53e9a0db2 100644 --- a/Project.toml +++ b/Project.toml @@ -42,6 +42,7 @@ PooledArrays = "0.5, 1" PrecompileTools = "1" ProgressMeter = "1.7" StaticArrays = "0.11, 0.12, 1" +Statistics = "1" StatsAPI = "1.5" StatsBase = "0.31, 0.32, 0.33, 0.34" StatsFuns = "0.8, 0.9, 1"