Skip to content

Commit

Permalink
Remove Rigetti from local checks (quantumlib#5632)
Browse files Browse the repository at this point in the history
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 quantumlib#4660
  • Loading branch information
dabacon authored Jun 27, 2022
1 parent 4b7f322 commit abdb5b6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ jobs:
- name: Run Quil dependencies
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
- name: Coverage check
run: check/pytest-and-incremental-coverage -n auto
run: check/pytest-and-incremental-coverage -n auto --rigetti-integration
- name: Stop Quil dependencies
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml down
windows:
Expand Down
1 change: 0 additions & 1 deletion check/pytest-and-incremental-coverage
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ source dev_tools/pypath

# Run tests while producing coverage files.
check/pytest --actually-quiet \
--rigetti-integration \
--cov \
--cov-config=dev_tools/conf/.coveragerc \
"${PYTEST_ARGS[@]}"
Expand Down
16 changes: 8 additions & 8 deletions dev_tools/bash_scripts_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
assert result.returncode == 0
assert result.stdout == (
'INTERCEPTED check/pytest '
'--actually-quiet --rigetti-integration --cov '
'--actually-quiet --cov '
'--cov-config=dev_tools/conf/.coveragerc\n'
'The annotate command will be removed in a future version.\n'
'Get in touch if you still use it: [email protected]\n'
Expand All @@ -374,7 +374,7 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
assert result.returncode == 0
assert result.stdout == (
'INTERCEPTED check/pytest '
'--actually-quiet --rigetti-integration --cov '
'--actually-quiet --cov '
'--cov-config=dev_tools/conf/.coveragerc\n'
'The annotate command will be removed in a future version.\n'
'Get in touch if you still use it: [email protected]\n'
Expand All @@ -393,7 +393,7 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
assert result.returncode == 0
assert result.stdout == (
'INTERCEPTED check/pytest '
'--actually-quiet --rigetti-integration --cov '
'--actually-quiet --cov '
'--cov-config=dev_tools/conf/.coveragerc\n'
'The annotate command will be removed in a future version.\n'
'Get in touch if you still use it: [email protected]\n'
Expand All @@ -412,7 +412,7 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
assert result.returncode == 0
assert result.stdout == (
'INTERCEPTED check/pytest '
'--actually-quiet --rigetti-integration --cov '
'--actually-quiet --cov '
'--cov-config=dev_tools/conf/.coveragerc\n'
'The annotate command will be removed in a future version.\n'
'Get in touch if you still use it: [email protected]\n'
Expand All @@ -431,7 +431,7 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
assert result.returncode == 0
assert result.stdout == (
'INTERCEPTED check/pytest '
'--actually-quiet --rigetti-integration --cov '
'--actually-quiet --cov '
'--cov-config=dev_tools/conf/.coveragerc\n'
'The annotate command will be removed in a future version.\n'
'Get in touch if you still use it: [email protected]\n'
Expand Down Expand Up @@ -462,7 +462,7 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
assert result.returncode == 0
assert result.stdout == (
'INTERCEPTED check/pytest '
'--actually-quiet --rigetti-integration --cov '
'--actually-quiet --cov '
'--cov-config=dev_tools/conf/.coveragerc\n'
'The annotate command will be removed in a future version.\n'
'Get in touch if you still use it: [email protected]\n'
Expand All @@ -481,7 +481,7 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
assert result.returncode == 0
assert result.stdout == (
'INTERCEPTED check/pytest '
'--actually-quiet --rigetti-integration --cov '
'--actually-quiet --cov '
'--cov-config=dev_tools/conf/.coveragerc\n'
'The annotate command will be removed in a future version.\n'
'Get in touch if you still use it: [email protected]\n'
Expand All @@ -507,7 +507,7 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
assert result.returncode == 0
assert result.stdout.startswith(
'INTERCEPTED check/pytest '
'--actually-quiet --rigetti-integration --cov '
'--actually-quiet --cov '
'--cov-config=dev_tools/conf/.coveragerc\n'
'The annotate command will be removed in a future version.\n'
'Get in touch if you still use it: [email protected]\n'
Expand Down

0 comments on commit abdb5b6

Please sign in to comment.