python-adaptive · basnijholt · May 29, 2024 · Apr 7, 2023 · Apr 7, 2023 · May 29, 2024
diff --git a/adaptive/__init__.py b/adaptive/__init__.py
@@ -1,5 +1,3 @@
-from contextlib import suppress
-
 from adaptive._version import __version__
 from adaptive.learner import (
     AverageLearner,
@@ -47,11 +45,5 @@
     "Runner",
 ]
 
-with suppress(ImportError):
-    # Only available if 'scikit-optimize' is installed
-    from adaptive.learner import SKOptLearner  # noqa: F401
-
-    __all__.append("SKOptLearner")
-
 # to avoid confusion with `notebook_extension`
 del notebook_integration  # type: ignore[name-defined] # noqa: F821
diff --git a/adaptive/learner/__init__.py b/adaptive/learner/__init__.py
@@ -1,5 +1,3 @@
-from contextlib import suppress
-
 from adaptive.learner.average_learner import AverageLearner
 from adaptive.learner.average_learner1D import AverageLearner1D
 from adaptive.learner.balancing_learner import BalancingLearner
@@ -24,9 +22,3 @@
     "AverageLearner1D",
     "SequenceLearner",
 ]
-
-with suppress(ImportError):
-    # Only available if 'scikit-optimize' is installed
-    from adaptive.learner.skopt_learner import SKOptLearner  # noqa: F401
-
-    __all__.append("SKOptLearner")
diff --git a/adaptive/learner/skopt_learner.py b/adaptive/learner/skopt_learner.py
diff --git a/adaptive/tests/test_learners.py b/adaptive/tests/test_learners.py
@@ -30,13 +30,6 @@
 from adaptive.learner.learner1D import with_pandas
 from adaptive.runner import simple
 
-try:
-    from adaptive.learner.skopt_learner import SKOptLearner
-except (ModuleNotFoundError, ImportError):
-    # XXX: catch the ImportError because of https://github.com/scikit-optimize/scikit-optimize/issues/902
-    SKOptLearner = None  # type: ignore[assignment,misc]
-
-
 LOSS_FUNCTIONS = {
     Learner1D: (
         "loss_per_interval",
@@ -574,7 +567,6 @@ def test_balancing_learner(learner_type, f, learner_kwargs):
     LearnerND,
     AverageLearner,
     AverageLearner1D,
-    maybe_skip(SKOptLearner),
     IntegratorLearner,
     SequenceLearner,
     with_all_loss_functions=False,
@@ -607,7 +599,6 @@ def test_saving(learner_type, f, learner_kwargs):
     LearnerND,
     AverageLearner,
     AverageLearner1D,
-    maybe_skip(SKOptLearner),
     IntegratorLearner,
     SequenceLearner,
     with_all_loss_functions=False,
@@ -646,7 +637,6 @@ def fname(learner):
     LearnerND,
     AverageLearner,
     AverageLearner1D,
-    maybe_skip(SKOptLearner),
     IntegratorLearner,
     with_all_loss_functions=False,
 )

diff --git a/adaptive/tests/test_skopt_learner.py b/adaptive/tests/test_skopt_learner.py
diff --git a/docs/environment.yml b/docs/environment.yml
@@ -6,8 +6,6 @@ channels:
 dependencies:
   - python=3.10
   - sortedcollections=2.1.0
-  - scikit-optimize=0.9.0
-  - scikit-learn=1.2.2
   - scipy=1.10.1
   - holoviews=1.18.3
   - bokeh=3.3.4

diff --git a/docs/source/reference/adaptive.learner.skopt_learner.md b/docs/source/reference/adaptive.learner.skopt_learner.md
diff --git a/docs/source/tutorial/tutorial.SKOptLearner.md b/docs/source/tutorial/tutorial.SKOptLearner.md