return_value and not_a_test_method health checks strict error fix

hypothesis-python/docs/changes.rst

@@ -1735,7 +1735,7 @@ in the `Array API standard <https://data-apis.org/>`__ (see :pull:`3065`).
 This release makes :doc:`stateful testing <stateful>` more likely to tell you
 if you do something unexpected and unsupported:
 
-- The :obj:`~hypothesis.HealthCheck.return_value` health check now applies to
+- The ``hypothesis.HealthCheck.return_value`` health check now applies to
   :func:`~hypothesis.stateful.rule` and :func:`~hypothesis.stateful.initialize`
   rules, if they don't have ``target`` bundles, as well as
   :func:`~hypothesis.stateful.invariant`.
@@ -1833,7 +1833,7 @@ Thanks to Ruben Opdebeeck for this contribution!
 This release emits a more useful error message when :func:`@given() <hypothesis.given>`
 is applied to a coroutine function, i.e. one defined using ``async def`` (:issue:`3054`).
 
-This was previously only handled by the generic :obj:`~hypothesis.HealthCheck.return_value`
+This was previously only handled by the generic ``hypothesis.HealthCheck.return_value``
 health check, which doesn't direct you to use either :ref:`a custom executor <custom-function-execution>`
 or a library such as :pypi:`pytest-trio` or :pypi:`pytest-asyncio` to handle it for you.
 
@@ -8981,7 +8981,7 @@ with the standard library :mod:`python:unittest` module:
 
 - Applying :func:`@given <hypothesis.given>` to a non-test method which is
   overridden from :class:`python:unittest.TestCase`, such as ``setUp``,
-  raises :attr:`a new health check <hypothesis.HealthCheck.not_a_test_method>`.
+  raises a new health check ``<hypothesis.HealthCheck.not_a_test_method>``.
   (:issue:`991`)
 - Using :meth:`~python:unittest.TestCase.subTest` within a test decorated
   with :func:`@given <hypothesis.given>` would leak intermediate results

hypothesis-python/docs/healthchecks.rst

@@ -14,7 +14,7 @@ Using a value of ``HealthCheck.all()`` will disable all health checks.
 .. autoclass:: hypothesis.HealthCheck
    :undoc-members:
    :inherited-members:
-   :exclude-members: all
+   :exclude-members: all, return_value, not_a_test_method
 
 
 .. _deprecation-policy:

hypothesis-python/src/hypothesis/_settings.py

@@ -457,7 +457,17 @@ def __repr__(self):
 
     @classmethod
     def all(cls) -> List["HealthCheck"]:
-        return list(HealthCheck)
+        attributes = list(HealthCheck)
+        strict_errors = [HealthCheck.return_value, HealthCheck.not_a_test_method]
+
+        for strict_error in strict_errors: 
+            attributes.remove(strict_error)
+
+        return attributes
+
+    # @classmethod
+    # def __iter__(cls) -> Iterator["HealthCheck"]:
+    #     return iter(cls.all())
 
     data_too_large = 1
     """Checks if too many examples are aborted for being too large.
@@ -479,14 +489,18 @@ def all(cls) -> List["HealthCheck"]:
     testing."""
 
     return_value = 5
-    """Checks if your tests return a non-None value (which will be ignored and
+    """Deprecated, now a strict error.
+
+    Checks if your tests return a non-None value (which will be ignored and
     is unlikely to do what you want)."""
 
     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
+    """Deprecated, now a strict error.
+
+    Checks if :func:`@given <hypothesis.given>` has been applied to a
     method defined by :class:`python:unittest.TestCase` (i.e. not a test)."""
 
     function_scoped_fixture = 9

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

@@ -9,14 +9,16 @@
 # obtain one at https://mozilla.org/MPL/2.0/.
 
 from hypothesis.errors import FailedHealthCheck
-
+from hypothesis._settings import HealthCheck, note_deprecation
 
 def fail_health_check(settings, message, label):
     # Tell pytest to omit the body of this function from tracebacks
     # https://docs.pytest.org/en/latest/example/simple.html#writing-well-integrated-assertion-helpers
     __tracebackhide__ = True
 
-    if label in settings.suppress_health_check:
+    if label in [HealthCheck.return_value, HealthCheck.not_a_test_method]: 
+        note_deprecation("The return_value and not_a_test_method health checks are deprecated, and are now strict errors.", since="2023-02-13", has_codemod=False)
+    elif label in settings.suppress_health_check: # Put if the label == (the two words I'm looking out for)
         return
     message += (
         "\nSee https://hypothesis.readthedocs.io/en/latest/health"