Skip to content

Commit 5b7b362

Browse files
authored
Remove cirq-rigetti vendor module (#7488)
- Delete the `cirq-rigetti` vendor module - Ignore deleted files in check/pylint-changed-files - Remove redundant pytest marker `rigetti_integration` - Remove `cirq_rigetti` references from typecheck configuration - Remove references to non-existing files from Python sources - Remove link to `cirq-rigetti` from the Cirq start notebook - Remove `cirq-rigetti` from Hardware and Reference sections of Cirq webpage - Delete `cirq-rigetti` web documentation and `getting_started` notebook Resolves #7297
1 parent 938d950 commit 5b7b362

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+12
-9804
lines changed

.github/workflows/ci-daily.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
-r dev_tools/requirements/deps/pytest.txt \
3939
-r dev_tools/requirements/deps/notebook.txt
4040
- name: Pytest check
41-
run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --ignore=cirq-rigetti --enable-slow-tests
41+
run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --enable-slow-tests
4242
windows:
4343
if: github.repository_owner == 'quantumlib'
4444
name: Pytest Windows
@@ -63,7 +63,7 @@ jobs:
6363
pip install -r dev_tools/requirements/deps/pytest.txt &&
6464
pip install -r dev_tools/requirements/deps/notebook.txt
6565
- name: Pytest Windows
66-
run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --ignore=cirq-rigetti --enable-slow-tests
66+
run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --enable-slow-tests
6767
shell: bash
6868
macos:
6969
if: github.repository_owner == 'quantumlib'
@@ -90,4 +90,4 @@ jobs:
9090
-r dev_tools/requirements/deps/pytest.txt \
9191
-r dev_tools/requirements/deps/notebook.txt
9292
- name: Pytest check
93-
run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --ignore=cirq-rigetti --enable-slow-tests
93+
run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --enable-slow-tests

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ jobs:
206206
pip install --upgrade setuptools wheel
207207
pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
208208
- name: Pytest check
209-
run: check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib --ignore=cirq-rigetti
209+
run: check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib
210210
# TODO(#6706) remove after we start using NumPy 2.0 in regular pytest
211211
pytest-numpy-2:
212212
if: github.repository_owner == 'quantumlib'
@@ -232,7 +232,7 @@ jobs:
232232
pip install wheel
233233
pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev-np2.env.txt
234234
- name: Pytest check
235-
run: check/pytest -n auto --durations=20 --ignore=cirq-rigetti
235+
run: check/pytest -n auto --durations=20
236236
pip-compile:
237237
if: github.repository_owner == 'quantumlib'
238238
name: Check consistency of requirements
@@ -292,7 +292,7 @@ jobs:
292292
pip install --upgrade setuptools wheel
293293
pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
294294
- name: Coverage check
295-
run: check/pytest-and-incremental-coverage -n auto --ignore=cirq-rigetti
295+
run: check/pytest-and-incremental-coverage -n auto
296296
- name: Upload coverage reports to Codecov
297297
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5
298298
env:
@@ -323,7 +323,7 @@ jobs:
323323
- name: Pytest Windows
324324
run: |
325325
source dev_tools/pypath
326-
check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib --ignore=cirq-rigetti
326+
check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib
327327
shell: bash
328328
macos:
329329
if: github.repository_owner == 'quantumlib'
@@ -349,7 +349,7 @@ jobs:
349349
pip install --upgrade setuptools wheel
350350
pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/no-contrib.env.txt
351351
- name: Pytest check
352-
run: check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib --ignore=cirq-rigetti
352+
run: check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib
353353
notebooks-stable:
354354
if: github.repository_owner == 'quantumlib'
355355
name: Changed Notebooks Isolated Test against Cirq stable

check/mypy

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@ CONFIG_FILE='mypy.ini'
1717
read -r -a CIRQ_PACKAGES < \
1818
<(env PYTHONPATH=. python dev_tools/modules.py list --mode package-path)
1919

20-
# TODO(#7297) clean up after cirq-rigetti removal
21-
for i in "${!CIRQ_PACKAGES[@]}"; do
22-
if [[ "${CIRQ_PACKAGES[i]}" == cirq-rigetti* ]]; then
23-
unset "CIRQ_PACKAGES[i]"
24-
fi
25-
done
26-
2720
echo -e -n "\033[31m"
2821
mypy --config-file=dev_tools/conf/$CONFIG_FILE "$@" "${CIRQ_PACKAGES[@]}" dev_tools examples
2922
result=$?

check/pylint-changed-files

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ fi
5656

5757
typeset -a changed
5858
IFS=$'\n' read -r -d '' -a changed < \
59-
<(git diff --name-only "${rev}" -- '*.py' ':(exclude)cirq-google/cirq_google/cloud/*' ':(exclude)*_pb2.py' \
59+
<(git diff --name-only --diff-filter=d "${rev}" -- \
60+
"*.py" ":(exclude)cirq-google/cirq_google/cloud/*" ":(exclude)*_pb2.py" \
6061
| grep -E "^(cirq|dev_tools|examples).*.py$"
6162
)
6263

cirq-core/cirq/protocols/hash_from_pickle_test.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@
5050
"cirq/protocols/json_test_data/sympy.Indexed.json",
5151
"cirq/protocols/json_test_data/sympy.IndexedBase.json",
5252
"cirq/protocols/json_test_data/sympy.pi.json",
53-
# Cirq-Rigetti is deprecated per #7058
54-
# Instead of handling deprecation-in-test errors we exclude
55-
# all cirq_rigetti classes here.
56-
"cirq_rigetti/json_test_data/AspenQubit.json",
57-
"cirq_rigetti/json_test_data/OctagonalQubit.json",
58-
# RigettiQCSAspenDevice does not pickle
59-
"cirq_rigetti/json_test_data/RigettiQCSAspenDevice.json",
6053
)
6154

6255

@@ -87,11 +80,9 @@ def _read_json(json_filename: str) -> Any:
8780

8881
def test_exclude_json_files_has_valid_entries() -> None:
8982
"""Verify _EXCLUDE_JSON_FILES has valid entries."""
90-
# cirq_rigetti is getting removed per #7058
91-
skip_rigetti = True
9283
json_file_validates = lambda f: any(
9384
m.test_data_path.joinpath(os.path.basename(f)).is_file() for m in MODULE_TEST_SPECS
94-
) or (skip_rigetti and f.startswith("cirq_rigetti/"))
85+
)
9586
invalid_json_paths = [f for f in _EXCLUDE_JSON_FILES if not json_file_validates(f)]
9687
assert invalid_json_paths == []
9788

cirq-rigetti/LICENSE

Lines changed: 0 additions & 201 deletions
This file was deleted.

0 commit comments

Comments
 (0)