Test all notebooks vs stable cirq after the release (#7255)

* Use stable cirq in interop.ipynb

* Use stable cirq in classical_control.ipynb

* Use stable cirq in notebooks that pass for repo head

* Sync SKIP_NOTEBOOKS list in notebook_test and isolated_notebook_test

Test all notebooks that pass with cirq head also in isolation with stable cirq.

* Skip notebooks that import examples from testing with stable cirq

Author: pavoljuhas

dev_tools/notebooks/isolated_notebook_test.py

@@ -41,39 +41,33 @@
 # note that these notebooks are still tested in dev_tools/notebook_test.py
 # Please, always indicate in comments the feature used for easier bookkeeping.
 
-NOTEBOOKS_DEPENDING_ON_UNRELEASED_FEATURES: List[str] = [
-    # Requires OpenQASM 3.0 support from cirq 1.5
-    'docs/build/interop.ipynb',
-    # Requires features in cirq 1.5.
-    'docs/build/classical_control.ipynb',
-]
+NOTEBOOKS_DEPENDING_ON_UNRELEASED_FEATURES: List[str] = []
 
 # By default all notebooks should be tested, however, this list contains exceptions to the rule
 # please always add a reason for skipping.
 SKIP_NOTEBOOKS = [
     # skipping vendor notebooks as we don't have auth sorted out
-    "**/aqt/*.ipynb",
-    "**/azure-quantum/*.ipynb",
-    "**/google/*.ipynb",
-    "**/ionq/*.ipynb",
-    "**/pasqal/*.ipynb",
-    # Rigetti uses local simulation with docker, so should work
-    # if you run into issues locally, run
-    # `docker compose -f cirq-rigetti/docker-compose.test.yaml up`
-    "**/rigetti/*.ipynb",
-    # skipping fidelity estimation due to
-    # https://github.com/quantumlib/Cirq/issues/3502
-    "examples/*fidelity*",
+    '**/aqt/*.ipynb',
+    '**/azure-quantum/*.ipynb',
+    '**/ionq/*.ipynb',
+    '**/pasqal/*.ipynb',
+    '**/rigetti/*.ipynb',
     # skipping quantum utility simulation (too large)
     'examples/advanced/*quantum_utility*',
-    # Also skipping stabilizer code testing.
-    "examples/*stabilizer_code*",
-    # get_qcs_objects_for_notebook
+    # tutorials that use QCS and arent skipped due to one or more cleared output cells
+    'docs/tutorials/google/identifying_hardware_changes.ipynb',
+    'docs/tutorials/google/echoes.ipynb',
     'docs/noise/qcvv/xeb_calibration_example.ipynb',
-    # An intentionally empty/template code notebook.
-    "docs/simulate/qvm_builder_code.ipynb",
-    *NOTEBOOKS_DEPENDING_ON_UNRELEASED_FEATURES,
+    # temporary: need to fix QVM metrics and device spec
+    'docs/tutorials/google/spin_echoes.ipynb',
+    'docs/tutorials/google/visualizing_calibration_metrics.ipynb',
+]
+SKIP_NOTEBOOKS += [
+    # notebooks that import the examples module which is not installed with cirq
+    'examples/direct_fidelity_estimation.ipynb',
+    'examples/stabilizer_code.ipynb',
 ]
+SKIP_NOTEBOOKS += NOTEBOOKS_DEPENDING_ON_UNRELEASED_FEATURES
 
 # As these notebooks run in an isolated env, we want to minimize dependencies that are
 # installed. We assume colab packages (feel free to add dependencies here that appear in colab, as

dev_tools/notebooks/notebook_test.py

@@ -37,7 +37,6 @@
     '**/ionq/*.ipynb',
     '**/pasqal/*.ipynb',
     '**/rigetti/*.ipynb',
-    # skipping fidelity estimation due to
     # skipping quantum utility simulation (too large)
     'examples/advanced/*quantum_utility*',
     # tutorials that use QCS and arent skipped due to one or more cleared output cells

docs/build/classical_control.ipynb

@@ -59,7 +59,7 @@
     "id": "bb398b9478d3"
    },
    "source": [
-    "Note: this notebook relies on unreleased Cirq features. If you want to try these features, make sure you install cirq via `pip install --upgrade cirq~=1.0.dev`."
+    "## Setup"
    ]
   },
   {
@@ -74,7 +74,7 @@
     "    import cirq\n",
     "except ImportError:\n",
     "    print(\"installing cirq...\")\n",
-    "    !pip install --upgrade --quiet cirq~=1.0.dev\n",
+    "    !pip install --quiet cirq\n",
     "    import cirq\n",
     "\n",
     "    print(\"installed cirq.\")"

docs/build/interop.ipynb

@@ -74,8 +74,7 @@
     "    import cirq\n",
     "except ImportError:\n",
     "    print(\"installing cirq...\")\n",
-    "    # Cirq 1.5 needed for OpenQASM 3.0 support",
-    "    !pip install --upgrade --quiet cirq~=1.0.dev\n",
+    "    !pip install --quiet cirq\n",
     "    print(\"installed cirq.\")"
    ]
   },
@@ -85,8 +84,7 @@
     "id": "S541ev7MvVe4"
    },
    "source": [
-    "Cirq has several features that allow the user to import/export from other quantum languages.",
-    "Note: this notebook relies on unreleased Cirq features. If you want to try these features, make sure you install cirq via `pip install --upgrade cirq~=1.0.dev`."
+    "Cirq has several features that allow the user to import/export from other quantum languages."
    ]
   },
   {

docs/noise/qcvv/parallel_xeb.ipynb

@@ -65,7 +65,7 @@
     "    import cirq\n",
     "except ImportError:\n",
     "    print(\"installing cirq...\")\n",
-    "    !pip install --upgrade --quiet cirq~=1.0.dev\n",
+    "    !pip install --quiet cirq\n",
     "    print(\"installed cirq.\")"
    ]
   },

docs/simulate/qvm_stabilizer_example.ipynb

@@ -504,7 +504,7 @@
    },
    "outputs": [],
    "source": [
-    "!pip install --upgrade --quiet cirq-web~=1.0.dev\n",
+    "!pip install --quiet cirq-web\n",
     "import cirq_web\n",
     "\n",
     "circuit_vis = cirq_web.Circuit3D(stabilizer_grid_circuit)\n",

docs/tutorials/google/colab.ipynb

@@ -84,7 +84,7 @@
     "    import cirq_google\n",
     "except ImportError:\n",
     "    print(\"installing cirq...\")\n",
-    "    !pip install --upgrade --quiet cirq-google~=1.0.dev\n",
+    "    !pip install --quiet cirq-google\n",
     "    print(\"installed cirq.\")\n",
     "    import cirq\n",
     "    import cirq_google"

docs/tutorials/google/start.ipynb

@@ -68,8 +68,7 @@
     "id": "fe7e28f44667"
    },
    "source": [
-    "## Setup\n",
-    "Note: this notebook relies on unreleased Cirq features. If you want to try these features, make sure you install cirq via `pip install --upgrade cirq-google~=1.0.dev`."
+    "## Setup"
    ]
   },
   {
@@ -85,7 +84,7 @@
     "    import cirq_google as cg\n",
     "except ImportError:\n",
     "    print(\"installing cirq-google and cirq...\")\n",
-    "    !pip install --upgrade --quiet cirq-google~=1.0.dev cirq~=1.0.dev\n",
+    "    !pip install --quiet cirq-google cirq\n",
     "    print(\"installed cirq-google and cirq.\")\n",
     "    import cirq\n",
     "    import cirq_google as cg"