Rename "mutually_promotable_dtype_pairs" back to its original name

mutually_promotable_dtypes

Author: honno

array_api_tests/hypothesis_helpers.py

@@ -54,7 +54,7 @@
 # should remove the composite wrapper, just returning sampled_from(dtype_pairs)
 # instead of drawing from it.
 @composite
-def mutually_promotable_dtype_pairs(draw, dtype_objects=dtype_objects):
+def mutually_promotable_dtypes(draw, dtype_objects=dtype_objects):
     from .test_type_promotion import dtype_mapping, promotion_table
     # sort for shrinking (sampled_from shrinks to the earlier elements in the
     # list). Give pairs of the same dtypes first, then smaller dtypes,
@@ -76,7 +76,7 @@ def mutually_promotable_dtype_pairs(draw, dtype_objects=dtype_objects):
     return draw(sampled_from(dtype_pairs))
 
 shared_mutually_promotable_dtype_pairs = shared(
-    mutually_promotable_dtype_pairs(), key="mutually_promotable_dtype_pair"
+    mutually_promotable_dtypes(), key="mutually_promotable_dtype_pair"
 )
 
 # shared() allows us to draw either the function or the function name and they

array_api_tests/meta_tests/test_hypothesis_helpers.py

@@ -7,16 +7,16 @@
 from .._array_module import _UndefinedStub
 from ..array_helpers import dtype_objects
 from ..hypothesis_helpers import (MAX_ARRAY_SIZE,
-                                  mutually_promotable_dtype_pairs,
+                                  mutually_promotable_dtypes,
                                   shapes, two_broadcastable_shapes,
                                   two_mutually_broadcastable_shapes)
 
 UNDEFINED_DTYPES = any(isinstance(d, _UndefinedStub) for d in dtype_objects)
 pytestmark = [pytest.mark.skipif(UNDEFINED_DTYPES, reason="undefined dtypes")]
 
 
-@given(mutually_promotable_dtype_pairs([xp.float32, xp.float64]))
-def test_mutually_promotable_dtype_pairs(pairs):
+@given(mutually_promotable_dtypes([xp.float32, xp.float64]))
+def test_mutually_promotable_dtypes(pairs):
     assert pairs in (
         (xp.float32, xp.float32),
         (xp.float32, xp.float64),

array_api_tests/test_elementwise_functions.py

@@ -25,7 +25,7 @@
                                  integer_or_boolean_dtype_objects,
                                  boolean_dtype_objects, floating_dtypes,
                                  numeric_dtypes, integer_or_boolean_dtypes,
-                                 boolean_dtypes, mutually_promotable_dtype_pairs,
+                                 boolean_dtypes, mutually_promotable_dtypes,
                                  array_scalars, shared_arrays1, shared_arrays2)
 from .array_helpers import (assert_exactly_equal, negative,
                             positive_mathematical_sign,
@@ -50,17 +50,17 @@
 integer_or_boolean_scalars = array_scalars(integer_or_boolean_dtypes)
 boolean_scalars = array_scalars(boolean_dtypes)
 
-two_integer_dtypes = mutually_promotable_dtype_pairs(integer_dtype_objects)
-two_floating_dtypes = mutually_promotable_dtype_pairs(floating_dtype_objects)
-two_numeric_dtypes = mutually_promotable_dtype_pairs(numeric_dtype_objects)
-two_integer_or_boolean_dtypes = mutually_promotable_dtype_pairs(integer_or_boolean_dtype_objects)
-two_boolean_dtypes = mutually_promotable_dtype_pairs(boolean_dtype_objects)
-two_any_dtypes = mutually_promotable_dtype_pairs()
+two_integer_dtypes = mutually_promotable_dtypes(integer_dtype_objects)
+two_floating_dtypes = mutually_promotable_dtypes(floating_dtype_objects)
+two_numeric_dtypes = mutually_promotable_dtypes(numeric_dtype_objects)
+two_integer_or_boolean_dtypes = mutually_promotable_dtypes(integer_or_boolean_dtype_objects)
+two_boolean_dtypes = mutually_promotable_dtypes(boolean_dtype_objects)
+two_any_dtypes = mutually_promotable_dtypes()
 
 @composite
 def two_array_scalars(draw, dtype1, dtype2):
     # two_dtypes should be a strategy that returns two dtypes (like
-    # mutually_promotable_dtype_pairs())
+    # mutually_promotable_dtypes())
     return draw(array_scalars(just(dtype1))), draw(array_scalars(just(dtype2)))
 
 def sanity_check(x1, x2):