Port fixes from elasticsearch-py pull request

Author: pquentin

elasticsearch_serverless/_sync/client/utils.py

@@ -70,7 +70,6 @@ class Stability(Enum):
     STABLE = auto()
     BETA = auto()
     EXPERIMENTAL = auto()
-    DEPRECATED = auto()
 
 
 _TYPE_HOST = Union[str, Mapping[str, Union[str, int]], NodeConfig]
@@ -454,12 +453,6 @@ def wrapped(*args: Any, **kwargs: Any) -> Any:
                     category=GeneralAvailabilityWarning,
                     stacklevel=warn_stacklevel(),
                 )
-            elif stability == Stability.DEPRECATED:
-                warnings.warn(
-                    f"This API was deprecated in Elasticsearch {version}. {message}",
-                    category=DeprecationWarning,
-                    stacklevel=warn_stacklevel(),
-                )
 
             return api(*args, **kwargs)
 

test_elasticsearch_serverless/test_client/test_utils.py

@@ -18,6 +18,8 @@
 
 import warnings
 
+import pytest
+
 from elasticsearch_serverless._sync.client.utils import (
     Stability,
     _quote,
@@ -62,43 +64,20 @@ def test_beta(self, recwarn):
         def func_beta(*args, **kwargs):
             pass
 
-        func_beta()
-
-        assert len(recwarn) == 1
-        user_warning = recwarn.pop(GeneralAvailabilityWarning)
-        assert user_warning.category == GeneralAvailabilityWarning
-        assert user_warning.message.args[0].startswith(
-            "This API is in beta and is subject to change."
-        )
+        with pytest.warns(
+            GeneralAvailabilityWarning,
+            match="This API is in beta and is subject to change.",
+        ):
+            func_beta()
 
     def test_experimental(self, recwarn):
 
         @_stability_warning(stability=Stability.EXPERIMENTAL)
         def func_experimental(*args, **kwargs):
             pass
 
-        func_experimental()
-
-        assert len(recwarn) == 1
-        user_warning = recwarn.pop(GeneralAvailabilityWarning)
-        assert user_warning.category == GeneralAvailabilityWarning
-        assert user_warning.message.args[0].startswith(
-            "This API is in technical preview and may be changed or removed in a future release."
-        )
-
-    def test_deprecated(self, recwarn):
-
-        @_stability_warning(
-            stability=Stability.DEPRECATED, version="8.4.0", message="Use bar instead."
-        )
-        def func_deprecated(*args, **kwargs):
-            pass
-
-        func_deprecated()
-
-        assert len(recwarn) == 1
-        user_warning = recwarn.pop(DeprecationWarning)
-        assert user_warning.category == DeprecationWarning
-        assert user_warning.message.args[0] == (
-            "This API was deprecated in Elasticsearch 8.4.0. Use bar instead."
-        )
+        with pytest.warns(
+            GeneralAvailabilityWarning,
+            match="This API is in technical preview and may be changed or removed in a future release.",
+        ):
+            func_experimental()