mirror of
https://git.yoctoproject.org/poky
synced 2026-04-19 06:32:13 +02:00
python3-pytest: update 6.1.2 -> 6.2.1
(From OE-Core rev: 7c84d3b0112daa6006c35c19d66b544f7d2ef31b) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
34ec636f19
commit
9b894b9f96
@@ -1,8 +1,7 @@
|
||||
From ff784f4803ab33f5e3389e40d038d52d1e211843 Mon Sep 17 00:00:00 2001
|
||||
From ead04f2da75efeca3369feff6161ea4a8baecbc9 Mon Sep 17 00:00:00 2001
|
||||
From: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
|
||||
Date: Wed, 28 Aug 2019 16:12:27 +0900
|
||||
Subject: [PATCH] [PATCH] setup.py: remove the setup_requires for
|
||||
setuptools-scm
|
||||
Subject: [PATCH] setup.py: remove the setup_requires for setuptools-scm
|
||||
|
||||
The setup_requires argument forces the download of the egg file for setuptools-scm
|
||||
during the do_compile phase. This download is incompatible with the typical fetch
|
||||
@@ -18,22 +17,20 @@ 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.cfg | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/setup.cfg b/setup.cfg
|
||||
index 60f6564..c4d1471 100644
|
||||
index 6ed0792..0137090 100644
|
||||
--- a/setup.cfg
|
||||
+++ b/setup.cfg
|
||||
@@ -55,7 +55,6 @@ package_dir =
|
||||
@@ -53,7 +53,6 @@ package_dir =
|
||||
=src
|
||||
setup_requires =
|
||||
setuptools>=40.0
|
||||
- setuptools-scm
|
||||
setuptools>=>=42.0
|
||||
- setuptools-scm>=3.4
|
||||
zip_safe = no
|
||||
|
||||
[options.entry_points]
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b"
|
||||
|
||||
SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch "
|
||||
|
||||
SRC_URI[sha256sum] = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e"
|
||||
SRC_URI[sha256sum] = "66e419b1899bc27346cb2c993e12c5e5e8daba9073c1fbce33b9807abc95c306"
|
||||
|
||||
inherit update-alternatives pypi setuptools3
|
||||
|
||||
Reference in New Issue
Block a user