Skip to content

Commit 21a419e

Browse files
authored
Merge pull request #64 from junder873/master
Update for FixedEffectModels 1.12
2 parents 55c2a7c + 48fcf7d commit 21a419e

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
branches:
88
- master
99
tags: '*'
10+
workflow_dispatch:
1011
jobs:
1112
test:
1213
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
@@ -17,18 +18,17 @@ jobs:
1718
version:
1819
- '1.9' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'.
1920
- '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
20-
- 'nightly'
2121
os:
2222
- ubuntu-latest
2323
arch:
2424
- x64
2525
steps:
26-
- uses: actions/checkout@v2
27-
- uses: julia-actions/setup-julia@v1
26+
- uses: actions/checkout@v4
27+
- uses: julia-actions/setup-julia@v2
2828
with:
2929
version: ${{ matrix.version }}
3030
arch: ${{ matrix.arch }}
31-
- uses: actions/cache@v1
31+
- uses: actions/cache@v4
3232
env:
3333
cache-name: cache-artifacts
3434
with:
@@ -41,6 +41,6 @@ jobs:
4141
- uses: julia-actions/julia-buildpkg@v1
4242
- uses: julia-actions/julia-runtest@v1
4343
- uses: julia-actions/julia-processcoverage@v1
44-
- uses: codecov/codecov-action@v1
44+
- uses: codecov/codecov-action@v5
4545
with:
46-
file: lcov.info
46+
files: lcov.info

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "GLFixedEffectModels"
22
uuid = "bafb0ae5-e5f5-5100-81b6-6a55d777c812"
33
authors = ["Johannes Boehm <johannes.boehm@gmail.com>"]
4-
version = "0.5.4"
4+
version = "0.5.5"
55

66
[deps]
77
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
@@ -24,7 +24,7 @@ Vcov = "ec2bfdc2-55df-4fc9-b9ae-4958c2cf2486"
2424
DataFrames = "1"
2525
Distributions = "0.25"
2626
FillArrays = "1"
27-
FixedEffectModels = "1.7,1.8,1.9,1.10,1.11"
27+
FixedEffectModels = "1.12"
2828
FixedEffects = "2.1,2.2,2.3"
2929
GLM = "^1.3.6"
3030
LoopVectorization = "0.12"

src/fit.jl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,7 @@ function nlreg(@nospecialize(df),
154154
if has_fes
155155
if drop_singletons
156156
before_n = sum(esample)
157-
for fe in fes
158-
FixedEffectModels.drop_singletons!(esample, fe)
159-
end
157+
FixedEffectModels.drop_singletons!(esample, fes, nthreads)
160158
after_n = sum(esample)
161159
dropped_n = before_n - after_n
162160
if dropped_n > 0

0 commit comments

Comments
 (0)