cirq-core 1.7.0.dev20250814193859__py3-none-any.whl → 1.7.0.dev20250814213759__py3-none-any.whl

cirq/_version.py

@@ -28,4 +28,4 @@ if sys.version_info < (3, 11, 0):  # pragma: no cover
         'of Cirq (e.g. "python -m pip install cirq==1.5.0")'
     )
 
-__version__ = "1.7.0.dev20250814193859"
+__version__ = "1.7.0.dev20250814213759"

cirq/_version_test.py

@@ -3,4 +3,4 @@ import cirq
 
 
 def test_version() -> None:
-    assert cirq.__version__ == "1.7.0.dev20250814193859"
+    assert cirq.__version__ == "1.7.0.dev20250814213759"

cirq/interop/quirk/cells/parse.py

@@ -147,7 +147,7 @@ def _parse_formula_using_token_map(
     def apply(op: str | _HangingNode) -> None:
         assert isinstance(op, _HangingNode)
         if len(vals) < 2:
-            raise ValueError("Bad expression: operated on nothing.\ntext={text!r}")
+            raise ValueError(f"Bad expression: operated on nothing.\ntext={text!r}")
         b = vals.pop()
         a = vals.pop()
         # Note: vals seems to be _HangingToken
@@ -157,7 +157,7 @@ def _parse_formula_using_token_map(
     def close_paren() -> None:
         while True:
             if len(ops) == 0:
-                raise ValueError("Bad expression: unmatched ')'.\ntext={text!r}")
+                raise ValueError(f"Bad expression: unmatched ')'.\ntext={text!r}")
             op = ops.pop()
             if op == "(":
                 break
@@ -193,7 +193,7 @@ def _parse_formula_using_token_map(
                 token_unary_action = token.unary_action
                 ops.append(_HangingNode(func=lambda _, b: token_unary_action(b), weight=np.inf))
             elif token.binary_action is not None:
-                raise ValueError("Bad expression: binary op in bad spot.\ntext={text!r}")
+                raise ValueError(f"Bad expression: binary op in bad spot.\ntext={text!r}")
 
     was_valid_end_token = False
     for token in tokens:

cirq/ops/gateset.py

@@ -416,13 +416,6 @@ class Gateset:
         g = item if isinstance(item, raw_types.Gate) else item.gate
         assert g is not None, f'`item`: {item} must be a gate or have a valid `item.gate`'
 
-        if g in self._instance_gate_families:
-            assert item in self._instance_gate_families[g], (
-                f"{item} instance matches {self._instance_gate_families[g]} but "
-                f"is not accepted by it."
-            )
-            return True
-
         for gate_mro_type in type(g).mro():
             if gate_mro_type in self._type_gate_families:
                 assert item in self._type_gate_families[gate_mro_type], (
@@ -431,6 +424,13 @@ class Gateset:
                 )
                 return True
 
+        if g in self._instance_gate_families:
+            assert item in self._instance_gate_families[g], (
+                f"{item} instance matches {self._instance_gate_families[g]} but "
+                f"is not accepted by it."
+            )
+            return True
+
         return any(item in gate_family for gate_family in self._gates)
 
     def validate(self, circuit_or_optree: cirq.AbstractCircuit | op_tree.OP_TREE) -> bool:

cirq/ops/gateset_test.py

@@ -452,3 +452,25 @@ def test_gateset_contains_op_with_no_gate():
     op = cirq.X(cirq.q(1)).with_classical_controls('a')
     assert op.gate is None
     assert op not in gf
+
+
+def test_overlapping_gate_families() -> None:
+    """Tests if a gate belongs both to an instance and type family
+    but is rejected by the type family it can still be accepted."""
+
+    # The following gateset should accept ZPowGates only with the tag
+    # except it lets in cirq.Z with no tag
+    tag = "PhysicalZTag"
+    gf_accept = cirq.GateFamily(cirq.ZPowGate, tags_to_accept=[tag])
+    instance_accept = cirq.GateFamily(cirq.Z)
+    gs = cirq.Gateset(gf_accept, instance_accept)
+
+    instance_op = cirq.Z(q)
+    instance_op_with_tag = cirq.Z(q).with_tags(tag)
+    type_op_no_tag = cirq.ZPowGate(exponent=0.5)(q)
+    type_op_with_tag = cirq.ZPowGate(exponent=0.5)(q).with_tags(tag)
+
+    assert instance_op in gs
+    assert instance_op_with_tag in gs
+    assert type_op_no_tag not in gs
+    assert type_op_with_tag in gs

cirq/study/resolver.py

@@ -202,7 +202,7 @@ class ParamResolver:
         if value in self._deep_eval_map:
             v = self._deep_eval_map[value]
             if v is _RECURSION_FLAG:
-                raise RecursionError('Evaluation of {value} indirectly contains itself.')
+                raise RecursionError(f'Evaluation of {value} indirectly contains itself.')
             return v
 
         # There isn't a full evaluation for 'value' yet. Until it's ready,

{cirq_core-1.7.0.dev20250814193859.dist-info → cirq_core-1.7.0.dev20250814213759.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cirq-core
-Version: 1.7.0.dev20250814193859
+Version: 1.7.0.dev20250814213759
 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.7.0.dev20250814193859.dist-info → cirq_core-1.7.0.dev20250814213759.dist-info}/RECORD

@@ -4,8 +4,8 @@ cirq/_compat_test.py,sha256=emXpdD5ZvwLRlFAoQB8YatmZyU3b4e9jg6FppMTUhkU,33900
 cirq/_doc.py,sha256=BrnoABo1hk5RgB3Cgww4zLHUfiyFny0F1V-tOMCbdaU,2909
 cirq/_import.py,sha256=ixBu4EyGl46Ram2cP3p5eZVEFDW5L2DS-VyTjz4N9iw,8429
 cirq/_import_test.py,sha256=oF4izzOVZLc7NZ0aZHFcGv-r01eiFFt_JORx_x7_D4s,1089
-cirq/_version.py,sha256=lH3ynM5h8YtlvT-pVsjCt45cDtUG0Ug0Bs4Edrp_z84,1206
-cirq/_version_test.py,sha256=eKzesangsb5Pl1i5dfdZI_zCr3kfFauud8aqspsmPmg,155
+cirq/_version.py,sha256=5OMdETPu_ahLYEAGWuvz6FQvPo90WuREbv97yjHbWdE,1206
+cirq/_version_test.py,sha256=sIhxk3eJjUQHh23JJW-O4IsJAoBpH15T1Od1lktTCvo,155
 cirq/conftest.py,sha256=wSDKNdIQRDfLnXvOCWD3erheOw8JHRhdfQ53EyTUIXg,1239
 cirq/json_resolver_cache.py,sha256=A5DIgFAY1hUNt9vai_C3-gGBv24116CJMzQxMcXOax4,13726
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -248,7 +248,7 @@ cirq/interop/quirk/cells/input_rotation_cells.py,sha256=TlxRbKQ6IPN8XgA7qocwufgn
 cirq/interop/quirk/cells/input_rotation_cells_test.py,sha256=uYIkzwQioX9GxrKrEGgMAVn_OFnmqcT4nWPoK3NGLOQ,6410
 cirq/interop/quirk/cells/measurement_cells.py,sha256=U3I8wEX5BVp8Rlg1MkQAwaRMJ6wl6KGC805RGMoSO8A,1526
 cirq/interop/quirk/cells/measurement_cells_test.py,sha256=DFc5Do4ePN5dGSzmbkXCpAwJ8UTth031uhq9QqpIEKw,1618
-cirq/interop/quirk/cells/parse.py,sha256=WKP0krx-7whsNrsbgVX9_97ZIi1zm2uYELQZ5KedI_o,11857
+cirq/interop/quirk/cells/parse.py,sha256=THngP-aipoXuzd9lhEcTo_AhTCCDCybkaooDnwwYyaI,11860
 cirq/interop/quirk/cells/parse_test.py,sha256=w3Vp13EBAcMvpCgWK9fzYwfBpVF4ax6JAqASLmFrYWg,7625
 cirq/interop/quirk/cells/qubit_permutation_cells.py,sha256=2xBQt93gS0aam64ZU54Z8wnraIU5_G8auJLq5-7dBjU,3417
 cirq/interop/quirk/cells/qubit_permutation_cells_test.py,sha256=HEg156HfRnTSciiYEr_H3oIBtvF0GNafKwb2Gy53k5U,4552
@@ -317,8 +317,8 @@ cirq/ops/gate_features.py,sha256=OfjsIGftnGpNUDAYwSP4obG0FsMrHYfp49ZOjbvbmNE,108
 cirq/ops/gate_features_test.py,sha256=JYPunTBr48CQoIOB1wk2QEdPwtnmE-FxUoF6a4ZeRB8,2407
 cirq/ops/gate_operation.py,sha256=MF8JIYEM6bQu6ft9Eb19hSOillzu8MmaIoXSlmwbm5U,13447
 cirq/ops/gate_operation_test.py,sha256=4QwWxCjGXNM__6QGw1kYSbBMh_4783jBZVBJD1ERGPk,18020
-cirq/ops/gateset.py,sha256=9HFW5Sg_jPpao8SEd7XgLdc_6xgUwZfvb6f7pfVPIF8,21492
-cirq/ops/gateset_test.py,sha256=_dpKTEwXuOY-jpev9rBPEcMy4KZ7zd6GmJ5JkvZAeog,16580
+cirq/ops/gateset.py,sha256=ya5OUsgd1j703Kk3hq6f-LzT1ZjBo_tl-FV0hvvlaAA,21492
+cirq/ops/gateset_test.py,sha256=JGQtCOkhAC11vhlZRpwJowNfU6v-hlIt9qdRRJgvfQY,17407
 cirq/ops/global_phase_op.py,sha256=GcERs4X5h5_at6tvJc8-AcM0cVsLCRPlpPkAWMINm54,5711
 cirq/ops/global_phase_op_test.py,sha256=9BBnPZLLmBzHsMoRPMFTAShx87TJnhTLvvgLpHJF4wc,10721
 cirq/ops/greedy_qubit_manager.py,sha256=UTd9cTRbl4GQmf6ai6zqVBn5TR3-Vg84jJu4AN-0cxc,4050
@@ -977,7 +977,7 @@ cirq/sim/clifford/stabilizer_state_ch_form_test.py,sha256=UuvgpwexGB5LzMfaa3Gws2
 cirq/study/__init__.py,sha256=OyJhZjBiEkNbtSuSZaOwHGwwnOIGgnn-W8ec0xHhHBI,1647
 cirq/study/flatten_expressions.py,sha256=q9U-AukDri63yC4pF_dEKCX81RfquK4z31ktLkL0gz0,15528
 cirq/study/flatten_expressions_test.py,sha256=ONYcsFoL7Re7IsySwXgnnIlrWCuUu1ds2f90-2uNj1c,6202
-cirq/study/resolver.py,sha256=eJW9cIj4AncLCPOhv7X5MAAM1DnpcCybQPHzn6hYJL4,11746
+cirq/study/resolver.py,sha256=TozodaKHKobwTKVR3g3DblzPljTrErAxVHryZVwpraQ,11747
 cirq/study/resolver_test.py,sha256=LY1h8RCPY4d_8O5hprRcIf3HFhzODQrMbUrmwmt1fbM,10727
 cirq/study/result.py,sha256=ci9Pg9IW4OMR4aZ4SaQ7TPVTgoSU-1WarjKEXBv2F2g,19214
 cirq/study/result_test.py,sha256=Safhg93E1x7NA--bxvkMwOnTPAlT0VkfF6hdsEKvhEM,15627
@@ -1234,8 +1234,8 @@ cirq/work/sampler.py,sha256=rxbMWvrhu3gfNSBjZKozw28lLKVvBAS_1EGyPdYe8Xg,19041
 cirq/work/sampler_test.py,sha256=SsMrRvLDYELyOAWLKISjkdEfrBwLYWRsT6D8WrsLM3Q,13533
 cirq/work/zeros_sampler.py,sha256=Fs2JWwq0n9zv7_G5Rm-9vPeHUag7uctcMOHg0JTkZpc,2371
 cirq/work/zeros_sampler_test.py,sha256=lQLgQDGBLtfImryys2HzQ2jOSGxHgc7-koVBUhv8qYk,3345
-cirq_core-1.7.0.dev20250814193859.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.7.0.dev20250814193859.dist-info/METADATA,sha256=9g5DeT0JzUyNT47vF-YQLQocySY2KBwGdRDp9nZFJ2c,4857
-cirq_core-1.7.0.dev20250814193859.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cirq_core-1.7.0.dev20250814193859.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.7.0.dev20250814193859.dist-info/RECORD,,
+cirq_core-1.7.0.dev20250814213759.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.7.0.dev20250814213759.dist-info/METADATA,sha256=6JiKvsC8phpIxxPfGPw7KLuGaCYI4Uv3OziCnTt0w6w,4857
+cirq_core-1.7.0.dev20250814213759.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cirq_core-1.7.0.dev20250814213759.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.7.0.dev20250814213759.dist-info/RECORD,,