Deprecate 0.9 deprecated items (#3856)

Fixes #3444.

cirq/linalg/__init__.py

@@ -42,10 +42,6 @@
     so4_to_magic_su2s,
 )
 
-from cirq.linalg.states import (
-    one_hot,
-    eye_tensor,
-)
 
 from cirq.linalg.diagonalize import (
     bidiagonalize_real_matrix_pair_with_symmetric_products,

cirq/ops/moment.py

@@ -66,13 +66,6 @@ class Moment:
             are no such operations, returns an empty Moment.
     """
 
-    @deprecated_parameter(
-        deadline='v0.9',
-        fix='Don\'t specify a keyword.',
-        match=lambda _, kwargs: 'operations' in kwargs,
-        parameter_desc='operations',
-        rewrite=lambda args, kwargs: (args + (kwargs['operations'],), {}),
-    )
     def __init__(self, *contents: 'cirq.OP_TREE') -> None:
         """Constructs a moment with the given operations.
 

cirq/ops/moment_test.py

@@ -427,14 +427,6 @@ def test_op_tree():
     )
 
 
-def test_deprecated_operations_parameter():
-    op = cirq.X(cirq.LineQubit(0))
-    with cirq.testing.assert_logs('Don\'t specify a keyword.'):
-        # pylint: disable=unexpected-keyword-arg
-        m = cirq.Moment(operations=[op])
-    assert m == cirq.Moment(op)
-
-
 def test_indexes_by_qubit():
     a, b, c = cirq.LineQubit.range(3)
     moment = cirq.Moment([cirq.H(a), cirq.CNOT(b, c)])

cirq/sim/__init__.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 """Base simulation classes and generic simulators."""
+from typing import Tuple, Dict
 
 from cirq.sim.act_on_state_vector_args import (
     ActOnStateVectorArgs,
@@ -21,8 +22,6 @@
 from cirq.sim.density_matrix_utils import (
     measure_density_matrix,
     sample_density_matrix,
-    to_valid_density_matrix,
-    von_neumann_entropy,
 )
 
 from cirq.sim.density_matrix_simulator import (
@@ -62,13 +61,9 @@
 )
 
 from cirq.sim.state_vector import (
-    bloch_vector_from_state_vector,
-    density_matrix_from_state_vector,
-    dirac_notation,
     measure_state_vector,
     sample_state_vector,
     StateVectorMixin,
-    to_valid_state_vector,
 )
 
 from cirq.sim.clifford import (
@@ -83,15 +78,12 @@
     CliffordSimulatorStepResult,
 )
 
-# Deprecated
 # pylint: disable=wrong-import-order
-
-from cirq.qis import STATE_VECTOR_LIKE
-
 import sys as _sys
 from cirq._compat import wrap_module as _wrap_module
 
-deprecated_constants = {
-    'STATE_VECTOR_LIKE': ('v0.9', 'Use cirq.STATE_VECTOR_LIKE instead'),
+deprecated_constants: Dict[str, Tuple[str, str]] = {
+    # currently none, you can use this to deprecate constants, for example like this:
+    # 'STATE_VECTOR_LIKE': ('v0.9', 'Use cirq.STATE_VECTOR_LIKE instead'),
 }
 _sys.modules[__name__] = _wrap_module(_sys.modules[__name__], deprecated_constants)

cirq/sim/density_matrix_utils.py

@@ -17,23 +17,12 @@
 
 import numpy as np
 
-from cirq import linalg, qis, value
-from cirq._compat import deprecated
+from cirq import linalg, value
 
 if TYPE_CHECKING:
     import cirq
 
 
-@deprecated(deadline='v0.9', fix='Use cirq.to_valid_density_matrix instead.')
-def to_valid_density_matrix(*args, **kwargs):
-    return qis.to_valid_density_matrix(*args, **kwargs)
-
-
-@deprecated(deadline='v0.9', fix='Use cirq.von_neumann_entropy instead.')
-def von_neumann_entropy(*args, **kwargs):
-    return qis.von_neumann_entropy(*args, **kwargs)
-
-
 def sample_density_matrix(
     density_matrix: np.ndarray,
     indices: List[int],

cirq/sim/density_matrix_utils_test.py

@@ -21,14 +21,6 @@
 import cirq.testing
 
 
-def test_deprecated():
-    with cirq.testing.assert_logs('cirq.to_valid_density_matrix', 'deprecated'):
-        _ = cirq.sim.to_valid_density_matrix(0, 1)
-
-    with cirq.testing.assert_logs('cirq.von_neumann_entropy', 'deprecated'):
-        _ = cirq.sim.von_neumann_entropy(np.eye(2) / 2)
-
-
 def test_sample_density_matrix_big_endian():
     results = []
     for x in range(8):

cirq/sim/state_vector.py

@@ -20,32 +20,11 @@
 
 from cirq import linalg, ops, qis, value
 from cirq.sim import simulator
-from cirq._compat import deprecated
 
 if TYPE_CHECKING:
     import cirq
 
 
-@deprecated(deadline='v0.9', fix='Use cirq.bloch_vector_from_state_vector instead.')
-def bloch_vector_from_state_vector(*args, **kwargs):
-    return qis.bloch_vector_from_state_vector(*args, **kwargs)
-
-
-@deprecated(deadline='v0.9', fix='Use cirq.density_matrix_from_state_vector instead.')
-def density_matrix_from_state_vector(*args, **kwargs):
-    return qis.density_matrix_from_state_vector(*args, **kwargs)
-
-
-@deprecated(deadline='v0.9', fix='Use cirq.dirac_notation instead.')
-def dirac_notation(*args, **kwargs):
-    return qis.dirac_notation(*args, **kwargs)
-
-
-@deprecated(deadline='v0.9', fix='Use cirq.to_valid_state_vector instead.')
-def to_valid_state_vector(*args, **kwargs):
-    return qis.to_valid_state_vector(*args, **kwargs)
-
-
 # For backwards compatibility and to make mypy happy:
 from cirq.qis import STATE_VECTOR_LIKE  # pylint: disable=unused-import,wrong-import-position
 

cirq/sim/state_vector_test.py

@@ -375,21 +375,3 @@ def test_step_result_bloch_vector():
     bloch0 = np.array([0, 0, 1])
     np.testing.assert_array_almost_equal(bloch1, step_result.bloch_vector_of(q1))
     np.testing.assert_array_almost_equal(bloch0, step_result.bloch_vector_of(q0))
-
-
-def test_deprecated():
-    with cirq.testing.assert_logs('cirq.bloch_vector_from_state_vector', 'deprecated'):
-        _ = cirq.sim.bloch_vector_from_state_vector(np.array([1, 0]), 0)
-
-    with cirq.testing.assert_logs('cirq.density_matrix_from_state_vector', 'deprecated'):
-        _ = cirq.sim.density_matrix_from_state_vector(np.array([1, 0]))
-
-    with cirq.testing.assert_logs('cirq.dirac_notation', 'deprecated'):
-        _ = cirq.sim.dirac_notation(np.array([1, 0]))
-
-    with cirq.testing.assert_logs('cirq.to_valid_state_vector', 'deprecated'):
-        _ = cirq.sim.to_valid_state_vector(0, 1)
-
-    with cirq.testing.assert_logs('cirq.STATE_VECTOR_LIKE', 'deprecated'):
-        # Reason for type: ignore: https://github.com/python/mypy/issues/5354
-        _ = cirq.sim.STATE_VECTOR_LIKE  # type: ignore