Formatting and cache busting

Author: jobh

hypothesis-python/setup.py

@@ -124,7 +124,11 @@ def local_file(name):
         "Topic :: Software Development :: Testing",
         "Typing :: Typed",
     ],
-    py_modules=["_hypothesis_pytestplugin", "_hypothesis_ftz_detector", "_hypothesis_globals"],
+    py_modules=[
+        "_hypothesis_pytestplugin",
+        "_hypothesis_ftz_detector",
+        "_hypothesis_globals",
+    ],
     entry_points={
         "pytest11": ["hypothesispytest = _hypothesis_pytestplugin"],
         "console_scripts": ["hypothesis = hypothesis.extra.cli:main"],

hypothesis-python/src/_hypothesis_globals.py

@@ -15,7 +15,6 @@
 
 import os
 
-
 in_initialization = 1
 """If nonzero, indicates that hypothesis is still initializing (importing or loading
 the test environment). `import hypothesis` will cause this number to be decremented,

hypothesis-python/src/_hypothesis_pytestplugin.py

@@ -26,9 +26,8 @@
 import warnings
 from inspect import signature
 
-import pytest
-
 import _hypothesis_globals
+import pytest
 
 try:
     from _pytest.junitxml import xml_key

hypothesis-python/src/hypothesis/__init__.py

@@ -16,6 +16,7 @@
 """
 
 import _hypothesis_globals
+
 from hypothesis._settings import HealthCheck, Phase, Verbosity, settings
 from hypothesis.control import (
     assume,

hypothesis-python/src/hypothesis/configuration.py

@@ -13,7 +13,7 @@
 from pathlib import Path
 
 import _hypothesis_globals
-import hypothesis
+
 from hypothesis.errors import HypothesisSideeffectWarning
 
 __hypothesis_home_directory_default = Path.cwd() / ".hypothesis"
@@ -67,7 +67,7 @@ def check_sideeffect_during_initialization(what: str, extra: str = "") -> None:
         _first_postinit_what = what
 
 
-def notice_initialization_restarted(warn: bool = True) -> None:
+def notice_initialization_restarted(*, warn: bool = True) -> None:
     """Reset _first_postinit_what, so that we don't think we're in post-init. Additionally, if it
     was set that means that there has been a sideeffect that we haven't warned about, so do that
     now (the warning text will be correct, and we also hint that the stacktrace can be improved).

hypothesis-python/src/hypothesis/database.py

@@ -495,8 +495,9 @@ def _prepare_for_io(self) -> None:
         self._initialized = True
 
     def _initialize_db(self) -> None:
+        # Trigger warning that we suppressed earlier by intent_to_write=False
+        storage_directory(self.path.name)
         # Create the cache directory if it doesn't exist
-        storage_directory(self.path.name)  # trigger warning that we suppressed earlier with intent_to_write=False
         self.path.mkdir(exist_ok=True, parents=True)
 
         # Get all artifacts

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

@@ -8,13 +8,11 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at https://mozilla.org/MPL/2.0/.
 
-import warnings
 from inspect import signature
 from typing import MutableMapping
 from weakref import WeakKeyDictionary
 
 from hypothesis.configuration import check_sideeffect_during_initialization
-from hypothesis.errors import HypothesisSideeffectWarning
 from hypothesis.internal.reflection import (
     convert_keyword_arguments,
     convert_positional_arguments,

hypothesis-python/tests/cover/test_sideeffect_warnings.py

@@ -8,15 +8,11 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at https://mozilla.org/MPL/2.0/.
 
-from pathlib import Path
-import warnings
-
+import _hypothesis_globals
 import pytest
 
-import _hypothesis_globals
-from hypothesis import configuration as fs
+from hypothesis import configuration as fs, strategies as st
 from hypothesis.errors import HypothesisSideeffectWarning
-from hypothesis import strategies as st
 
 IN_INITIALIZATION_ATTR = "in_initialization"
 
@@ -30,7 +26,7 @@
 
 
 @pytest.fixture
-def extend_initialization(monkeypatch):
+def _extend_initialization(monkeypatch):
     assert getattr(_hypothesis_globals, IN_INITIALIZATION_ATTR) == 0
     monkeypatch.setattr(_hypothesis_globals, IN_INITIALIZATION_ATTR, 1)
     fs.notice_initialization_restarted(warn=False)
@@ -40,19 +36,19 @@ def extend_initialization(monkeypatch):
 @pytest.mark.parametrize(
     "sideeffect, warning_text",
     [
-        (lambda: st.integers().wrapped_strategy, "lazy evaluation"),
+        (lambda: st.builds(lambda: None).wrapped_strategy, "lazy evaluation"),  # guaranteed not cached
         (lambda: st.deferred(st.integers).wrapped_strategy, "deferred evaluation"),
         (fs.storage_directory, "accessing storage"),
     ],
 )
-def test_sideeffect_warning(sideeffect, warning_text, extend_initialization):
+def test_sideeffect_warning(sideeffect, warning_text, _extend_initialization):
     with pytest.warns(HypothesisSideeffectWarning, match=warning_text):
         sideeffect()
 
 
-def test_sideeffect_delayed_warning(monkeypatch, extend_initialization):
+def test_sideeffect_delayed_warning(monkeypatch, _extend_initialization):
     what = "synthetic side-effect"
-    # extend_initialization ensures we start at known clean slate (no delayed warnings).
+    # _extend_initialization ensures we start at known clean slate (no delayed warnings).
     # Then: stop initialization, check a side-effect operation, and restart it.
     monkeypatch.setattr(_hypothesis_globals, IN_INITIALIZATION_ATTR, 0)
     fs.check_sideeffect_during_initialization(what)