diff options
| author |   Huang Qiyu <huangqy.fnst@cn.fujitsu.com> | 2018-03-21 11:36:17 +0800 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2018-03-29 16:51:44 -0700 |
| commit | ded92f6f9841f08ba41281ba58e3a81dc397b87b (patch) | |
| tree | 363a229d85a067af28d0e909aec0a5973d734529 | |
| parent | f6958d9a398f237aa71076829b267156fe7bf3e7 (diff) | |
| download | meta-python2-ded92f6f9841f08ba41281ba58e3a81dc397b87b.tar.gz | |
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.
(From meta-openembedded commit: 99d18a6bc1a915ef5f07116e0fe684f56825a165)
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Tim Orling <ticotimo@gmail.com>
| -rw-r--r-- | recipes-devtools/python/python-pytest.inc | 4 | ||||
| -rw-r--r-- | recipes-devtools/python/python-pytest/pytest_version_fix.patch | 2 | ||||
| -rw-r--r-- | recipes-devtools/python/python-pytest_3.4.2.bb (renamed from recipes-devtools/python/python-pytest_3.4.1.bb) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/recipes-devtools/python/python-pytest.inc b/recipes-devtools/python/python-pytest.inc index 60ff830..4feb9a0 100644 --- a/recipes-devtools/python/python-pytest.inc +++ b/recipes-devtools/python/python-pytest.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://pytest.org" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c39b24965f4aef64222cb35de9d47cc4" -SRC_URI[md5sum] = "6768537cbb150022387c565051904a1c" -SRC_URI[sha256sum] = "9ddcb879c8cc859d2540204b5399011f842e5e8823674bf429f70ada281b3cc6" +SRC_URI[md5sum] = "1b83a25d45fad893f430fc5031653c56" +SRC_URI[sha256sum] = "117bad36c1a787e1a8a659df35de53ba05f9f3398fb9e4ac17e80ad5903eb8c5" SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch \ file://pytest_version_fix.patch " diff --git a/recipes-devtools/python/python-pytest/pytest_version_fix.patch b/recipes-devtools/python/python-pytest/pytest_version_fix.patch index 908f862..b373d93 100644 --- a/recipes-devtools/python/python-pytest/pytest_version_fix.patch +++ b/recipes-devtools/python/python-pytest/pytest_version_fix.patch @@ -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', diff --git a/recipes-devtools/python/python-pytest_3.4.1.bb b/recipes-devtools/python/python-pytest_3.4.2.bb index 201ab05..201ab05 100644 --- a/recipes-devtools/python/python-pytest_3.4.1.bb +++ b/recipes-devtools/python/python-pytest_3.4.2.bb |