diff options
Diffstat (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python3-pytest')
-rw-r--r-- | meta-openembedded/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch index c29fb12de..8c5c17247 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch +++ b/meta-openembedded/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 |