Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release pins from all pytest-related packages #6602

Merged
merged 3 commits into from
May 18, 2024
Merged

Release pins from all pytest-related packages #6602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
828fb1c
Release pins from all pytest-related packages
pavoljuhas May 15, 2024
d73e880
Update expected output from `pytest --cov` invocation
pavoljuhas May 15, 2024
26817c5
Bump up coverage~=7.4
pavoljuhas May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions dev_tools/bash_scripts_test.py
View file
Open in desktop
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: ned@nedbatchelder.com\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: ned@nedbatchelder.com\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: ned@nedbatchelder.com\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: ned@nedbatchelder.com\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: ned@nedbatchelder.com\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: ned@nedbatchelder.com\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: ned@nedbatchelder.com\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: ned@nedbatchelder.com\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
View file
Open in desktop
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