Skip to content

Commit

Permalink
Update versions of dependencies, comment out @debug calls (#733)
Browse files Browse the repository at this point in the history
* Comment out @debug calls

* Update package versions and Aqua keyword.
  • Loading branch information
dmbates authored Dec 5, 2023
1 parent 7a11248 commit 8214336
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 7 deletions.
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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]
Expand Down Expand Up @@ -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
6 changes: 4 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/Xymat.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/grouping.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

2 comments on commit 8214336

@dmbates
Copy link
Collaborator Author

@dmbates dmbates commented on 8214336 Dec 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Error while trying to register: Version 4.22.2 already exists

Please sign in to comment.