jenkins-bot merged this change.

View Change

[bugfix] Fix pytest, pytest-cov and pytest-timeout requirements

- remove pytest-timeout limits for pytest, which are handled by
  pytest-timeout's setup.py
- fix unreal pytest-cov limits for py2 introduced in 6d0d18da0834:
  pytest-cov since 2.6 doesn't support py2, but we require
  pytest-cov >= 2.6.1 for pytest >= 4.1
- pytest-cov since 2.9 doesn't support py34

Bug: T255349
Change-Id: Ie85f78f32c919c86b67c992afac59e7e054bb13f
---
M dev-requirements.txt
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-requirements.txt b/dev-requirements.txt
index dba1827..c6714ac 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,10 +1,13 @@
 # This is a PIP 6+ requirements file for development dependencies
 #
-pytest>=3.6.0,<5.0.0 ; python_version < '3.5'
-pytest>=3.6.0 ; python_version >= '3.5'
+pytest < 4.1 ; python_version < '3'
+pytest-cov < 2.6 ; python_version < '3'
+pytest < 5 ; python_version == '3.4'
+pytest-cov >= 2.6.1, < 2.9 ; python_version == '3.4'
+pytest ; python_version >= '3.5'
+pytest-cov >= 2.6.1 ; python_version >= '3.5'
 pytest-timeout
 pytest-runner
-pytest-cov>=2.6.1
 pytest-attrib>=0.1.3
 # pytest-httpbin needs httpbin needs werkzeug >= 0.14.1
 # Python 3.8 needs werkzeug >= 0.15.5

To view, visit change 606709. To unsubscribe, or for help writing mail filters, visit settings.