Revert changes to integers/floats label calculation

Author: jobh

hypothesis-python/src/hypothesis/strategies/_internal/core.py

@@ -1886,7 +1886,10 @@ def do_draw(self, data):
         return self.definition(data.draw, *self.args, **self.kwargs)
 
     def calc_label(self) -> int:
-        return calc_label_from_callable(self.definition)
+        return combine_labels(
+            self.class_label,
+            calc_label_from_callable(self.definition),
+        )
 
 
 class DrawFn(Protocol):

hypothesis-python/src/hypothesis/strategies/_internal/numbers.py

@@ -16,7 +16,6 @@
 from hypothesis.control import reject
 from hypothesis.errors import InvalidArgument
 from hypothesis.internal.conjecture.data import ConjectureData
-from hypothesis.internal.conjecture.utils import calc_label_from_hash, combine_labels
 from hypothesis.internal.filtering import (
     get_float_predicate_bounds,
     get_integer_predicate_bounds,
@@ -67,13 +66,6 @@ def __repr__(self) -> str:
             return f"integers(max_value={self.end})"
         return f"integers({self.start}, {self.end})"
 
-    def calc_label(self) -> int:
-        return combine_labels(
-            self.class_label,
-            calc_label_from_hash(self.start),
-            calc_label_from_hash(self.end),
-        )
-
     def do_draw(self, data: ConjectureData) -> int:
         # For bounded integers, make the bounds and near-bounds more likely.
         weights = None
@@ -189,15 +181,6 @@ def __repr__(self) -> str:
             f"{self.allow_nan=}, {self.smallest_nonzero_magnitude=})"
         ).replace("self.", "")
 
-    def calc_label(self) -> int:
-        return combine_labels(
-            self.class_label,
-            calc_label_from_hash(self.min_value),
-            calc_label_from_hash(self.max_value),
-            calc_label_from_hash(self.allow_nan),
-            calc_label_from_hash(self.smallest_nonzero_magnitude),
-        )
-
     def do_draw(self, data: ConjectureData) -> float:
         return data.draw_float(
             min_value=self.min_value,

hypothesis-python/tests/cover/test_direct_strategies.py

@@ -589,14 +589,23 @@ def test_builds_error_messages(data):
 @pytest.mark.parametrize(
     "strat_a,strat_b",
     [
-        (st.integers(), st.integers(0)),
+        pytest.param(
+            st.integers(),
+            st.integers(0),
+            marks=pytest.mark.xfail(
+                # this is the exception raised by failed pytest.warns(),
+                # ref https://github.com/pytest-dev/pytest/issues/8928
+                raises=pytest.fail.Exception,
+                strict=True,
+                reason="constraints not checked",
+            ),
+        ),
         (st.builds(int), st.builds(float)),
         (st.none(), st.integers()),
         (
             st.composite(lambda draw: draw(st.none()))(),
             st.composite(lambda draw: draw(st.integers()))(),
         ),
-        (st.builds(int, st.integers()), st.builds(int, st.integers(0))),
     ],
 )
 def test_incompatible_shared_strategies_warns(strat_a, strat_b):