Merge branch 'master' into enable-ellipses

Author: Zac-HD

hypothesis-python/docs/changes.rst

@@ -18,6 +18,74 @@ Hypothesis 6.x
 
     .. include:: ../RELEASE.rst
 
+.. _v6.40.3:
+
+-------------------
+6.40.3 - 2022-04-01
+-------------------
+
+This patch simplifies the repr of the strategies namespace returned in
+:func:`~hypothesis.extra.array_api.make_strategies_namespace`, e.g.
+
+.. code-block:: pycon
+
+    >>> from hypothesis.extra.array_api import make_strategies_namespace
+    >>> from numpy import array_api as xp
+    >>> xps = make_strategies_namespace(xp)
+    >>> xps
+    make_strategies_namespace(numpy.array_api)
+
+.. _v6.40.2:
+
+-------------------
+6.40.2 - 2022-04-01
+-------------------
+
+Fixed :func:`~hypothesis.strategies.from_type` support for
+:pep:`604` union types, like ``int | None`` (:issue:`3255`).
+
+.. _v6.40.1:
+
+-------------------
+6.40.1 - 2022-04-01
+-------------------
+
+Fixed an internal error when ``given()`` was passed a lambda.
+
+.. _v6.40.0:
+
+-------------------
+6.40.0 - 2022-03-29
+-------------------
+
+:doc:`The Ghostwriter <ghostwriter>` can now write tests which check that
+two or more functions are equivalent on valid inputs, *or* raise the same
+type of exception for invalid inputs (:issue:`3267`).
+
+.. _v6.39.6:
+
+-------------------
+6.39.6 - 2022-03-27
+-------------------
+
+This patch makes some quality-of-life improvements to the
+:doc:`Ghostwriter <ghostwriter>`: we guess the :func:`~hypothesis.strategies.text`
+strategy for arguments named ``text`` (...obvious in hindsight, eh?);
+and improved the error message if you accidentally left in a
+:func:`~hypothesis.strategies.nothing` or broke your :pypi:`rich` install.
+
+.. _v6.39.5:
+
+-------------------
+6.39.5 - 2022-03-26
+-------------------
+
+This patch improves our error detection and message when Hypothesis is run
+on a Python implementation without support for ``-0.0``, which is required
+for the :func:`~hypothesis.strategies.floats` strategy but can be disabled by
+`unsafe compiler options <https://simonbyrne.github.io/notes/fastmath/>`__
+(:issue:`3265`).
+
 .. _v6.39.4:
 
 -------------------

hypothesis-python/setup.py

@@ -96,7 +96,7 @@ def local_file(name):
         "Documentation": "https://hypothesis.readthedocs.io",
         "Issues": "https://github.com/HypothesisWorks/hypothesis/issues",
     },
-    license="MPL v2",
+    license="MPL-2.0",
     description="A library for property-based testing",
     zip_safe=False,
     extras_require=extras,

hypothesis-python/src/hypothesis/core.py

@@ -101,6 +101,7 @@
 )
 from hypothesis.statistics import describe_targets, note_statistics
 from hypothesis.strategies._internal.collections import TupleStrategy
