Merge branch 'master' into v0.12.0-dev

Author: MichaelBroughton

cirq-core/cirq/__init__.py

@@ -422,7 +422,6 @@
     ParamDictType,
     ParamResolver,
     ParamResolverOrSimilarType,
-    plot_state_histogram,
     Points,
     Product,
     Sweep,

cirq-core/cirq/contrib/quantum_volume/quantum_volume.py

@@ -2,16 +2,15 @@
 https://arxiv.org/abs/1811.12926.
 """
 
-from typing import Optional, List, cast, Callable, Dict, Tuple, Set, Any
 from dataclasses import dataclass
+from typing import Optional, List, cast, Callable, Dict, Tuple, Set, Any
 
+import networkx as nx
 import numpy as np
 import pandas as pd
-import networkx as nx
 
 import cirq
 import cirq.contrib.routing as ccr
-from cirq._compat import deprecated_parameter
 
 
 def generate_model_circuit(
@@ -428,21 +427,6 @@ def _get_device_graph(device_or_qubits: Any):
     return ccr.gridqubits_to_graph_device(qubits)
 
 
-@deprecated_parameter(
-    deadline="v0.12",
-    fix="use device_graph instead",
-    parameter_desc='device_or_qubits',
-    match=lambda args, kwargs: 'device_or_qubits' in kwargs,
-    rewrite=lambda args, kwargs: (
-        args,
-        dict(
-            ('device_graph', _get_device_graph(arg_val))
-            if arg_name == 'device_or_qubits'
-            else (arg_name, arg_val)
-            for arg_name, arg_val in kwargs.items()
-        ),
-    ),
-)
 def calculate_quantum_volume(
     *,
     num_qubits: int,

cirq-core/cirq/contrib/quantum_volume/quantum_volume_test.py

@@ -358,41 +358,3 @@ def test_calculate_quantum_volume_loop_with_readout_correction():
         samplers=[cirq.Simulator()],
         add_readout_error_correction=True,
     )
-
-
-def test_deprecated():
-    with cirq.testing.assert_deprecated(
-        "device_or_qubits", "use device_graph instead", deadline="v0.12"
-    ):
-        # pylint: disable=unexpected-keyword-arg
-        # pylint: disable=missing-kwoa
-        cirq.contrib.quantum_volume.calculate_quantum_volume(
-            num_qubits=4,
-            depth=4,
-            num_circuits=1,
-            routing_attempts=2,
-            random_state=1,
-            device_or_qubits=cirq.GridQubit.rect(3, 3),
-            samplers=[cirq.Simulator()],
-            add_readout_error_correction=True,
-        )
-        # pylint: enable=unexpected-keyword-arg
-        # pylint: enable=missing-kwoa
-
-    with cirq.testing.assert_deprecated(
-        "device_or_qubits", "use device_graph instead", deadline="v0.12"
-    ):
-        # pylint: disable=unexpected-keyword-arg
-        # pylint: disable=missing-kwoa
-        cirq.contrib.quantum_volume.calculate_quantum_volume(
-            num_qubits=4,
-            depth=4,
-            num_circuits=1,
-            routing_attempts=2,
-            random_state=1,
-            device_or_qubits=TestDevice(),
-            samplers=[cirq.Simulator()],
-            add_readout_error_correction=True,
-        )
-        # pylint: enable=unexpected-keyword-arg
-        # pylint: enable=missing-kwoa

cirq-core/cirq/contrib/routing/__init__.py

@@ -14,7 +14,6 @@
 """Utilities for routing circuits on devices"""
 
 from cirq.contrib.routing.device import (
-    xmon_device_to_graph,
     get_linear_device_graph,
     get_grid_device_graph,
     gridqubits_to_graph_device,

cirq-core/cirq/contrib/routing/device.py

@@ -13,18 +13,11 @@
 # limitations under the License.
 
 import itertools
-from typing import Iterable, Tuple, Dict, Any
+from typing import Iterable, Tuple, Dict
 
 import networkx as nx
 
 import cirq
-from cirq._compat import deprecated
-
-
-@deprecated(deadline="v0.12", fix="use gridqubits_to_graph_device(device.qubits) instead")
-def xmon_device_to_graph(device: Any) -> nx.Graph:
-    """Gets the graph of an XmonDevice."""
-    return gridqubits_to_graph_device(device.qubits)
 
 
 def get_linear_device_graph(n_qubits: int) -> nx.Graph:

cirq-core/cirq/contrib/routing/device_test.py

@@ -20,18 +20,6 @@
 import cirq.contrib.routing as ccr
 
 
-def test_xmon_device_to_graph():
-    with cirq.testing.assert_deprecated("gridqubits_to_graph_device", deadline="v0.12"):
-
-        class TestDevice:
-            qubits = cirq.GridQubit.rect(2, 11)
-
-        foxtail_graph = ccr.xmon_device_to_graph(TestDevice())
-        two_by_eleven_grid_graph = ccr.get_grid_device_graph(2, 11)
-        assert foxtail_graph.nodes == two_by_eleven_grid_graph.nodes
-        assert foxtail_graph.edges() == two_by_eleven_grid_graph.edges()
-
-
 @pytest.mark.parametrize('n_qubits', (2, 5, 11))
 def test_get_linear_device_graph(n_qubits):
     graph = ccr.get_linear_device_graph(n_qubits)

cirq-core/cirq/qis/clifford_tableau_test.py

@@ -317,13 +317,6 @@ def test_copy():
     assert t == t.copy() == t.__copy__()
 
 
-def test_deprecated_clifford_location():
-    with cirq.testing.assert_deprecated('use cirq.CliffordTableau instead', deadline="v0.12"):
-        from cirq.sim import CliffordTableau
-
-        CliffordTableau(num_qubits=1)
-
-
 def _three_identical_table(num_qubits):
     t1 = cirq.CliffordTableau(num_qubits)
     t2 = cirq.CliffordTableau(num_qubits)

cirq-core/cirq/sim/__init__.py

@@ -93,7 +93,6 @@
     StabilizerStateChForm,
     CliffordSimulator,
     CliffordState,
-    CliffordTableau,
     CliffordTrialResult,
     CliffordSimulatorStepResult,
 )

cirq-core/cirq/sim/clifford/__init__.py

@@ -1,7 +1,3 @@
-from cirq.sim.clifford.clifford_tableau import (
-    CliffordTableau,
-)
-
 from cirq.sim.clifford.act_on_clifford_tableau_args import (
     ActOnCliffordTableauArgs,
 )

cirq-core/cirq/sim/clifford/clifford_tableau.py

@@ -49,7 +49,3 @@
 from cirq.study.result import (
     Result,
 )
-
-from cirq.study.visualize import (
-    plot_state_histogram,
-)

cirq-core/cirq/study/__init__.py

@@ -15,25 +15,11 @@
 import os
 from typing import Optional
 
-from cirq._compat import deprecated_parameter
 from cirq.testing import assert_logs
 
 ALLOW_DEPRECATION_IN_TEST = 'ALLOW_DEPRECATION_IN_TEST'
 
 
-@deprecated_parameter(
-    deadline='v0.12',
-    fix='Use count instead.',
-    parameter_desc='allow_multiple_warnings',
-    match=lambda args, kwargs: 'allow_multiple_warnings' in kwargs,
-    rewrite=lambda args, kwargs: (
-        args,
-        dict(
-            ('count', None if v == True else 1) if k == 'allow_multiple_warnings' else (k, v)
-            for k, v in kwargs.items()
-        ),
-    ),
-)
 def assert_deprecated(*msgs: str, deadline: str, count: Optional[int] = 1):
     """Allows deprecated functions, classes, decorators in tests.
 

