Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com>
---
...-the-setup_requires-for-setuptools-scm.patch | 17 +++++++----------
...-pytest_6.1.2.bb => python3-pytest_6.2.1.bb} | 2 +-
2 files changed, 8 insertions(+), 11 deletions(-)
rename meta/recipes-devtools/python/{python3-pytest_6.1.2.bb =>
python3-pytest_6.2.1.bb} (92%)
diff --git
a/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
b/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
index 8c5c17247e..1abd531c62 100644
---
a/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
+++
b/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
@@ -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.f...@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.f...@cn.fujitsu.com>
Rebase for pytest 6.1.0.
Signed-off-by: Kai Kang <kai.k...@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
-
diff --git a/meta/recipes-devtools/python/python3-pytest_6.1.2.bb
b/meta/recipes-devtools/python/python3-pytest_6.2.1.bb
similarity index 92%
rename from meta/recipes-devtools/python/python3-pytest_6.1.2.bb
rename to meta/recipes-devtools/python/python3-pytest_6.2.1.bb
index 6fc3b6f328..6843b4da25 100644
--- a/meta/recipes-devtools/python/python3-pytest_6.1.2.bb
+++ b/meta/recipes-devtools/python/python3-pytest_6.2.1.bb
@@ -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
--
2.29.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#146263):
https://lists.openembedded.org/g/openembedded-core/message/146263
Mute This Topic: https://lists.openembedded.org/mt/79276797/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
