Merge branch 'master' into internalgate

cirq-core/cirq/testing/consistent_qasm_test.py

@@ -84,7 +84,7 @@ def test_assert_qasm_is_consistent_with_unitary():
     )
 
     # Checks that code is valid.
-    with pytest.raises(AssertionError, match='Check your OPENQASM'):
+    with pytest.raises(AssertionError, match='QASM not consistent'):
         cirq.testing.assert_qasm_is_consistent_with_unitary(
             Fixed(np.array([[1, 0], [0, -1]]), 'JUNK$&*@($#::=[];')
         )

cirq-ft/cirq_ft/infra/gate_with_registers.py

@@ -122,7 +122,9 @@ def merge_qubits(
     ) -> List[cirq.Qid]:
         ret: List[cirq.Qid] = []
         for reg in self:
-            assert reg.name in qubit_regs, "All qubit registers must pe present"
+            assert (
+                reg.name in qubit_regs
+            ), f"All qubit registers must be present. {reg.name} not in qubit_regs"
             qubits = qubit_regs[reg.name]
             qubits = np.array([qubits] if isinstance(qubits, cirq.Qid) else qubits)
             assert (

dev_tools/requirements/deps/mypy.txt

@@ -4,6 +4,6 @@ mypy==1.2.0
 # packages with stub types for various libraries
 types-backports==0.1.3
 types-cachetools
-types-protobuf==3.19.22
+types-protobuf~=3.20
 types-requests==2.28.1
 types-setuptools==62.6.1

dev_tools/requirements/deps/protos.txt

@@ -3,4 +3,4 @@
 # This bundles protoc 3.23.1, which we use for generating proto code.
 grpcio-tools~=1.56.0
 
-mypy-protobuf
+mypy-protobuf==3.4