Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/actions/upload-art…
Browse files Browse the repository at this point in the history
…ifact-4
  • Loading branch information
pavelzw authored Feb 2, 2024
2 parents 8b9a309 + dfbb355 commit d92f157
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Build wheels
uses: pypa/[email protected].2
uses: pypa/[email protected].4
env:
CIBW_ARCHS_MACOS: x86_64 arm64
- uses: actions/upload-artifact@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Checkout branch
uses: actions/checkout@v4
- name: Set up micromamba
uses: mamba-org/setup-micromamba@8752438cc2755ab7d0de2a8d70b694f5586baae8
uses: mamba-org/setup-micromamba@8767fb704bd78032e9392f0386bf46950bdd1194
- name: Add micromamba to GITHUB_PATH
run: echo "${HOME}/micromamba-bin" >> "$GITHUB_PATH"
- name: Install Python 3.11
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Checkout branch
uses: actions/checkout@v4
- name: Set up conda env
uses: mamba-org/setup-micromamba@8752438cc2755ab7d0de2a8d70b694f5586baae8
uses: mamba-org/setup-micromamba@8767fb704bd78032e9392f0386bf46950bdd1194
with:
environment-file: environment.yml
init-shell: ${{ matrix.os == 'windows-latest' && 'powershell' || 'bash' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
uses: actions/checkout@v4
- name: Fetch full git history
run: git fetch --prune --unshallow
- uses: mamba-org/setup-micromamba@8752438cc2755ab7d0de2a8d70b694f5586baae8
- uses: mamba-org/setup-micromamba@8767fb704bd78032e9392f0386bf46950bdd1194
with:
init-shell: ${{ matrix.os == 'windows-latest' && 'cmd.exe' || 'bash' }}
environment-name: build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
steps:
- name: Checkout branch
uses: actions/checkout@v4
- uses: mamba-org/setup-micromamba@8752438cc2755ab7d0de2a8d70b694f5586baae8
- uses: mamba-org/setup-micromamba@8767fb704bd78032e9392f0386bf46950bdd1194
with:
environment-file: environment.yml
create-args: >-
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/Quantco/pre-commit-mirrors-black
rev: 23.11.0
rev: 23.12.1
hooks:
- id: black-conda
args:
Expand All @@ -23,12 +23,12 @@ repos:
]
exclude: (^src/glum_benchmarks/orig_sklearn_fork/|^docs)
- repo: https://github.com/Quantco/pre-commit-mirrors-isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort-conda
additional_dependencies: [toml]
- repo: https://github.com/Quantco/pre-commit-mirrors-mypy
rev: "1.7.1"
rev: "1.8.0"
hooks:
- id: mypy-conda
args:
Expand Down
2 changes: 1 addition & 1 deletion src/glum/_distribution.py
Original file line number Diff line number Diff line change
Expand Up @@ -1369,7 +1369,7 @@ def guess_intercept(
second = np.log((mu ** (2 - p)).dot(sample_weight))
return first - second
elif isinstance(link, LogitLink):
log_odds = np.log(avg_y) - np.log(np.average(1 - y, weights=sample_weight))
log_odds = np.log(avg_y) - np.log(1 - avg_y)
if eta is None:
return log_odds
avg_eta = eta if np.isscalar(eta) else np.average(eta, weights=sample_weight)
Expand Down

0 comments on commit d92f157

Please sign in to comment.