Refactor json_test's TEST_OBJECTS value into test data files

cirq/_compat.py

@@ -63,6 +63,24 @@ def proper_repr(value: Any) -> str:
     return repr(value)
 
 
+def proper_eq(a: Any, b: Any) -> bool:
+    """Compares objects for equality, working around __eq__ not always working.
+
+    For example, in numpy a == b broadcasts and returns an array instead of
+    doing what np.array_equal(a, b) does. This method uses np.array_equal(a, b)
+    when dealing with numpy arrays.
+    """
+    if type(a) == type(b):
+        if isinstance(a, np.ndarray):
+            return np.array_equal(a, b)
+        if isinstance(a, (pd.DataFrame, pd.Index, pd.MultiIndex)):
+            return a.equals(b)
+        if isinstance(a, (tuple, list)):
+            return len(a) == len(b) and all(proper_eq(x, y)
+                                            for x, y in zip(a, b))
+    return a == b
+
+
 def deprecated(*, deadline: str, fix: str, func_name: Optional[str] = None
               ) -> Callable[[Callable], Callable]:
     """Marks a function as deprecated.

cirq/google/devices/known_devices.py

@@ -14,6 +14,7 @@
 
 from typing import Dict, Optional, Iterable, List, Set, Tuple
 
+from cirq import value
 from cirq._doc import document
 from cirq.devices import GridQubit
 from cirq.google import gate_sets, serializable_gate_set
@@ -172,14 +173,18 @@ def __init__(self, constant: str, **kwargs) -> None:
     def __repr__(self):
         return self._repr
 
+    @classmethod
+    def _from_json_dict_(cls, constant: str, **kwargs):
+        if constant == Foxtail._repr:
+            return Foxtail
+        if constant == Bristlecone._repr:
+            return Bristlecone
+        raise ValueError(f'Unrecognized xmon device name: {constant!r}')
+
     def _json_dict_(self):
         return {
             'cirq_type': self.__class__.__name__,
             'constant': self._repr,
-            'measurement_duration': self._measurement_duration,
-            'exp_w_duration': self._exp_w_duration,
-            'exp_11_duration': self._exp_z_duration,
-            'qubits': sorted(self.qubits)
         }