flush deprecation backlog for v0.11 (quantumlib#4099)

* flush deprecation backlog for v0.11

* fix notebook failure

* format + added fixes to the release process

* fixes to release process

* small fix

cirq-core/cirq/__init__.py

@@ -413,7 +413,6 @@
     to_sweep,
     to_sweeps,
     Result,
-    TrialResult,
     UnitSweep,
     Zip,
 )

cirq-core/cirq/circuits/circuit.py

@@ -19,11 +19,12 @@
 Moment the Operations must all act on distinct Qubits.
 """
 
-from collections import defaultdict
+import abc
 import enum
-from itertools import groupby
+import html
 import math
-
+from collections import defaultdict
+from itertools import groupby
 from typing import (
     AbstractSet,
     Any,
@@ -45,21 +46,18 @@
     Union,
 )
 
-import abc
-import html
 import networkx
 import numpy as np
 
+import cirq._version
 from cirq import devices, ops, protocols, qis
 from cirq.circuits._bucket_priority_queue import BucketPriorityQueue
 from cirq.circuits.circuit_operation import CircuitOperation
 from cirq.circuits.insert_strategy import InsertStrategy
-from cirq.circuits.text_diagram_drawer import TextDiagramDrawer
 from cirq.circuits.qasm_output import QasmOutput
 from cirq.circuits.quil_output import QuilOutput
+from cirq.circuits.text_diagram_drawer import TextDiagramDrawer
 from cirq.type_workarounds import NotImplementedType
-from cirq._compat import deprecated_parameter
-import cirq._version
 
 if TYPE_CHECKING:
     import cirq
@@ -1789,16 +1787,6 @@ def zip(
 
     zip.__doc__ = AbstractCircuit.zip.__doc__
 
-    @deprecated_parameter(
-        deadline='v0.11',
-        fix='Use qubit_map instead.',
-        parameter_desc='positional func',
-        match=lambda args, kwargs: 'func' in kwargs,
-        rewrite=lambda args, kwargs: (
-            args,
-            {('qubit_map' if k == 'func' else k): v for k, v in kwargs.items()},
-        ),
-    )
     def transform_qubits(
         self,
         qubit_map: Union[Dict['cirq.Qid', 'cirq.Qid'], Callable[['cirq.Qid'], 'cirq.Qid']],

cirq-core/cirq/circuits/circuit_test.py

@@ -4153,10 +4153,6 @@ def test_transform_qubits():
     with pytest.raises(TypeError, match='must be a function or dict'):
         _ = original.transform_qubits('bad arg')
 
-    with cirq.testing.assert_deprecated('Use qubit_map instead', deadline="v0.11"):
-        # pylint: disable=no-value-for-parameter,unexpected-keyword-arg
-        assert original.transform_qubits(func=lambda q: cirq.GridQubit(10 + q.x, 20)) == desired
-
     # Device
     original = cirq.Circuit(device=FOXY)
     assert original.transform_qubits(lambda q: q).device is FOXY

cirq-core/cirq/json_resolver_cache.py

@@ -134,7 +134,6 @@ def two_qubit_matrix_gate(matrix):
         'Rx': cirq.Rx,
         'Ry': cirq.Ry,
         'Rz': cirq.Rz,
-        'TrialResult': cirq.TrialResult,
         'TwoDQubit': cirq.pasqal.TwoDQubit,
         'TwoQubitMatrixGate': two_qubit_matrix_gate,
         '_UnconstrainedDevice': cirq.devices.unconstrained_device._UnconstrainedDevice,

cirq-core/cirq/ops/moment.py

@@ -28,8 +28,8 @@
     TypeVar,
     Union,
 )
+
 from cirq import protocols, ops
-from cirq._compat import deprecated_parameter
 from cirq.ops import raw_types
 from cirq.type_workarounds import NotImplementedType
 
@@ -272,16 +272,6 @@ def __repr__(self) -> str:
     def __str__(self) -> str:
         return self.to_text_diagram()
 
-    @deprecated_parameter(
-        deadline='v0.11',
-        fix='Use qubit_map instead.',
-        parameter_desc='positional func',
-        match=lambda args, kwargs: 'func' in kwargs,
-        rewrite=lambda args, kwargs: (
-            args,
-            {('qubit_map' if k == 'func' else k): v for k, v in kwargs.items()},
-        ),
-    )
     def transform_qubits(
         self: TSelf_Moment,
         qubit_map: Union[Dict['cirq.Qid', 'cirq.Qid'], Callable[['cirq.Qid'], 'cirq.Qid']],

cirq-core/cirq/ops/moment_test.py

@@ -16,7 +16,6 @@
 
 import cirq
 import cirq.testing
-from cirq.testing.deprecation import assert_deprecated
 
 
 def test_validation():
@@ -585,6 +584,3 @@ def test_transform_qubits():
     assert original.transform_qubits(lambda q: cirq.GridQubit(10 + q.x, 20)) == modified
     with pytest.raises(TypeError, match='must be a function or dict'):
         _ = original.transform_qubits('bad arg')
-    with assert_deprecated('Use qubit_map instead', deadline="v0.11"):
-        # pylint: disable=no-value-for-parameter,unexpected-keyword-arg
-        assert original.transform_qubits(func=lambda q: cirq.GridQubit(10 + q.x, 20)) == modified

cirq-core/cirq/ops/raw_types.py

@@ -14,6 +14,8 @@
 
 """Basic types defining qubits, gates, and operations."""
 
+import abc
+import functools
 from typing import (
     AbstractSet,
     Any,
@@ -29,13 +31,10 @@
     Union,
 )
 
-import abc
-import functools
 import numpy as np
 
 from cirq import protocols, value
 from cirq.type_workarounds import NotImplementedType
-from cirq._compat import deprecated_parameter
 
 if TYPE_CHECKING:
     import cirq
@@ -446,16 +445,6 @@ def with_tags(self, *new_tags: Hashable) -> 'cirq.TaggedOperation':
         """
         return TaggedOperation(self, *new_tags)
 
-    @deprecated_parameter(
-        deadline='v0.11',
-        fix='Use qubit_map instead.',
-        parameter_desc='positional func',
-        match=lambda args, kwargs: 'func' in kwargs,
-        rewrite=lambda args, kwargs: (
-            args,
-            {('qubit_map' if k == 'func' else k): v for k, v in kwargs.items()},
-        ),
-    )
     def transform_qubits(
         self: TSelf,
         qubit_map: Union[Dict['cirq.Qid', 'cirq.Qid'], Callable[['cirq.Qid'], 'cirq.Qid']],