Skip to content

Commit 0af4eeb

Browse files
committed
Merge branch 'main' of github.com:JuliaStats/MixedModels.jl into glmm_dispersion_deviance
2 parents 4fc5b0d + df203bc commit 0af4eeb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+5661
-672
lines changed

.github/workflows/MKL.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/ci.yml renamed to .github/workflows/current.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
name: current release
2+
concurrency:
3+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
4+
cancel-in-progress: true
25
on:
36
push:
47
branches:
@@ -19,19 +22,21 @@ jobs:
1922
matrix:
2023
julia-version: [1]
2124
julia-arch: [x64]
22-
os: [ubuntu-18.04]
25+
os: [ubuntu-20.04]
2326
steps:
24-
- name: Cancel Previous Runs
25-
uses: styfle/[email protected]
26-
with:
27-
all_but_latest: true
28-
access_token: ${{ github.token }}
2927
- uses: actions/checkout@v2
3028
- uses: julia-actions/setup-julia@v1
3129
with:
3230
version: ${{ matrix.julia-version }}
33-
- uses: julia-actions/[email protected]
34-
- uses: julia-actions/[email protected]
31+
- uses: julia-actions/cache@v1
32+
with:
33+
cache-compiled: "true"
34+
- uses: julia-actions/julia-buildpkg@v1
35+
- uses: julia-actions/julia-runtest@v1
3536
env:
3637
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37-
- uses: julia-actions/[email protected]
38+
- uses: julia-actions/julia-processcoverage@v1
39+
- uses: codecov/codecov-action@v2
40+
with:
41+
flags: current
42+
files: lcov.info

.github/workflows/docs-cleanup.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# remove PR previews once they're merged
2+
# <https://juliadocs.github.io/Documenter.jl/dev/man/hosting/#gh-pages-Branch>
3+
name: Doc Preview Cleanup
4+
on:
5+
pull_request:
6+
types: [closed]
7+
jobs:
8+
doc-preview-cleanup:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout gh-pages branch
12+
uses: actions/checkout@v2
13+
with:
14+
ref: gh-pages
15+
- name: Delete preview and history + push changes
16+
run: |
17+
if [ -d "previews/PR$PRNUM" ]; then
18+
git config user.name "Documenter.jl"
19+
git config user.email "[email protected]"
20+
git rm -rf "previews/PR$PRNUM"
21+
git commit -m "delete preview"
22+
git branch gh-pages-new $(echo "delete history" | git commit-tree HEAD^{tree})
23+
git push --force origin gh-pages-new:gh-pages
24+
fi
25+
env:
26+
PRNUM: ${{ github.event.number }}

.github/workflows/documenter.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
name: Documenter
2+
concurrency:
3+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
4+
cancel-in-progress: true
25
on:
36
push:
47
branches: [main]
@@ -18,15 +21,13 @@ jobs:
1821
name: Documentation
1922
runs-on: ubuntu-20.04
2023
steps:
21-
- name: Cancel Previous Runs
22-
uses: styfle/[email protected]
23-
with:
24-
all_but_latest: true
25-
access_token: ${{ github.token }}
2624
- uses: actions/checkout@v2
2725
- uses: julia-actions/setup-julia@v1
2826
with:
29-
version: 1.6
27+
version: 1.8
28+
- uses: julia-actions/cache@v1
29+
with:
30+
cache-compiled: "true"
3031
- uses: julia-actions/julia-buildpkg@latest
3132
- uses: julia-actions/julia-docdeploy@latest
3233
env:

.github/workflows/lts.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/workflows/minimum.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: "minimum compat"
2+
concurrency:
3+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
4+
cancel-in-progress: true
5+
on:
6+
push:
7+
branches:
8+
- main
9+
paths-ignore:
10+
- 'LICENSE.md'
11+
- 'README.md'
12+
pull_request:
13+
branches:
14+
- main
15+
paths-ignore:
16+
- 'LICENSE.md'
17+
- 'README.md'
18+
jobs:
19+
ci:
20+
runs-on: ${{ matrix.os }}
21+
strategy:
22+
matrix:
23+
julia-version: [1.8]
24+
julia-arch: [x64]
25+
os: [ubuntu-20.04, macos-11, windows-2019]
26+
steps:
27+
- uses: actions/checkout@v2
28+
- uses: julia-actions/setup-julia@v1
29+
with:
30+
version: ${{ matrix.julia-version }}
31+
- uses: julia-actions/cache@v1
32+
with:
33+
cache-compiled: "true"
34+
- uses: julia-actions/julia-buildpkg@v1
35+
- uses: julia-actions/julia-runtest@v1
36+
env:
37+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38+
- uses: julia-actions/julia-processcoverage@v1
39+
- uses: codecov/codecov-action@v2
40+
with:
41+
flags: minimum
42+
files: lcov.info

