cirq-core 1.4.0.dev20231202032139__py3-none-any.whl → 1.4.0.dev20231205193004__py3-none-any.whl

cirq/_compat_test.py

@@ -346,7 +346,7 @@ def test_wrap_module():
 
 
 def test_deprecate_attributes_assert_attributes_in_sys_modules():
-    subprocess_context(_test_deprecate_attributes_assert_attributes_in_sys_modules)()
+    run_in_subprocess(_test_deprecate_attributes_assert_attributes_in_sys_modules)
 
 
 def _test_deprecate_attributes_assert_attributes_in_sys_modules():
@@ -635,42 +635,49 @@ _repeated_child_deprecation_msg = [
 ] + _deprecation_origin
 
 
-def _trace_unhandled_exceptions(*args, queue: 'multiprocessing.Queue', func: Callable, **kwargs):
+def _trace_unhandled_exceptions(*args, queue: 'multiprocessing.Queue', func: Callable):
     try:
-        func(*args, **kwargs)
+        func(*args)
         queue.put(None)
     except BaseException as ex:
         msg = str(ex)
         queue.put((type(ex).__name__, msg, traceback.format_exc()))
 
 
-def subprocess_context(test_func):
-    """Ensures that sys.modules changes in subprocesses won't impact the parent process."""
+def run_in_subprocess(test_func, *args):
+    """Run a function in a subprocess.
+
+    This ensures that sys.modules changes in subprocesses won't impact the parent process.
+
+    Args:
+        test_func: The function to be run in a subprocess.
+        *args: Positional args to pass to the function.
+    """
+
     assert callable(test_func), (
-        "subprocess_context expects a function. Did you call the function instead of passing "
+        "run_in_subprocess expects a function. Did you call the function instead of passing "
         "it to this method?"
     )
 
-    ctx = multiprocessing.get_context('spawn' if os.name == 'nt' else 'fork')
-
-    exception = ctx.Queue()
+    # Use spawn to ensure subprocesses are isolated.
+    # See https://github.com/quantumlib/Cirq/issues/6373
+    ctx = multiprocessing.get_context('spawn')
 
-    def isolated_func(*args, **kwargs):
-        kwargs['queue'] = exception
-        kwargs['func'] = test_func
-        p = ctx.Process(target=_trace_unhandled_exceptions, args=args, kwargs=kwargs)
-        p.start()
-        p.join()
-        result = exception.get()
-        if result:  # pragma: no cover
-            ex_type, msg, ex_trace = result
-            if ex_type == "Skipped":
-                warnings.warn(f"Skipping: {ex_type}: {msg}\n{ex_trace}")
-                pytest.skip(f'{ex_type}: {msg}\n{ex_trace}')
-            else:
-                pytest.fail(f'{ex_type}: {msg}\n{ex_trace}')
+    queue = ctx.Queue()
 
-    return isolated_func
+    p = ctx.Process(
+        target=_trace_unhandled_exceptions, args=args, kwargs={'queue': queue, 'func': test_func}
+    )
+    p.start()
+    p.join()
+    result = queue.get()
+    if result:  # pragma: no cover
+        ex_type, msg, ex_trace = result
+        if ex_type == "Skipped":
+            warnings.warn(f"Skipping: {ex_type}: {msg}\n{ex_trace}")
+            pytest.skip(f'{ex_type}: {msg}\n{ex_trace}')
+        else:
+            pytest.fail(f'{ex_type}: {msg}\n{ex_trace}')
 
 
 @mock.patch.dict(os.environ, {"CIRQ_FORCE_DEDUPE_MODULE_DEPRECATION": "1"})
@@ -698,7 +705,7 @@ def subprocess_context(test_func):
     ],
 )
 def test_deprecated_module(outdated_method, deprecation_messages):