+from hypothesis.strategies._internal.misc import NOTHING
 from hypothesis.strategies._internal.strategies import (
     Ex,
     MappedSearchStrategy,
@@ -249,9 +250,9 @@ def is_invalid_test(test, original_argspec, given_arguments, given_kwargs):
     only be reported for tests that actually ran.
     """
 
-    def invalid(message):
+    def invalid(message, *, exc=InvalidArgument):
         def wrapped_test(*arguments, **kwargs):
-            raise InvalidArgument(message)
+            raise exc(message)
 
         wrapped_test.is_hypothesis_test = True
         wrapped_test.hypothesis = HypothesisHandle(
@@ -310,6 +311,18 @@ def wrapped_test(*arguments, **kwargs):
             )
         )
 
+    # This case would raise Unsatisfiable *anyway*, but by detecting it here we can
+    # provide a much more helpful error message for people e.g. using the Ghostwriter.
+    empty = [
+        f"{s!r} (arg {idx})" for idx, s in enumerate(given_arguments) if s is NOTHING
+    ] + [f"{name}={s!r}" for name, s in given_kwargs.items() if s is NOTHING]
+    if empty:
+        strats = "strategies" if len(empty) > 1 else "strategy"
+        return invalid(
+            f"Cannot generate examples from empty {strats}: " + ", ".join(empty),
+            exc=Unsatisfiable,
+        )
+
 
 class ArtificialDataForExample(ConjectureData):
     """Dummy object that pretends to be a ConjectureData object for the purposes of

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

@@ -863,7 +863,11 @@ def floating_dtypes(
     unsigned_integer_dtypes.__doc__ = _unsigned_integer_dtypes.__doc__
     floating_dtypes.__doc__ = _floating_dtypes.__doc__
 
-    return SimpleNamespace(
+    class PrettySimpleNamespace(SimpleNamespace):
+        def __repr__(self):
+            return f"make_strategies_namespace({xp.__name__})"
+
+    return PrettySimpleNamespace(
         from_dtype=from_dtype,
         arrays=arrays,
         array_shapes=array_shapes,

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

@@ -182,8 +182,24 @@ def codemod(path):
         flag_value="equivalent",
         help="very useful when optimising or refactoring code",
     )
-    @click.option("--idempotent", "writer", flag_value="idempotent")
-    @click.option("--binary-op", "writer", flag_value="binary_operation")
+    @click.option(
+        "--errors-equivalent",
+        "writer",
+        flag_value="errors-equivalent",
+        help="--equivalent, but also allows consistent errors",
+    )
+    @click.option(
+        "--idempotent",
+        "writer",
+        flag_value="idempotent",
+        help="check that f(x) == f(f(x))",
+    )
+    @click.option(
+        "--binary-op",
+        "writer",
+        flag_value="binary_operation",
+        help="associativity, commutativity, identity element",
+    )
     # Note: we deliberately omit a --ufunc flag, because the magic()
     # detection of ufuncs is both precise and complete.
     @click.option(
@@ -218,22 +234,26 @@ def write(func, writer, except_, style):  # noqa: D301  # \b disables autowrap
         # NOTE: if you want to call this function from Python, look instead at the
         # ``hypothesis.extra.ghostwriter`` module.  Click-decorated functions have
         # a different calling convention, and raise SystemExit instead of returning.
+        kwargs = {"except_": except_ or (), "style": style}
         if writer is None:
             writer = "magic"
         elif writer == "idempotent" and len(func) > 1:
             raise click.UsageError("Test functions for idempotence one at a time.")
         elif writer == "roundtrip" and len(func) == 1:
             writer = "idempotent"
-        elif writer == "equivalent" and len(func) == 1:
+        elif "equivalent" in writer and len(func) == 1:
             writer = "fuzz"
+        if writer == "errors-equivalent":
+            writer = "equivalent"
+            kwargs["allow_same_errors"] = True
 
         try:
             from hypothesis.extra import ghostwriter
         except ImportError:
             sys.stderr.write(MESSAGE.format("black"))
             sys.exit(1)
 
-        code = getattr(ghostwriter, writer)(*func, except_=except_ or (), style=style)
+        code = getattr(ghostwriter, writer)(*func, **kwargs)
         try:
             from rich.console import Console
             from rich.syntax import Syntax
@@ -242,10 +262,10 @@ def write(func, writer, except_, style):  # noqa: D301  # \b disables autowrap
         except ImportError:
             print(code)
         else:
-            code = Syntax(
-                code,
-                "python",
-                background_color="default",
-                theme="default" if guess_background_color() == "light" else "monokai",
-            )
-            Console().print(code, soft_wrap=True)
+            try:
+                theme = "default" if guess_background_color() == "light" else "monokai"
+                code = Syntax(code, "python", background_color="default", theme=theme)
+                Console().print(code, soft_wrap=True)
+            except Exception:
+                print("# Error while syntax-highlighting code", file=sys.stderr)
+                print(code)