Skip to content

Commit

Permalink
Merge branch 'main' into use-correct-dtype-precision
Browse files Browse the repository at this point in the history
  • Loading branch information
mlondschien authored Oct 24, 2024
2 parents 0fcdb66 + 3090ea2 commit 6e05960
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @MarcAntoineSchmidtQC @xhochy @jtilly @lbittarello
* @MarcAntoineSchmidtQC @jtilly @lbittarello
12 changes: 7 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
- package-ecosystem: github-actions
directory: /
schedule:
interval: "weekly"
reviewers:
- "quantco/ci"
interval: monthly
groups:
gh-actions:
patterns:
- "*"
6 changes: 3 additions & 3 deletions .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/cibuildwheel@v2.21.1
uses: pypa/cibuildwheel@v2.21.2
env:
CIBW_ARCHS_MACOS: x86_64 arm64
- uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
with:
merge-multiple: true
path: dist
- uses: pypa/gh-action-pypi-publish@v1.10.2
- uses: pypa/gh-action-pypi-publish@v1.10.3
with:
repository-url: https://test.pypi.org/legacy/

Expand All @@ -75,4 +75,4 @@ jobs:
with:
path: dist
merge-multiple: true
- uses: pypa/gh-action-pypi-publish@v1.10.2
- uses: pypa/gh-action-pypi-publish@v1.10.3
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
with:
environments: ${{ matrix.environment }}
- name: Install nightlies
if: matrix.NOTE == 'Nightly Builds'
if: matrix.environment == 'nightly'
run: pixi run -e ${{ matrix.environment }} install-nightlies
- name: Install repository
run: pixi run -e ${{ matrix.environment }} postinstall
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ jobs:
run: git fetch --prune --unshallow
- uses: mamba-org/setup-micromamba@f8b8a1e23a26f60a44c853292711bacfd3eac822
with:
micromamba-version: 1.5.10-0
init-shell: ${{ matrix.os == 'windows-latest' && 'cmd.exe' || 'bash' }}
environment-name: build
create-args: boa
create-args: conda-build
- name: Patch conda build configuration
# use the latest macOS SDK when cross-compiling for arm64
if: startsWith(matrix.conda_build_yml, 'osx_arm64')
Expand All @@ -50,13 +51,13 @@ jobs:
if: matrix.os != 'windows-latest'
shell: bash -el {0}
run: >-
conda-mambabuild
conda-build
-m ".ci_support/${{ matrix.CONDA_BUILD_YML }}.yaml"${{ matrix.conda-build-args }}
conda.recipe
- name: Build conda package (windows)
if: matrix.os == 'windows-latest'
shell: cmd /C CALL {0}
run: >-
conda-mambabuild
conda-build
-m ".ci_support/${{ matrix.conda_build_yml }}.yaml"${{ matrix.conda-build-args }}
conda.recipe
2 changes: 1 addition & 1 deletion .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
with:
environments: ${{ matrix.environment }}
- name: Install nightlies
if: matrix.NOTE == 'Nightly Builds'
if: matrix.environment == 'nightly'
run: pixi run -e ${{ matrix.environment }} install-nightlies
- name: Install repository
run: pixi run -e ${{ matrix.environment }} postinstall
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# glum

[![CI](https://github.com/Quantco/glm_benchmarks/workflows/CI/badge.svg)](https://github.com/Quantco/glum/actions)
[![Daily runs](https://github.com/Quantco/glum/actions/workflows/daily.yml/badge.svg)](https://github.com/Quantco/glum/actions/workflows/daily.yml)
[![Docs](https://readthedocs.org/projects/pip/badge/?version=latest&style=flat)](https://glum.readthedocs.io/)
[![Conda-forge](https://img.shields.io/conda/vn/conda-forge/glum?logoColor=white&logo=conda-forge)](https://anaconda.org/conda-forge/glum)
[![PypiVersion](https://img.shields.io/pypi/v/glum.svg?logo=pypi&logoColor=white)](https://pypi.org/project/glum)
Expand Down
1 change: 0 additions & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ cmd = """
PRE_WHEELS="https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/"
&& pip install --pre --no-deps --only-binary :all: --upgrade --timeout=60 -i $PRE_WHEELS pandas
&& pip install --pre --no-deps --only-binary :all: --upgrade --timeout=60 -i $PRE_WHEELS scikit-learn
&& pip install --pre --no-deps --only-binary :all: --upgrade --timeout=60 -i $PRE_WHEELS scipy
&& pip install --pre --no-deps --only-binary :all: --upgrade --timeout=60 -i https://pypi.fury.io/arrow-nightlies/ pyarrow
&& pip install --no-use-pep517 --no-deps git+https://github.com/Quantco/tabmat
"""
Expand Down
2 changes: 1 addition & 1 deletion src/glum/_glm.py
Original file line number Diff line number Diff line change
Expand Up @@ -1791,7 +1791,7 @@ def _wald_test_term_names(
) -> WaldTestResult:
"""
Perform a Wald test for the hypothesis that the coefficients of the
features in ``terms`` are equal to the values in ``terms``.
features in ``terms`` are equal to the values in ``values``.
"""

if isinstance(terms, str):
Expand Down
2 changes: 1 addition & 1 deletion tests/glm/test_glm.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
GLM_SOLVERS = ["irls-ls", "lbfgs", "irls-cd", "trust-constr"]

estimators = [
(GeneralizedLinearRegressor, {}),
(GeneralizedLinearRegressor, {"alpha": 1.0}),
(GeneralizedLinearRegressorCV, {"n_alphas": 2}),
]

Expand Down

0 comments on commit 6e05960

Please sign in to comment.