-    subprocess_context(_test_deprecated_module_inner)(outdated_method, deprecation_messages)
+    run_in_subprocess(_test_deprecated_module_inner, outdated_method, deprecation_messages)
 
 
 def _test_deprecated_module_inner(outdated_method, deprecation_messages):
@@ -736,7 +743,7 @@ def test_same_name_submodule_earlier_in_subtree():
     cirq.ops.engine.calibration packages. The wrong resolution resulted in false circular
     imports!
     """
-    subprocess_context(_test_same_name_submodule_earlier_in_subtree_inner)()
+    run_in_subprocess(_test_same_name_submodule_earlier_in_subtree_inner)
 
 
 def _test_same_name_submodule_earlier_in_subtree_inner():
@@ -748,7 +755,7 @@ def _test_same_name_submodule_earlier_in_subtree_inner():
 def test_metadata_search_path():
     # to cater for metadata path finders
     # https://docs.python.org/3/library/importlib.metadata.html#extending-the-search-algorithm
-    subprocess_context(_test_metadata_search_path_inner)()
+    run_in_subprocess(_test_metadata_search_path_inner)
 
 
 def _test_metadata_search_path_inner():  # pragma: no cover
@@ -760,7 +767,7 @@ def _test_metadata_search_path_inner():  # pragma: no cover
 
 
 def test_metadata_distributions_after_deprecated_submodule():
-    subprocess_context(_test_metadata_distributions_after_deprecated_submodule)()
+    run_in_subprocess(_test_metadata_distributions_after_deprecated_submodule)
 
 
 def _test_metadata_distributions_after_deprecated_submodule():
@@ -779,7 +786,7 @@ def _test_metadata_distributions_after_deprecated_submodule():
 
 
 def test_parent_spec_after_deprecated_submodule():
-    subprocess_context(_test_parent_spec_after_deprecated_submodule)()
+    run_in_subprocess(_test_parent_spec_after_deprecated_submodule)
 
 
 def _test_parent_spec_after_deprecated_submodule():
@@ -791,7 +798,7 @@ def _test_parent_spec_after_deprecated_submodule():
 def test_type_repr_in_new_module():
     # to cater for metadata path finders
     # https://docs.python.org/3/library/importlib.metadata.html#extending-the-search-algorithm
-    subprocess_context(_test_type_repr_in_new_module_inner)()
+    run_in_subprocess(_test_type_repr_in_new_module_inner)
 
 
 def _test_type_repr_in_new_module_inner():
@@ -849,19 +856,19 @@ def _test_broken_module_3_inner():
 
 
 def test_deprecated_module_error_handling_1():
-    subprocess_context(_test_broken_module_1_inner)()
+    run_in_subprocess(_test_broken_module_1_inner)
 
 
 def test_deprecated_module_error_handling_2():
-    subprocess_context(_test_broken_module_2_inner)()
+    run_in_subprocess(_test_broken_module_2_inner)
 
 
 def test_deprecated_module_error_handling_3():
-    subprocess_context(_test_broken_module_3_inner)()
+    run_in_subprocess(_test_broken_module_3_inner)
 
 
 def test_new_module_is_top_level():
-    subprocess_context(_test_new_module_is_top_level_inner)()
+    run_in_subprocess(_test_new_module_is_top_level_inner)
 
 
 def _test_new_module_is_top_level_inner():
@@ -877,7 +884,7 @@ def _test_new_module_is_top_level_inner():
 
 
 def test_import_deprecated_with_no_attribute():
-    subprocess_context(_test_import_deprecated_with_no_attribute_inner)()
+    run_in_subprocess(_test_import_deprecated_with_no_attribute_inner)
 
 
 def _test_import_deprecated_with_no_attribute_inner():
@@ -970,7 +977,7 @@ def test_deprecated_module_loader_repr():
 
 def test_subprocess_test_failure():
     with pytest.raises(Failed, match='ValueError.*this fails'):
-        subprocess_context(_test_subprocess_test_failure_inner)()
+        run_in_subprocess(_test_subprocess_test_failure_inner)
 
 
 def _test_subprocess_test_failure_inner():
@@ -978,7 +985,7 @@ def _test_subprocess_test_failure_inner():
 
 
 def test_dir_is_still_valid():
-    subprocess_context(_dir_is_still_valid_inner)()
+    run_in_subprocess(_dir_is_still_valid_inner)
 
 
 def _dir_is_still_valid_inner():
@@ -986,7 +993,7 @@ def _dir_is_still_valid_inner():
 
     import cirq.testing._compat_test_data as mod
 
-    for m in ['fake_a', 'info', 'module_a', 'sys']:
+    for m in ['fake_a', 'logging', 'module_a']:
         assert m in dir(mod)
 
 

cirq/_version.py

@@ -1 +1 @@
-__version__ = "1.4.0.dev20231202032139"
+__version__ = "1.4.0.dev20231205193004"

cirq/testing/_compat_test_data/__init__.py

@@ -3,11 +3,11 @@
 See cirq/_compat_test.py for the tests.
 This module contains example deprecations for modules.
 """
