Merge branch 'main' into release-2.7.0

sktime · Oct 9, 2024 · bfc8cf8 · bfc8cf8
2 parents 52df504 + d22aaf6
commit bfc8cf8
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -69,7 +69,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
-        os: [ubuntu-latest, windows-latest, macOS-13]
+        os: [ubuntu-latest, windows-latest, macOS-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -108,7 +108,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
-        os: [ubuntu-latest, windows-latest, macOS-13]
+        os: [ubuntu-latest, windows-latest, macOS-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -34,7 +34,7 @@ jobs:
     strategy:
       fail-fast: false  # to not fail all combinations if just one fail
       matrix:
-        os: [ubuntu-latest, macOS-13]
+        os: [ubuntu-latest, macOS-latest]
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:

diff --git a/skpro/registry/_tags.py b/skpro/registry/_tags.py
@@ -123,7 +123,7 @@
         "whether estimator supports missing values",
     ),
     (
-        "capability:online",
+        "capability:update",
         "regressor_proba",
         "bool",
         "whether estimator supports online updates via update",

diff --git a/skpro/regression/base/_base.py b/skpro/regression/base/_base.py
@@ -33,7 +33,7 @@ class BaseProbaRegressor(BaseEstimator):
         "capability:survival": False,
         "capability:multioutput": False,
         "capability:missing": True,
-        "capability:online": False,
+        "capability:update": False,
         "X_inner_mtype": "pd_DataFrame_Table",
         "y_inner_mtype": "pd_DataFrame_Table",
         "C_inner_mtype": "pd_DataFrame_Table",
@@ -140,7 +140,7 @@ def _fit(self, X, y, C=None):
     def update(self, X, y, C=None):
         """Update regressor with a new batch of training data.
 
-        Only estimators with the ``capability:online`` tag (value ``True``)
+        Only estimators with the ``capability:update`` tag (value ``True``)
         provide this method, otherwise the method ignores the call and
         discards the data passed.
 
@@ -164,7 +164,7 @@ def update(self, X, y, C=None):
         -------
         self : reference to self
         """
-        capa_online = self.get_tag("capability:online")
+        capa_online = self.get_tag("capability:update")
         capa_surv = self.get_tag("capability:survival")
 
         if not capa_online:

diff --git a/skpro/regression/compose/_pipeline.py b/skpro/regression/compose/_pipeline.py
@@ -339,7 +339,7 @@ def __init__(self, steps):
         tags_to_clone = [
             "capability:multioutput",
             "capability:survival",
-            "capability:online",
+            "capability:update",
         ]
         self.clone_tags(self.regressor_, tags_to_clone)
 

diff --git a/skpro/regression/online/_dont_refit.py b/skpro/regression/online/_dont_refit.py
@@ -26,7 +26,7 @@ class OnlineDontRefit(_DelegatedProbaRegressor):
         clone of the regressor passed in the constructor, fitted on all data
     """
 
-    _tags = {"capability:online": False}
+    _tags = {"capability:update": False}
 
     def __init__(self, estimator):
         self.estimator = estimator

diff --git a/skpro/regression/online/_refit.py b/skpro/regression/online/_refit.py
@@ -28,7 +28,7 @@ class OnlineRefit(_DelegatedProbaRegressor):
         clone of the regressor passed in the constructor, fitted on all data
     """
 
-    _tags = {"capability:online": True}
+    _tags = {"capability:update": True}
 
     def __init__(self, estimator):
         self.estimator = estimator

diff --git a/skpro/regression/online/_refit_every.py b/skpro/regression/online/_refit_every.py
@@ -33,7 +33,7 @@ class OnlineRefitEveryN(_DelegatedProbaRegressor):
         clone of the regressor passed in the constructor, fitted on all data
     """
 
-    _tags = {"capability:online": True}
+    _tags = {"capability:update": True}
 
     def __init__(self, estimator, N=1):
         self.estimator = estimator

diff --git a/skpro/survival/base.py b/skpro/survival/base.py
@@ -51,7 +51,7 @@ def fit(self, X, y, C=None):
     def update(self, X, y, C=None):
         """Update regressor with a new batch of training data.
 
-        Only estimators with the ``capability:online`` tag (value ``True``)
+        Only estimators with the ``capability:update`` tag (value ``True``)
         provide this method, otherwise the method ignores the call and
         discards the data passed.