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

Jump to bottom

Pin pytest version to avoid induced breakage from more-itertools transitive dep #7238

Merged
merged 3 commits into from
Feb 12, 2019
Merged

Pin pytest version to avoid induced breakage from more-itertools transitive dep #7238

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
e615b43
pin pytest to 3.0.7 for introduced more-itertools breakage
cosmicexplorer Feb 12, 2019
dfa4966
add TODO with pytest issue link
cosmicexplorer Feb 12, 2019
277100d
modifying pytest output plurals for now-pinned pytest 3.0.7
cosmicexplorer Feb 12, 2019
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
4 changes: 3 additions & 1 deletion src/python/pants/backend/python/subsystems/pytest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ class PyTest(Subsystem):
def register_options(cls, register):
super(PyTest, cls).register_options(register)
# TODO: This is currently bounded below `3.7` due to #6282.
register('--requirements', advanced=True, default='pytest>=3.0.7,<3.7',
# TODO: Additionally, this is temporarily pinned to 3.0.7 due to more-itertools 6.0.0 dropping
# Python 2 support: https://github.com/pytest-dev/pytest/issues/4770.
register('--requirements', advanced=True, default='pytest==3.0.7',
help='Requirements string for the pytest library.')
register('--timeout-requirements', advanced=True, default='pytest-timeout>=1.2,<1.3',
help='Requirements string for the pytest-timeout library.')
Expand Down
12 changes: 6 additions & 6 deletions tests/python/pants_test/rules/test_test_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def test_passing_python_test(self):
platform SOME_TEXT
rootdir: SOME_TEXT
plugins: SOME_TEXT
collected 1 item
collected 1 items

testprojects/tests/python/pants/dummies/test_pass.py . [100%]

Expand All @@ -92,7 +92,7 @@ def test_failing_python_test(self):
platform SOME_TEXT
rootdir: SOME_TEXT
plugins: SOME_TEXT
collected 1 item
collected 1 items

testprojects/tests/python/pants/dummies/test_fail.py F [100%]

Expand Down Expand Up @@ -120,7 +120,7 @@ def test_source_dep(self):
platform SOME_TEXT
rootdir: SOME_TEXT
plugins: SOME_TEXT
collected 1 item
collected 1 items

testprojects/tests/python/pants/dummies/test_with_source_dep.py . [100%]

Expand All @@ -139,7 +139,7 @@ def test_thirdparty_dep(self):
platform SOME_TEXT
rootdir: SOME_TEXT
plugins: SOME_TEXT
collected 1 item
collected 1 items

testprojects/tests/python/pants/dummies/test_with_thirdparty_dep.py . [100%]

Expand All @@ -160,7 +160,7 @@ def test_mixed_python_tests(self):
platform SOME_TEXT
rootdir: SOME_TEXT
plugins: SOME_TEXT
collected 1 item
collected 1 items

testprojects/tests/python/pants/dummies/test_fail.py F [100%]

Expand All @@ -177,7 +177,7 @@ def test_fail():
platform SOME_TEXT
rootdir: SOME_TEXT
plugins: SOME_TEXT
collected 1 item
collected 1 items

testprojects/tests/python/pants/dummies/test_pass.py . [100%]

Expand Down