Expire 0.6.* deprecations (#198)

emdgroup · Apr 23, 2024 · 4f0cb62 · 4f0cb62
2 parents 725dca5 + 1125647
commit 4f0cb62
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 92 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,6 +40,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `acquisition_function_cls` constructor parameter for `BayesianRecommender`
 - `VarUCB` and `qVarUCB` acquisition functions
 
+### Expired Deprecations (from 0.6.*)
+- `BayBE` class
+- `baybe.surrogate` module
+- `baybe.targets.Objective` class
+- `baybe.strategies.Strategy` class
+
 ## [0.8.2] - 2024-03-27
 ### Added
 - Simulation user guide

diff --git a/baybe/__init__.py b/baybe/__init__.py
@@ -3,7 +3,6 @@
 import warnings
 
 from baybe.campaign import Campaign
-from baybe.deprecation import BayBE
 
 # Show deprecation warnings
 warnings.filterwarnings("default", category=DeprecationWarning, module="baybe")
@@ -52,7 +51,6 @@ def infer_version() -> str:  # pragma: no cover
 __version__ = infer_version()
 __all__ = [
     "__version__",
-    "BayBE",
     "Campaign",
 ]
 

diff --git a/baybe/deprecation.py b/baybe/deprecation.py
@@ -2,22 +2,6 @@
 
 import warnings
 
-from attrs import define
-
-from baybe import Campaign
-
-
-@define
-class BayBE(Campaign):
-    """A :class:`baybe.campaign.Campaign` alias for backward compatibility."""
-
-    def __attrs_pre_init__(self):
-        warnings.warn(
-            "The 'BayBE' class is deprecated and will be removed in a future version. "
-            "Please use the 'Campaign' class instead.",
-            DeprecationWarning,
-        )
-
 
 def compatibilize_config(config: dict) -> dict:
     """Turn a legacy-format config into the new format."""

diff --git a/baybe/strategies/__init__.py b/baybe/strategies/__init__.py
@@ -2,7 +2,6 @@
 
 from baybe.strategies.deprecation import (
     SequentialStrategy,
-    Strategy,
     StreamingSequentialStrategy,
     TwoPhaseStrategy,
 )
@@ -11,5 +10,4 @@
     "SequentialStrategy",
     "StreamingSequentialStrategy",
     "TwoPhaseStrategy",
-    "Strategy",
 ]
diff --git a/baybe/strategies/deprecation.py b/baybe/strategies/deprecation.py
@@ -9,18 +9,6 @@
 )
 
 
-def Strategy(*args, **kwargs) -> TwoPhaseMetaRecommender:
-    """A ``Strategy`` alias for backward compatibility."""  # noqa: D401 (imperative mood)
-    warnings.warn(
-        f"Using 'Strategy' directly is deprecated and will be removed in a future "
-        f"version. Please use 'recommenders.{TwoPhaseMetaRecommender.__name__}' class "
-        f"instead.",
-        DeprecationWarning,
-    )
-
-    return TwoPhaseMetaRecommender(*args, **kwargs)
-
-
 def TwoPhaseStrategy(*args, **kwargs) -> TwoPhaseMetaRecommender:
     """A ``TwoPhaseStrategy`` alias for backward compatibility."""  # noqa: D401 (imperative mood)
     warnings.warn(

diff --git a/baybe/surrogate.py b/baybe/surrogate.py
diff --git a/baybe/targets/__init__.py b/baybe/targets/__init__.py
@@ -1,12 +1,10 @@
 """BayBE targets."""
 
-from baybe.targets.deprecation import Objective
 from baybe.targets.enum import TargetMode, TargetTransformation
 from baybe.targets.numerical import NumericalTarget
 
 __all__ = [
     "NumericalTarget",
-    "Objective",
     "TargetMode",
     "TargetTransformation",
 ]
diff --git a/baybe/targets/deprecation.py b/baybe/targets/deprecation.py
diff --git a/docs/templates/custom-module-template.rst b/docs/templates/custom-module-template.rst
@@ -61,7 +61,7 @@
    :template: custom-module-template.rst
    :recursive:
 {% for item in modules %}
-{% if not item in ("baybe.deprecation", "baybe.surrogate", "baybe.strategies.deprecation", "baybe.targets.deprecation", "baybe.objectives.deprecation") %}
+{% if not item in ("baybe.deprecation", "baybe.strategies.deprecation", "baybe.objectives.deprecation") %}
    {{ item }}
 {%- endif %}
 {%- endfor %}

diff --git a/mypy.ini b/mypy.ini
@@ -11,7 +11,6 @@ exclude = (?x)(
           | baybe/exceptions.py
           | baybe/scaler.py
           | baybe/simulation.py
-          | baybe/surrogate.py
           )
 
 [mypy-gpytorch.*]

diff --git a/tests/test_deprecations.py b/tests/test_deprecations.py
@@ -5,7 +5,7 @@
 
 import pytest
 
-from baybe import BayBE, Campaign
+from baybe import Campaign
 from baybe.acquisition.base import AcquisitionFunction
 from baybe.exceptions import DeprecationError
 from baybe.objective import Objective as OldObjective
@@ -17,37 +17,16 @@
     FPSRecommender,
     RandomRecommender,
 )
-from baybe.searchspace import SearchSpace
 from baybe.strategies import (
     SequentialStrategy,
-    Strategy,
     StreamingSequentialStrategy,
     TwoPhaseStrategy,
 )
-from baybe.targets import Objective as ObjectiveFromTargets
 from baybe.targets.base import Target
 from baybe.targets.numerical import NumericalTarget
 from baybe.utils.interval import Interval
 
 
-def test_deprecated_baybe_class(parameters, objective):
-    """Using the deprecated ``BayBE`` class raises a warning."""
-    with pytest.warns(DeprecationWarning):
-        BayBE(SearchSpace.from_product(parameters), objective)
-
-
-def test_moved_objective(targets):
-    """Importing ``Objective`` from ``baybe.targets`` raises a warning."""
-    with pytest.warns(DeprecationWarning):
-        ObjectiveFromTargets(mode="SINGLE", targets=targets)
-
-
-def test_renamed_surrogate():
-    """Importing from ``baybe.surrogate`` raises a warning."""
-    with pytest.warns(DeprecationWarning):
-        from baybe.surrogate import GaussianProcessSurrogate  # noqa: F401
-
-
 def test_missing_recommender_type(config):
     """Specifying a recommender without a corresponding type raises a warning."""
     dict_ = json.loads(config)
@@ -65,7 +44,6 @@ def test_missing_recommender_type(config):
 @pytest.mark.parametrize(
     "test_objects",
     [
-        (Strategy, {}),
         (TwoPhaseStrategy, {}),
         (SequentialStrategy, {"recommenders": RECOMMENDERS}),
         (StreamingSequentialStrategy, {"recommenders": RECOMMENDERS}),