From b8eb80b98524451327b663441a72b701de64cf78 Mon Sep 17 00:00:00 2001
From: Kai Kang <kai.kang@windriver.com>
Date: Sun, 27 Sep 2020 16:43:20 +0800
Subject: python3-pytest: 5.4.3 -> 6.1.0

Upgrade python3-pytest from 5.4.3 to 6.1.0
* add runtime dependency python3-iniconfig

And the release changelog is at:

https://docs.pytest.org/en/stable/changelog.html#pytest-6-1-0-2020-09-26

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Acked-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...ove-the-setup_requires-for-setuptools-scm.patch | 35 ++++++++++++----------
 1 file changed, 19 insertions(+), 16 deletions(-)

(limited to 'meta-python/recipes-devtools/python/python3-pytest')

diff --git a/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
index c29fb12de8..8c5c17247e 100644
--- a/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
+++ b/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
@@ -14,23 +14,26 @@ Upstream-Status: Inappropriate [oe specific]
 Signed-off-by: Derek Straka <derek@asterius.io>
 
 Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
+
+Rebase for pytest 6.1.0.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
 ---
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index adbafb5..75fdd09 100644
---- a/setup.py
-+++ b/setup.py
-@@ -19,7 +19,7 @@ INSTALL_REQUIRES = [
- def main():
-     setup(
-         use_scm_version={"write_to": "src/_pytest/_version.py"},
--        setup_requires=["setuptools-scm", "setuptools>=40.0"],
-+        setup_requires=["setuptools>=40.0"],
-         package_dir={"": "src"},
-         extras_require={
-             "testing": [
+ setup.cfg | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 60f6564..c4d1471 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -55,7 +55,6 @@ package_dir =
+ 	=src
+ setup_requires = 
+ 	setuptools>=40.0
+-	setuptools-scm
+ zip_safe = no
+ 
+ [options.entry_points]
 -- 
 2.17.1
 
-- 
cgit v1.2.3-54-g00ecf