Skip to content

Commit df07e94

Browse files
authored
Release pins from all pytest-related packages (#6602)
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`.
1 parent bf67f29 commit df07e94

File tree

2 files changed

+4
-22
lines changed

2 files changed

+4
-22
lines changed

dev_tools/bash_scripts_test.py

-16
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,6 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
346346
assert result.stdout == (
347347
'INTERCEPTED check/pytest '
348348
'--cov --cov-config=dev_tools/conf/.coveragerc\n'
349-
'The annotate command will be removed in a future version.\n'
350-
'Get in touch if you still use it: [email protected]\n'
351349
'No data to report.\n'
352350
'INTERCEPTED '
353351
'python dev_tools/check_incremental_coverage_annotations.py HEAD\n'
@@ -372,8 +370,6 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
372370
assert result.stdout == (
373371
'INTERCEPTED check/pytest '
374372
'--cov --cov-config=dev_tools/conf/.coveragerc\n'
375-
'The annotate command will be removed in a future version.\n'
376-
'Get in touch if you still use it: [email protected]\n'
377373
'No data to report.\n'
378374
'INTERCEPTED '
379375
'python dev_tools/check_incremental_coverage_annotations.py main\n'
@@ -390,8 +386,6 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
390386
assert result.stdout == (
391387
'INTERCEPTED check/pytest '
392388
'--cov --cov-config=dev_tools/conf/.coveragerc\n'
393-
'The annotate command will be removed in a future version.\n'
394-
'Get in touch if you still use it: [email protected]\n'
395389
'No data to report.\n'
396390
'INTERCEPTED '
397391
'python dev_tools/check_incremental_coverage_annotations.py origin/main\n'
@@ -408,8 +402,6 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
408402
assert result.stdout == (
409403
'INTERCEPTED check/pytest '
410404
'--cov --cov-config=dev_tools/conf/.coveragerc\n'
411-
'The annotate command will be removed in a future version.\n'
412-
'Get in touch if you still use it: [email protected]\n'
413405
'No data to report.\n'
414406
'INTERCEPTED '
415407
'python dev_tools/check_incremental_coverage_annotations.py upstream/main\n'
@@ -426,8 +418,6 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
426418
assert result.stdout == (
427419
'INTERCEPTED check/pytest '
428420
'--cov --cov-config=dev_tools/conf/.coveragerc\n'
429-
'The annotate command will be removed in a future version.\n'
430-
'Get in touch if you still use it: [email protected]\n'
431421
'No data to report.\n'
432422
'INTERCEPTED '
433423
'python dev_tools/check_incremental_coverage_annotations.py upstream/main\n'
@@ -456,8 +446,6 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
456446
assert result.stdout == (
457447
'INTERCEPTED check/pytest '
458448
'--cov --cov-config=dev_tools/conf/.coveragerc\n'
459-
'The annotate command will be removed in a future version.\n'
460-
'Get in touch if you still use it: [email protected]\n'
461449
'No data to report.\n'
462450
'INTERCEPTED '
463451
'python dev_tools/check_incremental_coverage_annotations.py HEAD\n'
@@ -474,8 +462,6 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
474462
assert result.stdout == (
475463
'INTERCEPTED check/pytest '
476464
'--cov --cov-config=dev_tools/conf/.coveragerc\n'
477-
'The annotate command will be removed in a future version.\n'
478-
'Get in touch if you still use it: [email protected]\n'
479465
'No data to report.\n'
480466
'INTERCEPTED '
481467
'python dev_tools/check_incremental_coverage_annotations.py main\n'
@@ -499,8 +485,6 @@ def test_pytest_and_incremental_coverage_branch_selection(tmpdir_factory):
499485
assert result.stdout.startswith(
500486
'INTERCEPTED check/pytest '
501487
'--cov --cov-config=dev_tools/conf/.coveragerc\n'
502-
'The annotate command will be removed in a future version.\n'
503-
'Get in touch if you still use it: [email protected]\n'
504488
'No data to report.\n'
505489
'INTERCEPTED '
506490
'python dev_tools/check_incremental_coverage_annotations.py '

dev_tools/requirements/deps/pytest.txt

+4-6
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

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

119
# for parallel testing notebooks
12-
pytest-xdist~=2.2.0
10+
pytest-xdist
1311
filelock~=3.1
1412

1513
# For testing time specific logic
16-
freezegun~=0.3.15
14+
freezegun
1715

1816
# For test_metadata_distributions_after_deprecated_submodule
1917
importlib-metadata

0 commit comments

Comments
 (0)