python-pytest: 3.4.1 -> 3.4.2

1.Upgrade python-pytest from 3.4.1 to 3.4.2.
2.Modify pytest_version_fix.patch, since the data has been changed.

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
This commit is contained in:
Huang Qiyu
2018-03-21 11:36:17 +08:00
committed by Armin Kuster
parent cf3c79fa79
commit 99d18a6bc1
3 changed files with 3 additions and 3 deletions

View File

@@ -36,7 +36,7 @@ Index: pytest-3.2.2/setup.py
+ return version_match.group(1)
+ raise RuntimeError("Unable to find version string.")
def has_environment_marker_support():
def get_environment_marker_support_level():
"""
@@ -59,9 +72,7 @@ def main():
name='pytest',