-import sys
-from logging import info
+import logging
+
 from cirq import _compat
 
-info("init:compat_test_data")
+logging.info("init:compat_test_data")
 
 # simulates a rename of a child module
 # fake_a -> module_a

cirq/testing/_compat_test_data/module_a/__init__.py

@@ -1,7 +1,7 @@
 # pylint: disable=wrong-or-nonexistent-copyright-notice
 """module_a for module deprecation tests"""
 
-from logging import info
+import logging
 
 from cirq.testing._compat_test_data.module_a import module_b
 
@@ -11,4 +11,4 @@ from cirq.testing._compat_test_data.module_a.types import SampleType
 
 MODULE_A_ATTRIBUTE = "module_a"
 
-info("init:module_a")
+logging.info("init:module_a")

{cirq_core-1.4.0.dev20231202032139.dist-info → cirq_core-1.4.0.dev20231205193004.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cirq-core
-Version: 1.4.0.dev20231202032139
+Version: 1.4.0.dev20231205193004
 Summary: A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits.
 Home-page: http://github.com/quantumlib/cirq
 Author: The Cirq Developers

{cirq_core-1.4.0.dev20231202032139.dist-info → cirq_core-1.4.0.dev20231205193004.dist-info}/RECORD

@@ -1,10 +1,10 @@
 cirq/__init__.py,sha256=GlOnPWDvat-Y203LsbXhkC0UnGm9HHiNx2ywz7Bkc3o,15708
 cirq/_compat.py,sha256=YPvewnC0gajEIRjauyz_EuDzs38g-bIBkY_0h91U4Pc,29363
-cirq/_compat_test.py,sha256=84X6ELsb5fv3Hc0_ly8-IQfMnCNQN6tHs6GZFrnuNyI,35005
+cirq/_compat_test.py,sha256=iQJYqIP1uyRe8mNUwi2VKccyUaJDFYH7b3Fg6cqQLQw,35053
 cirq/_doc.py,sha256=yDyWUD_2JDS0gShfGRb-rdqRt9-WeL7DhkqX7np0Nko,2879
 cirq/_import.py,sha256=p9gMHJscbtDDkfHOaulvd3Aer0pwUF5AXpL89XR8dNw,8402
 cirq/_import_test.py,sha256=6K_v0riZJXOXUphHNkGA8MY-JcmGlezFaGmvrNhm3OQ,1015
-cirq/_version.py,sha256=dUru8gdunAZIGbW_9lcfO6WcWcVev2Rb5Eo2JIbTJoc,40
+cirq/_version.py,sha256=bPusEL63Fj5s7vUPxSsbOc3T7QzxwWpnr6_TEAug_MA,40
 cirq/_version_test.py,sha256=yYS6xm5-nuBRQJa9R3n41WdvFtVyY7Lb5Q8bea3VgBI,133
 cirq/conftest.py,sha256=X7yLFL8GLhg2CjPw0hp5e_dGASfvHx1-QT03aUbhKJw,1168
 cirq/json_resolver_cache.py,sha256=S0HaPOCUIck-vNSQlS6KxnQtle6w-2dGuSxkUbJQY9Y,13168
@@ -988,8 +988,8 @@ cirq/testing/sample_circuits.py,sha256=8HTrY_RWoPHV18q7aLz6e5Fjd2Twkt9Wkc_IDBzTE
 cirq/testing/sample_circuits_test.py,sha256=IMz72CMXJeRt7Eg1rRB68hFV1v3k7OQpYUyhqmfjNpo,876
 cirq/testing/sample_gates.py,sha256=qSCZhb-A-Mwm_J81Su2sUFyEUdvqfq7Je66dsk8cFy0,3277
 cirq/testing/sample_gates_test.py,sha256=mkfYPNo4WFH6y33Vr_f9zy2Ry1oq5yYLpB__sqSCkjQ,2377
-cirq/testing/_compat_test_data/__init__.py,sha256=yIe0dUE7-FT1bxYjc0hcoOZQkecBdYN5onC6KOpsx8U,3040
-cirq/testing/_compat_test_data/module_a/__init__.py,sha256=klpfbI8BVz2BA5TwhUDGqMSM0Sjw6ABIA_4hpyADHaE,386
+cirq/testing/_compat_test_data/__init__.py,sha256=T9LHBgX2CLUvAloqrH0F1AAXdtgMuQvG3vZZhNbg61A,3028
+cirq/testing/_compat_test_data/module_a/__init__.py,sha256=MHrL6kJFnYTXaRT-bW-gVPzizJCN4bIU8ZFB-tXUGZg,384
 cirq/testing/_compat_test_data/module_a/types.py,sha256=XFNOEP88FMOOCgF6jBumwsIBwIr-6KyK7ciaVzMN7T8,83
 cirq/testing/_compat_test_data/module_a/dupe/__init__.py,sha256=1h4X6AYURm5r2WFH26BltHzn0RzAv94Lf80DlKaG6xc,78
 cirq/testing/_compat_test_data/module_a/module_b/__init__.py,sha256=QPjVtgaK3kM9SPi3NocWmZ4FGh_V6Ct5qDHZkDIeCCU,159
@@ -1148,8 +1148,8 @@ cirq/work/sampler.py,sha256=JVv1vvfa6EgFiR3UeDk44U186dCrioH2NZXueCgsb9w,19828
 cirq/work/sampler_test.py,sha256=zo1Hj6sn6fLs_WZMxYRApBqgBsldmptn74NL0jhNukc,12325
 cirq/work/zeros_sampler.py,sha256=x1C7cup66a43n-3tm8QjhiqJa07qcJW10FxNp9jJ59Q,2356
 cirq/work/zeros_sampler_test.py,sha256=JIkpBBFPJe5Ba4142vzogyWyboG1Q1ZAm0UVGgOoZn8,3279
-cirq_core-1.4.0.dev20231202032139.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.4.0.dev20231202032139.dist-info/METADATA,sha256=0_5TDIWbYJCKDZb48y_07zLZZE82xKs4DqlRX8VFJfQ,2075
-cirq_core-1.4.0.dev20231202032139.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-cirq_core-1.4.0.dev20231202032139.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.4.0.dev20231202032139.dist-info/RECORD,,
+cirq_core-1.4.0.dev20231205193004.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.4.0.dev20231205193004.dist-info/METADATA,sha256=FwG8ECCsAQAUaqeF25XXgH2kY75fBlFEpyFijcsGkYs,2075
+cirq_core-1.4.0.dev20231205193004.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+cirq_core-1.4.0.dev20231205193004.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.4.0.dev20231205193004.dist-info/RECORD,,