.github/workflows/nightly.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
name: nightly
2+
concurrency:
3+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
4+
cancel-in-progress: true
25
on:
36
push:
47
branches:
@@ -19,19 +22,21 @@ jobs:
1922
matrix:
2023
julia-version: [nightly]
2124
julia-arch: [x64]
22-
os: [ubuntu-18.04]
25+
os: [ubuntu-20.04]
2326
steps:
24-
- name: Cancel Previous Runs
25-
uses: styfle/[email protected]
26-
with:
27-
all_but_latest: true
28-
access_token: ${{ github.token }}
2927
- uses: actions/checkout@v2
3028
- uses: julia-actions/setup-julia@v1
3129
with:
3230
version: ${{ matrix.julia-version }}
33-
- uses: julia-actions/[email protected]
34-
- uses: julia-actions/[email protected]
31+
- uses: julia-actions/cache@v1
32+
with:
33+
cache-compiled: "true"
34+
- uses: julia-actions/julia-buildpkg@v1
35+
- uses: julia-actions/julia-runtest@v1
3536
env:
3637
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37-
- uses: julia-actions/[email protected]
38+
- uses: julia-actions/julia-processcoverage@v1
39+
- uses: codecov/codecov-action@v2
40+
with:
41+
flags: nightly
42+
files: lcov.info

.github/workflows/style.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
name: Style-Enforcer
2+
concurrency:
3+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
4+
cancel-in-progress: true
25
on:
36
push:
47
branches:

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ tune.json
66
Manifest.toml
77
settings.json
88
docs/jmd
9+
LocalPreferences.toml
10+

NEWS.md

