Skip to content

MAINT test building wheels #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Mar 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b0e7016
manually trigger build
TimotheeMathieu Feb 20, 2023
371a20b
comment manual part
TimotheeMathieu Feb 20, 2023
749f29f
switching to Ubuntu 22.04
TimotheeMathieu Feb 20, 2023
20356ee
Merge branch 'main' of https://github.com/scikit-learn-contrib/scikit…
TimotheeMathieu Feb 20, 2023
3156e7f
fix bug random test
TimotheeMathieu Feb 20, 2023
c793319
Merge branch 'fix_test_kmed' into test_wheels
TimotheeMathieu Feb 20, 2023
1305e88
black
TimotheeMathieu Feb 20, 2023
c3bd967
Merge branch 'main' of https://github.com/scikit-learn-contrib/scikit…
TimotheeMathieu Feb 20, 2023
36cf29f
Merge branch 'fix_test_kmed' into test_wheels
TimotheeMathieu Feb 21, 2023
d426f1d
fix test ci
TimotheeMathieu Feb 21, 2023
df1d457
Merge branch 'main' of https://github.com/scikit-learn-contrib/scikit…
TimotheeMathieu Feb 24, 2023
68d4b4b
Merge branch 'main' of https://github.com/scikit-learn-contrib/scikit…
TimotheeMathieu Feb 26, 2023
ab3b608
Merge branch 'main' into test_wheels
TimotheeMathieu Mar 27, 2023
41df6ae
update cibuildwheels
TimotheeMathieu Mar 27, 2023
80ea7ce
try another image for manylinux i686
TimotheeMathieu Mar 27, 2023
a57d0f1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 27, 2023
bb5187b
Skip 3.11 for 32bit
TimotheeMathieu Mar 27, 2023
6784a87
Merge branch 'test_wheels' of https://github.com/TimotheeMathieu/scik…
TimotheeMathieu Mar 27, 2023
dfb25ae
fix syntax
TimotheeMathieu Mar 27, 2023
18daf14
remove failing binary
TimotheeMathieu Mar 27, 2023
746b841
remove failing binary
TimotheeMathieu Mar 27, 2023
ed732b5
remove all 32 bits
TimotheeMathieu Mar 27, 2023
bedef0f
remove all 32 bits
TimotheeMathieu Mar 27, 2023
ab17372
remove musllinux
TimotheeMathieu Mar 27, 2023
6f9c3ae
remove trigger of build wheels
TimotheeMathieu Mar 27, 2023
e1df03e
syntax yml
TimotheeMathieu Mar 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions .github/workflows/build-wheels.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: build_wheels

on: # [push, pull_request]
release:
types:
- created
workflow_dispatch:
inputs:
version:
description: 'Manually trigger wheel build in Github UI'
required: true
on: #[push, pull_request]
release:
types:
- created
workflow_dispatch:
inputs:
version:
description: 'Manually trigger wheel build in Github UI'
required: true


jobs:
Expand All @@ -17,7 +17,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-18.04, windows-latest, macos-latest]
os: [ubuntu-22.04, windows-latest, macos-latest]

steps:
- uses: actions/checkout@v2
Expand All @@ -28,12 +28,13 @@ jobs:
python-version: '3.8'
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==1.10.0
python -m pip install cibuildwheel==2.12.1
- name: Build wheels
env:
# We only build for Python 3.6+. On Linux manylinux2010 is used.
# Skipping pypy wheels for now since scipy & scikit-learn haven't build them yet.
CIBW_SKIP: "pp* *p27* *p35*"
# Skip python3.11 for 32bit.
CIBW_SKIP: "pp* *-win32 *-manylinux_i686 *musllinux*"
CIBW_TEST_REQUIRES: "pytest pandas scikit-learn"
CIBW_TEST_COMMAND: "pytest --pyargs sklearn_extra"
run: |
Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ requires = [

[tool.black]
line-length = 79

[tool.cibuildwheel]
manylinux-i686-image = "manylinux2010"
6 changes: 3 additions & 3 deletions sklearn_extra/robust/robust_weighted_estimator.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,13 @@ class _RobustWeightedEstimator(BaseEstimator):
Maximum number of iterations.
For more information, see the optimization scheme of base_estimator.

c : float>0 or None, default=None
c : float>0 or None, default=1
Parameter used for Huber weighting procedure, used only if weightings
is 'huber'. Measure the robustness of the weighting procedure. A small
value of c means a more robust estimator.
Can have a big effect on efficiency.
If None, c is estimated at each step using half the Inter-quartile
range, this tends to be conservative (robust).
range, this tends to be unstable.

k : int < sample_size/2, default=1
Parameter used for mom weighting procedure, used only if weightings
Expand Down Expand Up @@ -211,7 +211,7 @@ def __init__(
loss,
weighting="huber",
max_iter=100,
c=None,
c=1,
k=0,
tol=1e-5,
n_iter_no_change=10,
Expand Down