Skip to content

Commit

Permalink
Release pins from all pytest-related packages (#6602)
Browse files Browse the repository at this point in the history
Remove top-version limits on the pytest-related package.
These pins were introduced a while ago and are hopefully
not needed anymore.

Require coverage>=7.4 which is the first minor release with
the updated test-passing output from `coverage annotate`.
  • Loading branch information
pavoljuhas authored May 18, 2024
1 parent bf67f29 commit df07e94
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 22 deletions.
16 changes: 0 additions & 16 deletions dev_tools/bash_scripts_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,6 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
assert result.stdout == (
'INTERCEPTED check/pytest '
'--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'
'No data to report.\n'
'INTERCEPTED '
'python dev_tools/check_incremental_coverage_annotations.py HEAD\n'
Expand All @@ -372,8 +370,6 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
assert result.stdout == (
'INTERCEPTED check/pytest '
'--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'
'No data to report.\n'
'INTERCEPTED '
'python dev_tools/check_incremental_coverage_annotations.py main\n'
Expand All @@ -390,8 +386,6 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
assert result.stdout == (
'INTERCEPTED check/pytest '
'--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'
'No data to report.\n'
'INTERCEPTED '
'python dev_tools/check_incremental_coverage_annotations.py origin/main\n'
Expand All @@ -408,8 +402,6 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
assert result.stdout == (
'INTERCEPTED check/pytest '
'--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'
'No data to report.\n'
'INTERCEPTED '
'python dev_tools/check_incremental_coverage_annotations.py upstream/main\n'
Expand All @@ -426,8 +418,6 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
assert result.stdout == (
'INTERCEPTED check/pytest '
'--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'
'No data to report.\n'
'INTERCEPTED '
'python dev_tools/check_incremental_coverage_annotations.py upstream/main\n'
Expand Down Expand Up @@ -456,8 +446,6 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
assert result.stdout == (
'INTERCEPTED check/pytest '
'--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'
'No data to report.\n'
'INTERCEPTED '
'python dev_tools/check_incremental_coverage_annotations.py HEAD\n'
Expand All @@ -474,8 +462,6 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
assert result.stdout == (
'INTERCEPTED check/pytest '
'--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'
'No data to report.\n'
'INTERCEPTED '
'python dev_tools/check_incremental_coverage_annotations.py main\n'
Expand All @@ -499,8 +485,6 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
assert result.stdout.startswith(
'INTERCEPTED check/pytest '
'--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'
'No data to report.\n'
'INTERCEPTED '
'python dev_tools/check_incremental_coverage_annotations.py '
Expand Down
10 changes: 4 additions & 6 deletions dev_tools/requirements/deps/pytest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,16 @@

pytest
pytest-asyncio
# pytest-cov 4.1.0 discards line hits in subprocess (coverage failures in #6208)
pytest-cov~=3.0
pytest-cov
pytest-randomly
# Notebook >=6.4.8 + coverage > 6.2 hangs CI: https://github.com/quantumlib/Cirq/issues/4897
coverage<=6.2
coverage~=7.4

# for parallel testing notebooks
pytest-xdist~=2.2.0
pytest-xdist
filelock~=3.1

# For testing time specific logic
freezegun~=0.3.15
freezegun

# For test_metadata_distributions_after_deprecated_submodule
importlib-metadata
Expand Down

0 comments on commit df07e94

Please sign in to comment.