julearn 0.3.2.dev14__tar.gz → 0.3.2.dev24__tar.gz

{julearn-0.3.2.dev14 → julearn-0.3.2.dev24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: julearn
-Version: 0.3.2.dev14
+Version: 0.3.2.dev24
 Summary: Juelich Machine Learning Library
 Author-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Sami Hamdan <s.hamdan@fz-juelich.de>
 Maintainer-email: Sami Hamdan <s.hamdan@fz-juelich.de>
@@ -27,8 +27,8 @@ License-File: LICENSE.md
 License-File: AUTHORS.rst
 Requires-Dist: numpy<1.27,>=1.24
 Requires-Dist: pandas<2.2,>=1.5.0
-Requires-Dist: scikit-learn<1.4,>=1.2.0
 Requires-Dist: statsmodels<0.15,>=0.13
+Requires-Dist: scikit-learn<1.5.0,>=1.2.0
 Provides-Extra: dev
 Requires-Dist: tox; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"

julearn-0.3.2.dev24/docs/changes/newsfragments/244.misc

@@ -0,0 +1 @@
+Add support for ``scikit-learn 1.4.x`` by `Synchon Mandal`_

julearn-0.3.2.dev24/docs/changes/newsfragments/255.bugfix

@@ -0,0 +1 @@
+Update bokeh api calls to remove warnings by `Fede Raimondo`_

{julearn-0.3.2.dev14 → julearn-0.3.2.dev24}/julearn/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.2.dev14'
-__version_tuple__ = version_tuple = (0, 3, 2, 'dev14')
+__version__ = version = '0.3.2.dev24'
+__version_tuple__ = version_tuple = (0, 3, 2, 'dev24')

{julearn-0.3.2.dev14 → julearn-0.3.2.dev24}/julearn/base/estimators.py

@@ -10,7 +10,16 @@ import numpy as np
 import pandas as pd
 from sklearn.base import BaseEstimator, TransformerMixin
 from sklearn.utils.metaestimators import available_if
-from sklearn.utils.validation import _check_fit_params
+
+
+try:  # sklearn < 1.4.0
+    from sklearn.utils.validation import _check_fit_params
+
+    fit_params_checker = _check_fit_params
+except ImportError:  # sklearn >= 1.4.0
+    from sklearn.utils.validation import _check_method_params
+
+    fit_params_checker = _check_method_params
 
 from ..base.column_types import make_type_selector
 from ..utils import raise_error
@@ -238,7 +247,7 @@ class JuTransformer(JuBaseEstimator, TransformerMixin):
         ).index.values
         _X = X.loc[idx, :]
         _y = y if y is None else y.loc[idx]
-        fit_params = _check_fit_params(X, fit_params, indices=idx)
+        fit_params = fit_params_checker(X, fit_params, indices=idx)
 
         return dict(X=_X, y=_y, **fit_params)
 

{julearn-0.3.2.dev14 → julearn-0.3.2.dev24}/julearn/pipeline/test/test_target_pipeline.py

@@ -196,6 +196,7 @@ def test_target_noninverse(df_iris, X_iris):  # noqa: N803
 
     with warnings.catch_warnings():
         warnings.simplefilter("error")
