Remove cirq-rigetti vendor module

.github/workflows/ci-daily.yml

@@ -38,7 +38,7 @@ jobs:
               -r dev_tools/requirements/deps/pytest.txt \
               -r dev_tools/requirements/deps/notebook.txt
       - name: Pytest check
-        run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --ignore=cirq-rigetti --enable-slow-tests
+        run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --enable-slow-tests
   windows:
     if: github.repository_owner == 'quantumlib'
     name: Pytest Windows
@@ -63,7 +63,7 @@ jobs:
             pip install -r dev_tools/requirements/deps/pytest.txt &&
             pip install -r dev_tools/requirements/deps/notebook.txt
       - name: Pytest Windows
-        run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --ignore=cirq-rigetti --enable-slow-tests
+        run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --enable-slow-tests
         shell: bash
   macos:
     if: github.repository_owner == 'quantumlib'
@@ -90,4 +90,4 @@ jobs:
               -r dev_tools/requirements/deps/pytest.txt \
               -r dev_tools/requirements/deps/notebook.txt
       - name: Pytest check
-        run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --ignore=cirq-rigetti --enable-slow-tests
+        run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --enable-slow-tests

.github/workflows/ci.yml

@@ -206,7 +206,7 @@ jobs:
           pip install --upgrade setuptools wheel
           pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
       - name: Pytest check
-        run: check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib --ignore=cirq-rigetti
+        run: check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib
   # TODO(#6706) remove after we start using NumPy 2.0 in regular pytest
   pytest-numpy-2:
     if: github.repository_owner == 'quantumlib'
@@ -232,7 +232,7 @@ jobs:
           pip install wheel
           pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev-np2.env.txt
       - name: Pytest check
-        run: check/pytest -n auto --durations=20 --ignore=cirq-rigetti
+        run: check/pytest -n auto --durations=20
   pip-compile:
     if: github.repository_owner == 'quantumlib'
     name: Check consistency of requirements
@@ -292,7 +292,7 @@ jobs:
           pip install --upgrade setuptools wheel
           pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
       - name: Coverage check
-        run: check/pytest-and-incremental-coverage -n auto --ignore=cirq-rigetti
+        run: check/pytest-and-incremental-coverage -n auto
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5
         env:
@@ -323,7 +323,7 @@ jobs:
       - name: Pytest Windows
         run: |
           source dev_tools/pypath
-          check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib --ignore=cirq-rigetti
+          check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib
         shell: bash
   macos:
     if: github.repository_owner == 'quantumlib'
@@ -349,7 +349,7 @@ jobs:
           pip install --upgrade setuptools wheel
           pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/no-contrib.env.txt
       - name: Pytest check
-        run: check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib --ignore=cirq-rigetti
+        run: check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib
   notebooks-stable:
     if: github.repository_owner == 'quantumlib'
     name: Changed Notebooks Isolated Test against Cirq stable

check/mypy

@@ -17,13 +17,6 @@ CONFIG_FILE='mypy.ini'
 read -r -a CIRQ_PACKAGES < \
     <(env PYTHONPATH=. python dev_tools/modules.py list --mode package-path)
 
-# TODO(#7297) clean up after cirq-rigetti removal
-for i in "${!CIRQ_PACKAGES[@]}"; do
-    if [[ "${CIRQ_PACKAGES[i]}" == cirq-rigetti* ]]; then
-        unset "CIRQ_PACKAGES[i]"
-    fi
-done
-
 echo -e -n "\033[31m"
 mypy --config-file=dev_tools/conf/$CONFIG_FILE "$@" "${CIRQ_PACKAGES[@]}" dev_tools examples
 result=$?

check/pylint-changed-files

@@ -56,7 +56,8 @@ fi
 
 typeset -a changed
 IFS=$'\n' read -r -d '' -a changed < \
-    <(git diff --name-only "${rev}" -- '*.py' ':(exclude)cirq-google/cirq_google/cloud/*' ':(exclude)*_pb2.py' \
+    <(git diff --name-only --diff-filter=d "${rev}" -- \
+    "*.py" ":(exclude)cirq-google/cirq_google/cloud/*" ":(exclude)*_pb2.py" \
     | grep -E "^(cirq|dev_tools|examples).*.py$"
 )
 

cirq-core/cirq/protocols/hash_from_pickle_test.py

@@ -50,13 +50,6 @@
     "cirq/protocols/json_test_data/sympy.Indexed.json",
     "cirq/protocols/json_test_data/sympy.IndexedBase.json",
     "cirq/protocols/json_test_data/sympy.pi.json",
-    # Cirq-Rigetti is deprecated per #7058
-    # Instead of handling deprecation-in-test errors we exclude
-    # all cirq_rigetti classes here.
-    "cirq_rigetti/json_test_data/AspenQubit.json",
-    "cirq_rigetti/json_test_data/OctagonalQubit.json",
-    # RigettiQCSAspenDevice does not pickle
-    "cirq_rigetti/json_test_data/RigettiQCSAspenDevice.json",
 )
 
 
@@ -87,11 +80,9 @@ def _read_json(json_filename: str) -> Any:
 
 def test_exclude_json_files_has_valid_entries() -> None:
     """Verify _EXCLUDE_JSON_FILES has valid entries."""
-    # cirq_rigetti is getting removed per #7058
-    skip_rigetti = True
     json_file_validates = lambda f: any(
         m.test_data_path.joinpath(os.path.basename(f)).is_file() for m in MODULE_TEST_SPECS
-    ) or (skip_rigetti and f.startswith("cirq_rigetti/"))
+    )
     invalid_json_paths = [f for f in _EXCLUDE_JSON_FILES if not json_file_validates(f)]
     assert invalid_json_paths == []