Skip to content

Commit 722d582

Browse files
committed
limitt scikit-learn < 1.6.0
1 parent ac4558b commit 722d582

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

CHANGELOG

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ The rules for CHANGELOG file:
1313

1414
0.3.0 (XXXX/XX/XX)
1515
------------------
16-
- Fixed moved function import from scipy and bump scipy dependency to 1.15.0 (#236)
1716
- Fix rendering issues for `SparseKDE` and `QuickShift` (#236)
1817
- Updating ``FPS`` to allow a numpy array of ints as an initialize parameter (#145)
1918
- Supported Python versions are now ranging from 3.9 - 3.12.

examples/pcovr/PCovR_Regressors.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,11 @@
5555
# Use a fitted regressor
5656
# ----------------------
5757
#
58-
# You can pass a fitted regressor to PCovR to rely on the predetermined
59-
# regression parameters. Currently, scikit-matter supports ``scikit-learn``
60-
# classes ``LinearModel``, ``Ridge``, and ``RidgeCV``, with plans to support anu
61-
# regressor with similar architecture in the future.
58+
# You can pass a fitted regressor to ``PCovR`` to rely on the predetermined regression
59+
# parameters. Currently, scikit-matter supports ``scikit-learn`` classes
60+
# class:`LinearModel <sklearn.linear_model.LinearModel>`, :class:`Ridge
61+
# <sklearn.linear_model.Ridge>`, and class:`RidgeCV <sklearn.linear_model.RidgeCV>`,
62+
# with plans to support any regressor with similar architecture in the future.
6263

6364
regressor = Ridge(alpha=1e-6, fit_intercept=False, tol=1e-12)
6465

examples/selection/FeatureSelection-WHODataset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
# ^^^^^^^^
121121

122122

123-
pcur = PCovCUR(n_to_select=n_select, progress_bar=True, mixing=0.0)
123+
pcur = PCovCUR(n_to_select=n_select, progress_bar=True, mixing=1e-3)
124124
pcur.fit(X_train, yp_train)
125125

126126
# %%

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ classifiers = [
3838
"Topic :: Scientific/Engineering",
3939
]
4040
dependencies = [
41-
"scikit-learn>=1.1.0",
42-
"scipy >= 1.15.0", # explicit here since need a newer version as scikit-learn
41+
"scikit-learn < 1.6.0",
42+
"scipy < 1.15.0",
4343
]
4444
dynamic = ["version"]
4545

src/skmatter/sample_selection/_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import numpy as np
66
from scipy.interpolate import LinearNDInterpolator, interp1d
7-
from scipy.interpolate._interpnd import _ndim_coords_from_arrays
7+
from scipy.interpolate.interpnd import _ndim_coords_from_arrays
88
from scipy.spatial import ConvexHull
99
from sklearn.utils.validation import check_array, check_is_fitted, check_X_y
1010

Binary file not shown.

0 commit comments

Comments
 (0)