return_value and not_a_test_method health checks strict error fix

AUTHORS.rst

@@ -134,6 +134,7 @@ their individual contributions.
 * `Phillip Schanely <https://github.com/pschanely>`_ (pschanely@gmail.com)
 * `Pierre-Jean Campigotto <https://github.com/PJCampi>`_
 * `Przemek Konopko <https://github.com/soutys>`_
+* `Reagan Lee <https://github.com/reaganjlee>`_
 * `Richard Boulton <https://www.github.com/rboulton>`_ (richard@tartarus.org)
 * `Richard Scholtens <https://github.com/richardscholtens>`_ (richardscholtens2@gmail.com)
 * `Robert Howlett <https://github.com/jebob>`_

hypothesis-python/RELEASE.rst

@@ -0,0 +1,7 @@
+RELEASE_TYPE: minor
+
+This release turns ``HealthCheck.return_value`` and ``HealthCheck.not_a_test_method``
+into unconditional errors.  Passing them to ``suppress_health_check=`` is therefore a deprecated no-op.
+(:issue:`3568`).  Thanks to Reagan Lee for the patch!
+
+Separately, GraalPy can now run and pass most of the hypothesis test suite (:issue:`3587`).

hypothesis-python/docs/healthchecks.rst

@@ -9,7 +9,7 @@ If this is expected, e.g. when generating large arrays or dataframes, you can se
 disable them with the :obj:`~hypothesis.settings.suppress_health_check` setting.
 The argument for this parameter is a list with elements drawn from any of
 the class-level attributes of the HealthCheck class.
-Using a value of ``HealthCheck.all()`` will disable all health checks.
+Using a value of ``list(HealthCheck)`` will disable all health checks.
 
 .. autoclass:: hypothesis.HealthCheck
    :undoc-members:

hypothesis-python/scripts/basic-test.sh

@@ -45,7 +45,7 @@ pip install "$(grep 'lark==' ../requirements/coverage.txt)"
 $PYTEST tests/lark/
 pip uninstall -y lark
 
-if [ "$(python -c $'import platform, sys; print(sys.version_info.releaselevel == \'final\' and platform.python_implementation() != "PyPy")')" = "True" ] ; then
+if [ "$(python -c $'import platform, sys; print(sys.version_info.releaselevel == \'final\' and platform.python_implementation() not in ("PyPy", "GraalVM"))')" = "True" ] ; then
   pip install ".[codemods,cli]"
   $PYTEST tests/codemods/
   pip uninstall -y libcst click
@@ -75,16 +75,19 @@ PYTHONOPTIMIZE=2 $PYTEST \
     -W'ignore:Module already imported so cannot be rewritten:pytest.PytestAssertRewriteWarning' \
     tests/cover/test_testdecorators.py
 
-if [ "$(python -c 'import platform; print(platform.python_implementation())')" != "PyPy" ]; then
-  pip install .[django]
-  HYPOTHESIS_DJANGO_USETZ=TRUE python -m tests.django.manage test tests.django
-  HYPOTHESIS_DJANGO_USETZ=FALSE python -m tests.django.manage test tests.django
-  pip uninstall -y django pytz
+case "$(python -c 'import platform; print(platform.python_implementation())')" in
+  PyPy|GraalVM)
+    ;;
+  *)
+    pip install .[django]
+    HYPOTHESIS_DJANGO_USETZ=TRUE python -m tests.django.manage test tests.django
+    HYPOTHESIS_DJANGO_USETZ=FALSE python -m tests.django.manage test tests.django
+    pip uninstall -y django pytz
 
-  pip install "$(grep 'numpy==' ../requirements/coverage.txt)"
-  $PYTEST tests/array_api
-  $PYTEST tests/numpy
+    pip install "$(grep 'numpy==' ../requirements/coverage.txt)"
+    $PYTEST tests/array_api
+    $PYTEST tests/numpy
 
-  pip install "$(grep 'pandas==' ../requirements/coverage.txt)"
-  $PYTEST tests/pandas
-fi
+    pip install "$(grep 'pandas==' ../requirements/coverage.txt)"
+    $PYTEST tests/pandas
+esac

hypothesis-python/scripts/other-tests.sh

@@ -43,7 +43,7 @@ pip install "$(grep 'lark==' ../requirements/coverage.txt)"
 $PYTEST tests/lark/
 pip uninstall -y lark
 
