Merge pull request #4564 from jorenham/@overload-decorators

Remove redundant decorators on individual `@overload`s

Author: Liam-DeVoe

hypothesis-python/RELEASE.rst

@@ -0,0 +1,3 @@
+RELEASE_TYPE: patch
+
+Clean up internal ``@overload`` type annotations.

hypothesis-python/src/hypothesis/extra/numpy.py

@@ -419,7 +419,6 @@ def fill_for(elements, unique, fill, name=""):
 
 
 @overload
-@defines_strategy(force_reusable_values=True)
 def arrays(
     dtype: Union["np.dtype[G]", st.SearchStrategy["np.dtype[G]"]],
     shape: Union[int, st.SearchStrategy[int], Shape, st.SearchStrategy[Shape]],
@@ -431,7 +430,6 @@ def arrays(
 
 
 @overload
-@defines_strategy(force_reusable_values=True)
 def arrays(
     dtype: Union[D, st.SearchStrategy[D]],
     shape: Union[int, st.SearchStrategy[int], Shape, st.SearchStrategy[Shape]],
@@ -625,7 +623,6 @@ def dtype_factory(kind, sizes, valid_sizes, endianness):
 
 
 @overload
-@defines_dtype_strategy
 def unsigned_integer_dtypes(
     *,
     endianness: str = "?",
@@ -634,7 +631,6 @@ def unsigned_integer_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def unsigned_integer_dtypes(
     *,
     endianness: str = "?",
@@ -643,7 +639,6 @@ def unsigned_integer_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def unsigned_integer_dtypes(
     *,
     endianness: str = "?",
@@ -652,7 +647,6 @@ def unsigned_integer_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def unsigned_integer_dtypes(
     *,
     endianness: str = "?",
@@ -661,7 +655,6 @@ def unsigned_integer_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def unsigned_integer_dtypes(
     *,
     endianness: str = "?",
@@ -693,7 +686,6 @@ def unsigned_integer_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def integer_dtypes(
     *,
     endianness: str = "?",
@@ -702,7 +694,6 @@ def integer_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def integer_dtypes(
     *,
     endianness: str = "?",
@@ -711,7 +702,6 @@ def integer_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def integer_dtypes(
     *,
     endianness: str = "?",
@@ -720,7 +710,6 @@ def integer_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def integer_dtypes(
     *,
     endianness: str = "?",
@@ -729,7 +718,6 @@ def integer_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def integer_dtypes(
     *,
     endianness: str = "?",
@@ -757,7 +745,6 @@ def integer_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def floating_dtypes(
     *,
     endianness: str = "?",
@@ -766,7 +753,6 @@ def floating_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def floating_dtypes(
     *,
     endianness: str = "?",
@@ -775,7 +761,6 @@ def floating_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def floating_dtypes(
     *,
     endianness: str = "?",
@@ -784,7 +769,6 @@ def floating_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def floating_dtypes(
     *,
     endianness: str = "?",
@@ -793,7 +777,6 @@ def floating_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def floating_dtypes(
     *,
     endianness: str = "?",
@@ -822,7 +805,6 @@ def floating_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def complex_number_dtypes(
     *,
     endianness: str = "?",
@@ -831,7 +813,6 @@ def complex_number_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def complex_number_dtypes(
     *,
     endianness: str = "?",
@@ -840,7 +821,6 @@ def complex_number_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def complex_number_dtypes(
     *,
     endianness: str = "?",
@@ -849,7 +829,6 @@ def complex_number_dtypes(
 
 
 @overload
-@defines_dtype_strategy
 def complex_number_dtypes(
     *,
     endianness: str = "?",
@@ -1175,7 +1154,6 @@ def basic_indices(
 
 
 @overload
-@defines_strategy()
 def integer_array_indices(
     shape: Shape,
     *,
@@ -1184,7 +1162,6 @@ def integer_array_indices(
 
 
 @overload
-@defines_strategy()
 def integer_array_indices(
     shape: Shape,
     *,

hypothesis-python/tests/watchdog/test_database.py

@@ -119,17 +119,25 @@ def test_database_listener_directory_explicit(tmp_path):
     def listener(event):
         events.append(event)
 
+    time_sleep(0.1)
     db.add_listener(listener)
+    time_sleep(0.1)
 
     db.save(b"k1", b"v1")
-    wait_for(lambda: events == [("save", (b"k1", b"v1"))], timeout=60)
+    wait_for(lambda: events == [("save", (b"k1", b"v1"))], timeout=30)
 
+    time_sleep(0.1)
     db.remove_listener(listener)
+    time_sleep(0.1)
+
     db.delete(b"k1", b"v1")
     db.save(b"k1", b"v2")
-    wait_for(lambda: events == [("save", (b"k1", b"v1"))], timeout=60)
+    wait_for(lambda: events == [("save", (b"k1", b"v1"))], timeout=30)
 
+    time_sleep(0.1)
     db.add_listener(listener)
+    time_sleep(0.1)
+
     db.delete(b"k1", b"v2")
     db.save(b"k1", b"v3")
     wait_for(

tooling/src/hypothesistooling/__main__.py

@@ -265,7 +265,31 @@ def check_format():
                 print(f"{f} has incorrect start {start!r}", file=sys.stderr)
                 bad = True
     assert not bad
-    check_not_changed()
+    try:
+        check_not_changed()
+    except Exception:
+        box_width = 50
+        inner_width = box_width - 2
+        content_width = inner_width - 2
+        msg1 = "Note: code differed after formatting."
+        msg2 = "To fix this, run:"
+        msg3 = "    ./build.sh format"
+
+        lines = [
+            "",
+            "    " + "*" * box_width,
+            "    *" + " " * inner_width + "*",
+            "    *  " + msg1 + " " * (content_width - len(msg1)) + "*",
+            "    *" + " " * inner_width + "*",
+            "    *  " + msg2 + " " * (content_width - len(msg2)) + "*",
+            "    *" + " " * inner_width + "*",
+            "    *  " + msg3 + " " * (content_width - len(msg3)) + "*",
+            "    *" + " " * inner_width + "*",
+            "    " + "*" * box_width,
+            "",
+        ]
+        print("\n".join(lines), file=sys.stderr)
+        raise
 
 
 def check_not_changed():