From 8214336aeb7ceb138d50677004dbbe2628f33394 Mon Sep 17 00:00:00 2001 From: Douglas Bates Date: Tue, 5 Dec 2023 13:01:57 -0600 Subject: [PATCH] Update versions of dependencies, comment out @debug calls (#733) * Comment out @debug calls * Update package versions and Aqua keyword. --- NEWS.md | 6 ++++++ Project.toml | 6 ++++-- src/Xymat.jl | 2 +- src/grouping.jl | 6 +++--- test/runtests.jl | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/NEWS.md b/NEWS.md index 51e51d8bd..4d3020922 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,8 @@ +MixedModels v4.22.3 Release Notes +============================== +* Comment out calls to `@debug` [#733] +* Update package versions in compat and change `Aqua.test_all` argument name [#733] + MixedModels v4.22.0 Release Notes ============================== * Support for equal-tail confidence intervals for `MixedModelBootstrap`. [#715] @@ -484,3 +489,4 @@ Package dependencies [#709]: https://github.com/JuliaStats/MixedModels.jl/issues/709 [#715]: https://github.com/JuliaStats/MixedModels.jl/issues/715 [#717]: https://github.com/JuliaStats/MixedModels.jl/issues/717 +[#733]: https://github.com/JuliaStats/MixedModels.jl/issues/733 diff --git a/Project.toml b/Project.toml index a45bb8560..ff790d508 100644 --- a/Project.toml +++ b/Project.toml @@ -30,12 +30,14 @@ Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" TypedTables = "9d95f2ec-7b3d-5a63-8d20-e2491e220bb9" [compat] -Aqua = "0.7" +Aqua = "0.8" Arrow = "1, 2" -BSplineKit = "0.14, 0.15, 0.16" +BSplineKit = "0.14, 0.15, 0.16, 0.17" DataAPI = "1" +DataFrames = "1" Distributions = "0.21, 0.22, 0.23, 0.24, 0.25" GLM = "1.8.2" +InteractiveUtils = "1" JSON3 = "1" LinearAlgebra = "1" Markdown = "1" diff --git a/src/Xymat.jl b/src/Xymat.jl index 76c768ad6..b85d81d8d 100644 --- a/src/Xymat.jl +++ b/src/Xymat.jl @@ -52,7 +52,7 @@ Note: automatic rank deficiency handling may be added to this method in the futu the vignette "[Rank deficiency in mixed-effects models](@ref)" for general `FeTerm`. """ function FeTerm(X::SparseMatrixCSC, cnms::AbstractVector{String}) - @debug "Full rank is assumed for sparse fixed-effect matrices." + #@debug "Full rank is assumed for sparse fixed-effect matrices." rank = size(X, 2) return FeTerm{eltype(X),typeof(X)}(X, collect(1:rank), rank, collect(cnms)) end diff --git a/src/grouping.jl b/src/grouping.jl index 1d6e90866..eb4cfa490 100644 --- a/src/grouping.jl +++ b/src/grouping.jl @@ -44,10 +44,10 @@ function StatsModels.apply_schema( context::AbstractTerm, ) aliased = drop_term(context, t) - @debug "$t in context of $context: aliases $aliased\n seen already: $(schema.already)" + #@debug "$t in context of $context: aliases $aliased\n seen already: $(schema.already)" for seen in schema.already if StatsModels.symequal(aliased, seen) - @debug " aliased term already present: $seen" + #@debug " aliased term already present: $seen" return t end end @@ -57,6 +57,6 @@ function StatsModels.apply_schema( # repair: new_contrasts = StatsModels.ContrastsMatrix(Grouping(), t.contrasts.levels) t = CategoricalTerm(t.sym, new_contrasts) - @debug " aliased term absent, repairing: $t" + #@debug " aliased term absent, repairing: $t" return t end diff --git a/test/runtests.jl b/test/runtests.jl index 42893d3fb..797989bb7 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -15,7 +15,7 @@ import LinearAlgebra: BLAS # because we actually need one at one point for _same_family() Aqua.test_all(MixedModels; ambiguities=false, unbound_args=false, # XXX TODO: upstream this piracy - piracy=(;treat_as_own=[GLM.wrkresp!, Base.:|])) + piracies=(;treat_as_own=[GLM.wrkresp!, Base.:|])) end include("utilities.jl")