cirq-core/cirq/study/visualize.py

@@ -51,21 +51,3 @@ def test_assert_deprecated_log_handling():
         warnings.warn("hello, this is deprecated in v1.2")
         warnings.warn("hello, this is deprecated in v1.2")
         warnings.warn("hello, this is deprecated in v1.2")
-
-
-def test_deprecated():
-    # allow_multiple_warnings is now deprecated...so this is a bit convoluted,
-    # a parameter of the deprecator is being deprecated
-
-    with assert_deprecated(deadline="v0.12", count=3):
-        with pytest.raises(AssertionError, match="Expected 1 log message but got 2."):
-            # pylint: disable=unexpected-keyword-arg
-            with assert_deprecated(deadline="v1.2", allow_multiple_warnings=False):
-                warnings.warn("hello, this is deprecated in v1.2")
-                warnings.warn("hello, this is deprecated in v1.2")
-
-    with assert_deprecated(deadline="v0.12", count=3):
-        # pylint: disable=unexpected-keyword-arg
-        with assert_deprecated(deadline="v1.2", allow_multiple_warnings=True):
-            warnings.warn("hello, this is deprecated in v1.2")
-            warnings.warn("hello, this is deprecated in v1.2")

cirq-core/cirq/testing/deprecation.py

@@ -16,19 +16,7 @@
 import logging
 from typing import ContextManager, List, Optional
 
-from cirq._compat import deprecated_parameter
 
-
-@deprecated_parameter(
-    deadline="v0.12",
-    fix="use min_level instead",
-    parameter_desc="level",
-    match=lambda args, kwargs: 'level' in kwargs,
-    rewrite=lambda args, kwargs: (
-        args,
-        {('min_level' if k == 'level' else k): v for k, v in kwargs.items()},
-    ),
-)
 def assert_logs(
     *matches: str,
     count: Optional[int] = 1,

cirq-core/cirq/testing/deprecation_test.py

@@ -136,17 +136,6 @@ def test_invalid_levels():
         cirq.testing.assert_logs("test", min_level=logging.CRITICAL, max_level=logging.WARNING)
 
 
-def test_deprecated():
-    with cirq.testing.assert_deprecated(
-        'level parameter of assert_logs was used but is deprecated',
-        'use min_level instead',
-        deadline="v0.12",
-    ):
-        # pylint: disable=unexpected-keyword-arg
-        with cirq.testing.assert_logs("hello critical", level=logging.CRITICAL):
-            logging.critical("hello critical")
-
-
 def test_assert_logs_warnings():
     # Capture all warnings in one context, so that test cases that will
     # display a warning do not do so when the test is run.

cirq-core/cirq/testing/logs.py

@@ -95,18 +95,3 @@ def test_plot_state_histogram_collection():
     for r1, r2 in zip(ax1.get_children(), ax2.get_children()):
         if isinstance(r1, mpl.patches.Rectangle) and isinstance(r2, mpl.patches.Rectangle):
             assert str(r1) == str(r2)
-
-
-def test_plot_state_histogram_deprecation():
-    with cirq.testing.assert_deprecated(
-        'cirq.study.visualize.plot_state_histogram was used but is deprecated.\n'
-        'It will be removed in cirq v0.12.\n'
-        'use cirq.vis.plot_state_histogram or cirq.vis.get_state_histogram instead',
-        deadline="v0.12",
-        count=None,  # Another warning is due to matplotlib.
-    ):
-        simulator = cirq.Simulator()
-        q = cirq.NamedQubit("a")
-        circuit = cirq.Circuit([cirq.X(q), cirq.measure(q)])
-        result = simulator.run(program=circuit, repetitions=5)
-        cirq.study.visualize.plot_state_histogram(result)