-if [ "$(python -c $'import platform, sys; print(sys.version_info.releaselevel == \'final\' and platform.python_implementation() != "PyPy")')" = "True" ] ; then
+if [ "$(python -c $'import platform, sys; print(sys.version_info.releaselevel == \'final\' and platform.python_implementation() not in ("PyPy", "GraalVM"))')" = "True" ] ; then
   pip install ".[codemods,cli]"
   $PYTEST tests/codemods/
   pip uninstall -y libcst click
@@ -55,10 +55,13 @@ if [ "$(python -c $'import platform, sys; print(sys.version_info.releaselevel ==
     pip install "$(grep 'numpy==' ../requirements/coverage.txt)"
   fi
 
-  if [ "$(python -c 'import platform; print(platform.python_implementation())')" != "PyPy" ]; then\
-    $PYTEST tests/array_api
-    $PYTEST tests/numpy
-  fi
+  case "$(python -c 'import platform; print(platform.python_implementation())')" in
+    PyPy|GraalVM)
+      ;;
+    *)
+      $PYTEST tests/array_api
+      $PYTEST tests/numpy
+  esac
 
   pip install "$(grep 'black==' ../requirements/coverage.txt)"
   $PYTEST tests/ghostwriter/

hypothesis-python/src/hypothesis/_settings.py

@@ -19,7 +19,7 @@
 import inspect
 import os
 import warnings
-from enum import Enum, IntEnum, unique
+from enum import Enum, EnumMeta, IntEnum, unique
 from typing import TYPE_CHECKING, Any, Collection, Dict, List, Optional, TypeVar, Union
 
 import attr
@@ -445,8 +445,14 @@ def __repr__(self):
         return f"Phase.{self.name}"
 
 
+class HealthCheckMeta(EnumMeta):
+    def __iter__(self):
+        deprecated = (HealthCheck.return_value, HealthCheck.not_a_test_method)
+        return iter(x for x in super().__iter__() if x not in deprecated)
+
+
 @unique
-class HealthCheck(Enum):
+class HealthCheck(Enum, metaclass=HealthCheckMeta):
     """Arguments for :attr:`~hypothesis.settings.suppress_health_check`.
 
     Each member of this enum is a type of health check to suppress.
@@ -457,6 +463,8 @@ def __repr__(self):
 
     @classmethod
     def all(cls) -> List["HealthCheck"]:
+        # Skipping of deprecated attributes is handled in HealthCheckMeta.__iter__
+        # TODO: note_deprecation() and write a codemod for HC.all() -> list(HC)
         return list(HealthCheck)
 
     data_too_large = 1
@@ -479,15 +487,14 @@ def all(cls) -> List["HealthCheck"]:
     testing."""
 
     return_value = 5
-    """Checks if your tests return a non-None value (which will be ignored and
-    is unlikely to do what you want)."""
+    """Deprecated; we always error if a test returns a non-None value."""
 
     large_base_example = 7
     """Checks if the natural example to shrink towards is very large."""
 
     not_a_test_method = 8