+        warnings.simplefilter(action="ignore", category=FutureWarning)
         run_cross_validation(
             X=X,
             y="species",

{julearn-0.3.2.dev14 → julearn-0.3.2.dev24}/julearn/tests/test_api.py

@@ -4,6 +4,7 @@
 #          Sami Hamdan <s.hamdan@fz-juelich.de>
 # License: AGPL
 
+import platform
 from pathlib import Path
 
 import joblib
@@ -208,7 +209,15 @@ def test_run_cv_simple_binary_errors(
     api_params = {"model": "svm", "problem_type": "classification"}
     sklearn_model = SVC()
 
-    with pytest.warns(UserWarning, match="Target is multiclass but average"):
+    if (
+        platform.python_version_tuple()[0] == "3"
+        and int(platform.python_version_tuple()[1]) > 8
+    ):
+        user_warning_msg = "Scoring failed."
+    else:
+        user_warning_msg = "Target is multiclass but average"
+
+    with pytest.warns(UserWarning, match=user_warning_msg):
         do_scoring_test(
             X,
             y,

{julearn-0.3.2.dev14 → julearn-0.3.2.dev24}/julearn/utils/typing.py

@@ -16,19 +16,27 @@ from typing import (
 
 import numpy as np
 import pandas as pd
-from sklearn.metrics._scorer import (
-    _PredictScorer,
-    _ProbaScorer,
-    _ThresholdScorer,
-)
+
+
+try:  # sklearn < 1.4.0
+    from sklearn.metrics._scorer import (
+        _PredictScorer,
+        _ProbaScorer,
+        _ThresholdScorer,
+    )
+
+    ScorerLike = Union[_ProbaScorer, _ThresholdScorer, _PredictScorer]
+except ImportError:  # sklearn >= 1.4.0
+    from sklearn.metrics._scorer import _Scorer
+
+    ScorerLike = _Scorer
+
 
 from ..base import ColumnTypes
 
 
 DataLike = Union[np.ndarray, pd.DataFrame, pd.Series]
 
-ScorerLike = Union[_ProbaScorer, _ThresholdScorer, _PredictScorer]
-
 
 @runtime_checkable
 class EstimatorLikeFit1(Protocol):

{julearn-0.3.2.dev14 → julearn-0.3.2.dev24}/julearn/viz/_scores.py

@@ -193,7 +193,7 @@ class _JulearnScoresViewer(param.Parameterized):
             )
             p.add_layout(labels)
             return p
-        p.circle(
+        p.scatter(
             x=jitter("x", width=0.7, range=p.x_range),
             y="score",
             alpha=0.5,
@@ -385,7 +385,6 @@ def plot_scores(
             widgets={
                 "metric": {
                     "type": pn.widgets.Select,
-                    "button_type": "primary",
                     "name": "",
                 }
             },

{julearn-0.3.2.dev14 → julearn-0.3.2.dev24}/julearn.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: julearn
-Version: 0.3.2.dev14
+Version: 0.3.2.dev24
 Summary: Juelich Machine Learning Library
 Author-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Sami Hamdan <s.hamdan@fz-juelich.de>
 Maintainer-email: Sami Hamdan <s.hamdan@fz-juelich.de>
@@ -27,8 +27,8 @@ License-File: LICENSE.md
 License-File: AUTHORS.rst
 Requires-Dist: numpy<1.27,>=1.24
 Requires-Dist: pandas<2.2,>=1.5.0
-Requires-Dist: scikit-learn<1.4,>=1.2.0
 Requires-Dist: statsmodels<0.15,>=0.13
+Requires-Dist: scikit-learn<1.5.0,>=1.2.0
 Provides-Extra: dev
 Requires-Dist: tox; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"

{julearn-0.3.2.dev14 → julearn-0.3.2.dev24}/julearn.egg-info/SOURCES.txt

@@ -54,8 +54,10 @@ docs/api/viz.rst
 docs/changes/contributors.inc
 docs/changes/newsfragments/.gitignore
 docs/changes/newsfragments/224.misc
+docs/changes/newsfragments/244.misc
 docs/changes/newsfragments/249.bugfix
 docs/changes/newsfragments/251.misc
+docs/changes/newsfragments/255.bugfix
 docs/images/corrected_ttest.png
 docs/images/final_estimator.png
 docs/images/iris_X.png

{julearn-0.3.2.dev14 → julearn-0.3.2.dev24}/julearn.egg-info/requires.txt

@@ -1,7 +1,7 @@
 numpy<1.27,>=1.24
 pandas<2.2,>=1.5.0
-scikit-learn<1.4,>=1.2.0
 statsmodels<0.15,>=0.13
+scikit-learn<1.5.0,>=1.2.0
 
 [deslib]
 deslib<0.4,>=0.3.5

{julearn-0.3.2.dev14 → julearn-0.3.2.dev24}/pyproject.toml

@@ -39,8 +39,8 @@ classifiers = [
 dependencies = [
     "numpy>=1.24,<1.27",
     "pandas>=1.5.0,<2.2",
-    "scikit-learn>=1.2.0,<1.4",
     "statsmodels>=0.13,<0.15",
+    "scikit-learn>=1.2.0,<1.5.0",
 ]
 dynamic = ["version"]