Skip to content

Commit d749742

Browse files
github-actions[bot]CompatHelper Juliapalday
authored
CompatHelper: bump compat for MixedModels to 5, (keep existing compat) (#24)
* CompatHelper: bump compat for MixedModels to 5, (keep existing compat) * style ci update * CI update * compat bumps * fix with latest MM.jl patch release * re-organize tests slightly, update Effects compat with an extension * yas --------- Co-authored-by: CompatHelper Julia <compathelper_noreply@julialang.org> Co-authored-by: Phillip Alday <me@phillipalday.com>
1 parent efa81c1 commit d749742

13 files changed

Lines changed: 107 additions & 287 deletions

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
version:
24-
- '1.8'
24+
- 'min'
2525
- '1'
2626
- 'nightly'
2727
os:
2828
- ubuntu-latest
29-
arch:
30-
- x64
3129
steps:
32-
- uses: actions/checkout@v2
33-
- uses: julia-actions/setup-julia@v1
30+
- uses: actions/checkout@v5
31+
- uses: julia-actions/setup-julia@v2
3432
with:
3533
version: ${{ matrix.version }}
36-
arch: ${{ matrix.arch }}
34+
- uses: julia-actions/cache@v2
35+
with:
36+
cache-compiled: "true"
3737
- uses: julia-actions/cache@v1
3838
- uses: julia-actions/julia-buildpkg@v1
3939
- uses: julia-actions/julia-runtest@v1

.github/workflows/documenter.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
name: Documentation
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v2
24-
- uses: julia-actions/setup-julia@v1
23+
- uses: actions/checkout@v5
24+
- uses: julia-actions/setup-julia@v2
25+
- uses: julia-actions/cache@v2
2526
with:
26-
version: 1
27-
- uses: julia-actions/cache@v1
27+
cache-compiled: "true"
2828
- uses: julia-actions/julia-buildpkg@latest
2929
- uses: julia-actions/julia-docdeploy@latest
3030
env:

.github/workflows/style.yml

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,34 @@
1-
name: YASG-enforcer
1+
name: Style-Enforcer
22
on:
3-
push:
4-
branches:
5-
- 'main'
6-
tags: '*'
73
pull_request:
84
types: [opened, synchronize, reopened, ready_for_review]
9-
# note: keep in sync with `format/run.jl`
10-
paths:
11-
- 'src/**'
12-
- 'test/**'
13-
- 'docs/**'
14-
- '.github/workflows/style.yml'
15-
- 'format/**'
5+
paths-ignore:
6+
- 'README.md'
7+
- '.gitignore'
168
jobs:
179
format-check:
18-
name: YASG Enforcement (Julia ${{ matrix.julia-version }} - ${{ github.event_name }})
19-
# Run on push's or non-draft PRs
20-
if: (github.event_name == 'push') || (github.event.pull_request.draft == false)
10+
name: Style Enforcement
2111
runs-on: ubuntu-latest
2212
strategy:
2313
matrix:
24-
julia-version: [1.7]
14+
julia-version: [min]
2515
steps:
16+
- uses: actions/checkout@v5
2617
- uses: julia-actions/setup-julia@latest
2718
with:
2819
version: ${{ matrix.julia-version }}
29-
- uses: actions/checkout@v1
30-
- name: Instantiate `format` environment and format
20+
- name: Install JuliaFormatter
21+
shell: julia --project=@format --color=yes {0}
3122
run: |
32-
julia --project=format -e 'using Pkg; Pkg.instantiate()'
33-
julia --project=format 'format/run.jl'
23+
using Pkg
24+
Pkg.add(PackageSpec(; name="JuliaFormatter", version="1"))
25+
- name: Check formatting
26+
shell: julia --project=@format --color=yes {0}
27+
run: |
28+
using JuliaFormatter
29+
format(".", YASStyle(); verbose=true) || exit(1)
30+
# Add formatting suggestions to non-draft PRs even if "Check formatting" fails
3431
- uses: reviewdog/action-suggester@v1
35-
if: github.event_name == 'pull_request'
32+
if: ${{ !cancelled() && github.event.pull_request.draft == false }}
3633
with:
3734
tool_name: JuliaFormatter
38-
fail_on_error: true

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ docs/site/
2222
# committed for packages, but should be committed for applications that require a static
2323
# environment.
2424
Manifest.toml
25+
Manifest-v*.toml

Project.toml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "MixedModelsSerialization"
22
uuid = "b32ace64-3998-4ca6-afd0-a0db4a0482b2"
33
authors = ["Phillip Alday <me@phillipalday.com>"]
4-
version = "0.1.1"
4+
version = "0.2.0"
55

66
[deps]
77
GLM = "38e38edf-8417-5370-95a0-9cbb8c7f171a"
@@ -14,12 +14,32 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
1414
StatsFuns = "4c63d2b9-4356-54db-8cca-17b64c39e42c"
1515
StatsModels = "3eaba693-59b7-5ba5-a881-562e759f1c8d"
1616

17+
[weakdeps]
18+
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
19+
Effects = "8f03c58b-bd97-4933-a826-f71b64d2cca2"
20+
21+
[extensions]
22+
MixedModelsSerializationEffectsExt = ["DataFrames", "Effects"]
23+
1724
[compat]
25+
DataFrames = "1"
26+
Effects = "1"
1827
GLM = "1"
1928
JLD2 = "0.4.22"
20-
MixedModels = "4"
29+
MixedModels = "5.0.3"
2130
StatsAPI = "1"
2231
StatsBase = "0.33, 0.34"
2332
StatsFuns = "1"
2433
StatsModels = "0.7"
25-
julia = "1.8"
34+
julia = "1.10"
35+
36+
[extras]
37+
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
38+
Effects = "8f03c58b-bd97-4933-a826-f71b64d2cca2"
39+
MixedModelsDatasets = "7e9fb7ac-9f67-43bf-b2c8-96ba0796cbb6"
40+
Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
41+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
42+
TestSetExtensions = "98d24dd4-01ad-11ea-1b02-c9a08f80db04"
43+
44+
[targets]
45+
test = ["Aqua", "Effects", "MixedModelsDatasets", "Suppressor", "Test", "TestSetExtensions"]
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
module MixedModelsSerializationEffectsExt
2+
3+
using DataFrames
4+
using Effects
5+
using MixedModels
6+
using MixedModelsSerialization
7+
using StatsBase
8+
9+
function Effects.effects!(reference_grid::DataFrame, model::LinearMixedModelSummary;
10+
kwargs...)
11+
# we don't want to use the MixedModel specific version since we don't store all the things
12+
return @invoke effects!(reference_grid::DataFrame, model::RegressionModel; kwargs...)
13+
end
14+
15+
end # module

format/Manifest.toml

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

format/Project.toml

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

format/run.jl

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

0 commit comments

Comments
 (0)