-    """Checks if :func:`@given <hypothesis.given>` has been applied to a
-    method defined by :class:`python:unittest.TestCase` (i.e. not a test)."""
+    """Deprecated; we always error if :func:`@given <hypothesis.given>` is applied
+    to a method defined by :class:`python:unittest.TestCase` (i.e. not a test)."""
 
     function_scoped_fixture = 9
     """Checks if :func:`@given <hypothesis.given>` has been applied to a test
@@ -585,6 +592,12 @@ def validate_health_check_suppressions(suppressions):
                 f"Non-HealthCheck value {s!r} of type {type(s).__name__} "
                 "is invalid in suppress_health_check."
             )
+        if s in (HealthCheck.return_value, HealthCheck.not_a_test_method):
+            note_deprecation(
+                f"The {s.name} health check is deprecated, because this is always an error.",
+                since="RELEASEDAY",
+                has_codemod=False,
+            )
     return suppressions
 
 
@@ -673,7 +686,7 @@ def is_in_ci() -> bool:
 def note_deprecation(message: str, *, since: str, has_codemod: bool) -> None:
     if since != "RELEASEDAY":
         date = datetime.datetime.strptime(since, "%Y-%m-%d").date()
-        assert datetime.date(2016, 1, 1) <= date
+        assert datetime.date(2021, 1, 1) <= date
     if has_codemod:
         message += (
             "\n    The `hypothesis codemod` command-line tool can automatically "

hypothesis-python/src/hypothesis/core.py

@@ -1495,7 +1495,7 @@ def find(
     if settings is None:
         settings = Settings(max_examples=2000)
     settings = Settings(
-        settings, suppress_health_check=HealthCheck.all(), report_multiple_bugs=False
+        settings, suppress_health_check=list(HealthCheck), report_multiple_bugs=False
     )
 
     if database_key is None and settings.database is not None:

hypothesis-python/src/hypothesis/internal/compat.py

@@ -94,6 +94,7 @@ def get_origin(tp: Any) -> typing.Optional[Any]:  # pragma: no cover
             Concatenate, ParamSpec = None, None
 
 PYPY = platform.python_implementation() == "PyPy"
+GRAALPY = platform.python_implementation() == "GraalVM"
 WINDOWS = platform.system() == "Windows"
 
 

hypothesis-python/src/hypothesis/internal/conjecture/shrinking/dfas.py

@@ -261,7 +261,7 @@ def normalize(
 
     runner = ConjectureRunner(
         test_function,
-        settings=settings(database=None, suppress_health_check=HealthCheck.all()),
+        settings=settings(database=None, suppress_health_check=list(HealthCheck)),
         ignore_limits=True,
         random=random,
     )

hypothesis-python/src/hypothesis/internal/entropy.py

@@ -19,7 +19,7 @@
 
 import hypothesis.core
 from hypothesis.errors import HypothesisWarning, InvalidArgument
-from hypothesis.internal.compat import PYPY
+from hypothesis.internal.compat import GRAALPY, PYPY
 
 if TYPE_CHECKING:
     if sys.version_info >= (3, 8):
@@ -59,7 +59,7 @@ def __init__(self):
 NP_RANDOM = None
 
 
-if not PYPY:
+if not (PYPY or GRAALPY):
 
     def _get_platform_base_refcount(r: Any) -> int:
         return sys.getrefcount(r)
@@ -68,7 +68,7 @@ def _get_platform_base_refcount(r: Any) -> int:
     # the given platform / version of Python.
     _PLATFORM_REF_COUNT = _get_platform_base_refcount(object())
 else:  # pragma: no cover
-    # PYPY doesn't have `sys.getrefcount`
+    # PYPY and GRAALPY don't have `sys.getrefcount`
     _PLATFORM_REF_COUNT = -1
 
 
@@ -118,8 +118,8 @@ def my_WORKING_hook():
     if r in RANDOMS_TO_MANAGE.values():
         return
 
-    if not PYPY:  # pragma: no branch
-        # PYPY does not have `sys.getrefcount`
+    if not (PYPY or GRAALPY):  # pragma: no branch
+        # PYPY and GRAALPY do not have `sys.getrefcount`
         gc.collect()
         if not gc.get_referrers(r):
             if sys.getrefcount(r) <= _PLATFORM_REF_COUNT:

hypothesis-python/src/hypothesis/stateful.py

@@ -100,7 +100,7 @@ def run_state_machine_as_test(state_machine_factory, *, settings=None, _min_step
             settings = state_machine_factory.TestCase.settings
             check_type(Settings, settings, "state_machine_factory.TestCase.settings")
         except AttributeError:
-            settings = Settings(deadline=None, suppress_health_check=HealthCheck.all())
+            settings = Settings(deadline=None, suppress_health_check=list(HealthCheck))
     check_type(Settings, settings, "settings")
     check_type(int, _min_steps, "_min_steps")
     if _min_steps < 0:
@@ -390,7 +390,7 @@ def teardown(self):
     @lru_cache()
     def _to_test_case(cls):
         class StateMachineTestCase(TestCase):
-            settings = Settings(deadline=None, suppress_health_check=HealthCheck.all())
+            settings = Settings(deadline=None, suppress_health_check=list(HealthCheck))
 
             def runTest(self):
                 run_state_machine_as_test(cls)

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

@@ -329,7 +329,7 @@ def example(self) -> Ex:
             deadline=None,
             verbosity=Verbosity.quiet,
             phases=(Phase.generate,),
-            suppress_health_check=HealthCheck.all(),
+            suppress_health_check=list(HealthCheck),
         )
         def example_generating_inner_function(ex):
             self.__examples.append(ex)

hypothesis-python/tests/common/debug.py

@@ -50,7 +50,7 @@ def wrapped_condition(x):
     @given(definition)
     @Settings(
         parent=settings,
-        suppress_health_check=HealthCheck.all(),
+        suppress_health_check=list(HealthCheck),
         report_multiple_bugs=False,
         derandomize=True,
         database=None,

hypothesis-python/tests/conjecture/common.py

@@ -21,7 +21,7 @@
 
 
 TEST_SETTINGS = settings(
-    max_examples=5000, database=None, suppress_health_check=HealthCheck.all()
+    max_examples=5000, database=None, suppress_health_check=list(HealthCheck)
 )
 
 
@@ -56,7 +56,7 @@ def accept(f):
                 settings=settings(
                     max_examples=5000,
                     database=None,
-                    suppress_health_check=HealthCheck.all(),
+                    suppress_health_check=list(HealthCheck),
                 ),
             )
             runner.cached_test_function(start)

hypothesis-python/tests/conjecture/test_data_tree.py

@@ -19,7 +19,7 @@
 from hypothesis.internal.conjecture.engine import ConjectureRunner
 
 TEST_SETTINGS = settings(
-    max_examples=5000, database=None, suppress_health_check=HealthCheck.all()
+    max_examples=5000, database=None, suppress_health_check=list(HealthCheck)
 )
 
 

hypothesis-python/tests/conjecture/test_engine.py

@@ -483,7 +483,7 @@ def f(data):
         settings=settings(
             max_examples=5000,
             database=None,
-            suppress_health_check=HealthCheck.all(),
+            suppress_health_check=list(HealthCheck),
             verbosity=Verbosity.debug,
         ),
     )
@@ -722,7 +722,7 @@ def f(data):
     runner = ConjectureRunner(
         f,
         settings=settings(
-            max_examples=1, database=database, suppress_health_check=HealthCheck.all()
+            max_examples=1, database=database, suppress_health_check=list(HealthCheck)
         ),
         database_key=key,
     )
@@ -755,7 +755,7 @@ def f(data):
     runner = ConjectureRunner(
         f,
         settings=settings(
-            max_examples=1, database=database, suppress_health_check=HealthCheck.all()
+            max_examples=1, database=database, suppress_health_check=list(HealthCheck)
         ),
         database_key=key,
     )
@@ -789,7 +789,7 @@ def f(data):
     runner = ConjectureRunner(
         f,
         settings=settings(
-            max_examples=1, database=None, suppress_health_check=HealthCheck.all()
+            max_examples=1, database=None, suppress_health_check=list(HealthCheck)
         ),
     )
 
@@ -1220,7 +1220,7 @@ def test(data):
             settings=settings(
                 max_examples=5000,
                 database=InMemoryExampleDatabase(),
-                suppress_health_check=HealthCheck.all(),
+                suppress_health_check=list(HealthCheck),
             ),
             database_key=b"stuff",
         )
@@ -1241,7 +1241,7 @@ def test(data):
             settings=settings(
                 max_examples=5000,
                 database=InMemoryExampleDatabase(),
-                suppress_health_check=HealthCheck.all(),
+                suppress_health_check=list(HealthCheck),
             ),
             database_key=b"stuff",
         )
@@ -1262,7 +1262,7 @@ def test(data):
             settings=settings(
                 max_examples=5000,
                 database=InMemoryExampleDatabase(),
-                suppress_health_check=HealthCheck.all(),
+                suppress_health_check=list(HealthCheck),
             ),
             database_key=b"stuff",
         )
@@ -1285,7 +1285,7 @@ def test(data):
         runner = ConjectureRunner(
             test,
             settings=settings(
-                max_examples=500, database=db, suppress_health_check=HealthCheck.all()
+                max_examples=500, database=db, suppress_health_check=list(HealthCheck)
             ),
             database_key=b"stuff",
         )
@@ -1326,7 +1326,7 @@ def test(data):
             settings=settings(
                 max_examples=10000,
                 database=db,
-                suppress_health_check=HealthCheck.all(),
+                suppress_health_check=list(HealthCheck),
                 phases=[Phase.reuse],
             ),
             database_key=b"stuff",