Lines changed: 127 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,101 @@
1+
MixedModels v4.19.0 Release Notes
2+
==============================
3+
* New method `StatsAPI.coefnames(::ReMat)` returns the coefficient names associated with each grouping factor. [#709]
4+
5+
MixedModels v4.18.0 Release Notes
6+
==============================
7+
* More user-friendly error messages when a formula contains variables not in the data. [#707]
8+
9+
MixedModels v4.17.0 Release Notes
10+
==============================
11+
* **EXPERIMENTAL** New kwarg `amalgamate` can be used to disable amalgation of random effects terms sharing a single grouping variable. Generally, `amalgamate=false` will result in a slower fit, but may improve convergence in some pathological cases. Note that this feature is experimental and changes to it are **not** considered breakings. [#673]
12+
* More informative error messages when passing a `Distribution` or `Link` type instead of the desired instance. [#698]
13+
* More informative error message on the intentional decision not to define methods for the coefficient of determination. [#698]
14+
* **EXPERIMENTAL** Return `finitial` when PIRLS drifts into a portion of the parameter space that yields a (numerically) invalid covariance matrix. This recovery strategy may be removed in a future release. [#616]
15+
16+
MixedModels v4.16.0 Release Notes
17+
==============================
18+
* Support for check tolerances in deserialization. [#703]
19+
20+
MixedModels v4.15.0 Release Notes
21+
==============================
22+
* Support for different optimization criteria during the bootstrap. [#694]
23+
* Support for combining bootstrap results with `vcat`. [#694]
24+
* Support for saving and restoring bootstrap replicates with `savereplicates` and `restorereplicates`. [#694]
25+
26+
MixedModels v4.14.0 Release Notes
27+
==============================
28+
* New function `profile` for computing likelihood profiles for `LinearMixedModel`. The resultant `MixedModelProfile` can be then be used for computing confidence intervals with `confint`. Note that this API is still somewhat experimental and as such the internal storage details of `MixedModelProfile` may change in a future release without being considered breaking. [#639]
29+
* A `confint(::LinearMixedModel)` method has been defined that returns Wald confidence intervals based on the z-statistic, i.e. treating the denominator degrees of freedom as infinite. [#639]
30+
31+
MixedModels v4.13.0 Release Notes
32+
==============================
33+
* `raneftables` returns a `NamedTuple` where the names are the grouping factor names and the values are some `Tables.jl`-compatible type. This type has been changed to a `Table` from `TypedTables.jl`. [#682]
34+
35+
MixedModels v4.12.1 Release Notes
36+
==============================
37+
* Precompilation is now handled with `PrecompileTools` instead of `SnoopPrecompile`. [#681]
38+
* An unnecessary explicit `Vararg` in an internal method has been removed. This removal eliminates a compiler warning about the deprecated `Vararg` pattern. [#680]
39+
40+
MixedModels v4.12.0 Release Notes
41+
==============================
42+
* The pirated method `Base.:/(a::AbstractTerm, b::AbstractTerm)` is no longer defined. This does not impact the use of `/` as a nesting term in `@formula` within MixedModels, only the programmatic runtime construction of formula, e.g. `term(:a) / term(:b)`. If you require `Base.:/`, then [`RegressionFormulae.jl`](https://github.com/kleinschmidt/RegressionFormulae.jl) provides this method. (Avoiding method redefinition when using `RegressionFormulae.jl` is the motivating reason for this change.) [#677]
43+
44+
MixedModels v4.11.0 Release Notes
45+
==============================
46+
* `raneftables` returns a `NamedTuple` where the names are the grouping factor names and the values are some `Tables.jl`-compatible type. Currently this type is a `DictTable` from `TypedTables.jl`. [#634]
47+
48+
MixedModels v4.10.0 Release Notes
49+
==============================
50+
* Rank deficiency in prediction is now supported, both when the original model was fit to rank-deficient data and when the new data are rank deficient. The behavior is consistent but may be surprising when both old and new data are rank deficient. See the `predict` docstring for an example. [#676]
51+
* Multithreading in `parametricbootstrap` with `use_threads` is now deprecated and a noop. With improvements in BLAS threading, multithreading at the Julia level did not help performance and sometimes hurt it. [#674]
52+
53+
MixedModels v4.9.0 Release Notes
54+
==============================
55+
* Support `StatsModels` 0.7, drop support for `StatsModels` 0.6. [#664]
56+
* Revise code in benchmarks to work with recent Julia and PkgBenchmark.jl [#667]
57+
* Julia minimum compat version raised to 1.8 because of BSplineKit [#665]
58+
59+
MixedModels v4.8.2 Release Notes
60+
==============================
61+
* Use `SnoopPrecompile` for better precompilation performance. This can dramatically increase TTFX, especially on Julia 1.9. [#663]
62+
63+
MixedModels v4.8.1 Release Notes
64+
==============================
65+
* Don't fit a GLM internally during construction of GLMM when the fixed effects are empty (better compatibility with
66+
`dropcollinear` kwarg in newer GLM.jl) [#657]
67+
68+
MixedModels v4.8.0 Release Notes
69+
==============================
70+
* Allow predicting from a single observation, as long as `Grouping()` is used for the grouping variables. The simplified implementation of `Grouping()` also removes several now unnecessary `StatsModels` methods that should not have been called directly by the user. [#653]
71+
72+
MixedModels v4.7.3 Release Notes
73+
==============================
74+
* More informative error message for formulae lacking random effects [#651]
75+
76+
MixedModels v4.7.2 Release Notes
77+
==============================
78+
* Replace separate calls to `copyto!` and `scaleinflate!` in `updateL!` with `copyscaleinflate!` [#648]
79+
80+
MixedModels v4.7.1 Release Notes
81+
==============================
82+
* Avoid repeating initial objective evaluation in `fit!` method for `LinearMixedModel`
83+
* Ensure that the number of function evaluations from NLopt corresponds to `length(m.optsum.fitlog) when `isone(thin)`. [#637]
84+
85+
MixedModels v4.7.0 Release Notes
86+
==============================
87+
* Relax type restriction for filename in `saveoptsum` and `restoreoptsum!`. Users can now pass any type with an appropriate `open` method, e.g. `<:AbstractPath`. [#628]
88+
89+
MixedModels v4.6.5 Release Notes
90+
========================
91+
* Attempt recovery when the initial parameter values lead to an invalid covariance matrix by rescaling [#615]
92+
* Return `finitial` when the optimizer drifts into a portion of the parameter space that yields a (numerically) invalid covariance matrix [#615]
93+
94+
MixedModels v4.6.4 Release Notes
95+
========================
96+
* Support transformed responses in `predict` [#614]
97+
* Simplify printing of BLAS configuration in tests. [#597]
98+
199
MixedModels v4.6.3 Release Notes
2100
========================
3101
* Add precompile statements to speed up first `LinearMixedModel` and Bernoulli `GeneralizedLinearModel` fit [#608]
@@ -248,7 +346,7 @@ Principal components
248346

249347
* An `AbstractReMat` type has now been introduced to support [#380] work on constrained
250348
random-effects structures and random-effects structures appropriate for applications
251-
in GLM-based decovolution as used in fMRI and EEG (see e.g. [unfold.jl](https://github.com/unfoldtoolbox/unfold.jl).)
349+
in GLM-based deconvolution as used in fMRI and EEG (see e.g. [unfold.jl](https://github.com/unfoldtoolbox/unfold.jl).)
252350
* Similarly, a constructor for `FeMat{::SparseMatrixCSC,S}` has been introduced [#309].
253351
Currently, this constructor assumes a full-rank matrix, but the work on rank
254352
deficiency may be extended to this constructor as well.
@@ -336,7 +434,35 @@ Package dependencies
336434
[#577]: https://github.com/JuliaStats/MixedModels.jl/issues/577
337435
[#578]: https://github.com/JuliaStats/MixedModels.jl/issues/578
338436
[#588]: https://github.com/JuliaStats/MixedModels.jl/issues/588
437+
[#597]: https://github.com/JuliaStats/MixedModels.jl/issues/597
339438
[#598]: https://github.com/JuliaStats/MixedModels.jl/issues/598
340439
[#603]: https://github.com/JuliaStats/MixedModels.jl/issues/603
341440
[#604]: https://github.com/JuliaStats/MixedModels.jl/issues/604
342441
[#608]: https://github.com/JuliaStats/MixedModels.jl/issues/608
442+
[#614]: https://github.com/JuliaStats/MixedModels.jl/issues/614
443+
[#615]: https://github.com/JuliaStats/MixedModels.jl/issues/615
444+
[#616]: https://github.com/JuliaStats/MixedModels.jl/issues/616
445+
[#628]: https://github.com/JuliaStats/MixedModels.jl/issues/628
446+
[#634]: https://github.com/JuliaStats/MixedModels.jl/issues/634
447+
[#637]: https://github.com/JuliaStats/MixedModels.jl/issues/637
448+
[#639]: https://github.com/JuliaStats/MixedModels.jl/issues/639
449+
[#648]: https://github.com/JuliaStats/MixedModels.jl/issues/648
450+
[#651]: https://github.com/JuliaStats/MixedModels.jl/issues/651
451+
[#653]: https://github.com/JuliaStats/MixedModels.jl/issues/653
452+
[#657]: https://github.com/JuliaStats/MixedModels.jl/issues/657
453+
[#663]: https://github.com/JuliaStats/MixedModels.jl/issues/663
454+
[#664]: https://github.com/JuliaStats/MixedModels.jl/issues/664
455+
[#665]: https://github.com/JuliaStats/MixedModels.jl/issues/665
456+
[#667]: https://github.com/JuliaStats/MixedModels.jl/issues/667
457+
[#673]: https://github.com/JuliaStats/MixedModels.jl/issues/673
458+
[#674]: https://github.com/JuliaStats/MixedModels.jl/issues/674
459+
[#676]: https://github.com/JuliaStats/MixedModels.jl/issues/676
460+
[#677]: https://github.com/JuliaStats/MixedModels.jl/issues/677
461+
[#680]: https://github.com/JuliaStats/MixedModels.jl/issues/680
462+
[#681]: https://github.com/JuliaStats/MixedModels.jl/issues/681
463+
[#682]: https://github.com/JuliaStats/MixedModels.jl/issues/682
464+
[#694]: https://github.com/JuliaStats/MixedModels.jl/issues/694
465+
[#698]: https://github.com/JuliaStats/MixedModels.jl/issues/698
466+
[#703]: https://github.com/JuliaStats/MixedModels.jl/issues/703
467+
[#707]: https://github.com/JuliaStats/MixedModels.jl/issues/707
468+
[#709]: https://github.com/JuliaStats/MixedModels.jl/issues/709

0 commit comments

Comments
 (0)