Skip to content

Commit abdb5b6

Browse files
authored
Remove Rigetti from local checks (#5632)
This remove the rigetti integration tests from the default of `pytest-and-incremental-coverage` and hence of `all`. It keeps these tests in the CI workflow. The alternative to this would be to add the docker up and down to these scripts, but I'm hesitant to do this as these download external docker images. Fixes #4660
1 parent 4b7f322 commit abdb5b6

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ jobs:
224224
- name: Run Quil dependencies
225225
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
226226
- name: Coverage check
227-
run: check/pytest-and-incremental-coverage -n auto
227+
run: check/pytest-and-incremental-coverage -n auto --rigetti-integration
228228
- name: Stop Quil dependencies
229229
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml down
230230
windows:

check/pytest-and-incremental-coverage

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ source dev_tools/pypath
7272

7373
# Run tests while producing coverage files.
7474
check/pytest --actually-quiet \
75-
--rigetti-integration \
7675
--cov \
7776
--cov-config=dev_tools/conf/.coveragerc \
7877
"${PYTEST_ARGS[@]}"

dev_tools/bash_scripts_test.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
347347
assert result.returncode == 0
348348
assert result.stdout == (
349349
'INTERCEPTED check/pytest '
350-
'--actually-quiet --rigetti-integration --cov '
350+
'--actually-quiet --cov '
351351
'--cov-config=dev_tools/conf/.coveragerc\n'
352352
'The annotate command will be removed in a future version.\n'
353353
'Get in touch if you still use it: [email protected]\n'
@@ -374,7 +374,7 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
374374
assert result.returncode == 0
375375
assert result.stdout == (
376376
'INTERCEPTED check/pytest '
377-
'--actually-quiet --rigetti-integration --cov '
377+
'--actually-quiet --cov '
378378
'--cov-config=dev_tools/conf/.coveragerc\n'
379379
'The annotate command will be removed in a future version.\n'
380380
'Get in touch if you still use it: [email protected]\n'
@@ -393,7 +393,7 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
393393
assert result.returncode == 0
394394
assert result.stdout == (
395395
'INTERCEPTED check/pytest '
396-
'--actually-quiet --rigetti-integration --cov '
396+
'--actually-quiet --cov '
397397
'--cov-config=dev_tools/conf/.coveragerc\n'
398398
'The annotate command will be removed in a future version.\n'
399399
'Get in touch if you still use it: [email protected]\n'
@@ -412,7 +412,7 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
412412
assert result.returncode == 0
413413
assert result.stdout == (
414414
'INTERCEPTED check/pytest '
415-
'--actually-quiet --rigetti-integration --cov '
415+
'--actually-quiet --cov '
416416
'--cov-config=dev_tools/conf/.coveragerc\n'
417417
'The annotate command will be removed in a future version.\n'
418418
'Get in touch if you still use it: [email protected]\n'
@@ -431,7 +431,7 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
431431
assert result.returncode == 0
432432
assert result.stdout == (
433433
'INTERCEPTED check/pytest '
434-
'--actually-quiet --rigetti-integration --cov '
434+
'--actually-quiet --cov '
435435
'--cov-config=dev_tools/conf/.coveragerc\n'
436436
'The annotate command will be removed in a future version.\n'
437437
'Get in touch if you still use it: [email protected]\n'
@@ -462,7 +462,7 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
462462
assert result.returncode == 0
463463
assert result.stdout == (
464464
'INTERCEPTED check/pytest '
465-
'--actually-quiet --rigetti-integration --cov '
465+
'--actually-quiet --cov '
466466
'--cov-config=dev_tools/conf/.coveragerc\n'
467467
'The annotate command will be removed in a future version.\n'
468468
'Get in touch if you still use it: [email protected]\n'
@@ -481,7 +481,7 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
481481
assert result.returncode == 0
482482
assert result.stdout == (
483483
'INTERCEPTED check/pytest '
484-
'--actually-quiet --rigetti-integration --cov '
484+
'--actually-quiet --cov '
485485
'--cov-config=dev_tools/conf/.coveragerc\n'
486486
'The annotate command will be removed in a future version.\n'
487487
'Get in touch if you still use it: [email protected]\n'
@@ -507,7 +507,7 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
507507
assert result.returncode == 0
508508
assert result.stdout.startswith(
509509
'INTERCEPTED check/pytest '
510-
'--actually-quiet --rigetti-integration --cov '
510+
'--actually-quiet --cov '
511511
'--cov-config=dev_tools/conf/.coveragerc\n'
512512
'The annotate command will be removed in a future version.\n'
513513
'Get in touch if you still use it: [email protected]\n'

0 commit comments

Comments
 (0)