Skip to contentSkip to conversation

python3-pytest: display correct version info

PATCH New kai 1 participant 1 message Aug 1, 2021

lore
Share & tools
lore

kai

author
#0 lore raw

PATCH v2 1/1 python3-pytest: display correct version info

From: Kai Kang <[email protected]>

It does not show correct version info of python3-pytest:

$ pip3 list | grep pytest
pytest             0.0.0

pytest requires setuptools-scm in setup.cfg. It could be met by adding python3-setuptools-scm-native to dependency and then it will not download egg file of setuptools-scm during do_compile any more. So remove 0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch and depend on python3-setuptools-scm-native to make it show the correct version info.

---
 ...he-setup_requires-for-setuptools-scm.patch | 36 -------------------
 .../python/python3-pytest_6.2.4.bb            |  4 +--
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch deleted +0 -36
deleted file mode 100644
index 1abd531c62..0000000000
@@ -1,36 +0,0 @@
-From ead04f2da75efeca3369feff6161ea4a8baecbc9 Mon Sep 17 00:00:00 2001
-From: Yuan Chao <[email protected]>
-Date: Wed, 28 Aug 2019 16:12:27 +0900
-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
-and mirror structure.  The only usage of scm is the generation of the _version.py
-file and in the release tarball it is already correctly created
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Derek Straka <[email protected]>
-
-Signed-off-by: Yuan Chao <[email protected]>
-
-Rebase for pytest 6.1.0.
-
-Signed-off-by: Kai Kang <[email protected]>
-
----
- setup.cfg | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/setup.cfg b/setup.cfg
-index 6ed0792..0137090 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -53,7 +53,6 @@ package_dir =
- 	=src
- setup_requires = 
- 	setuptools>=>=42.0
--	setuptools-scm>=3.4
- zip_safe = no
- 
- [options.entry_points]
meta/recipes-devtools/python/python3-pytest_6.2.4.bb +2 -2
index fa43e6ebf0..6d514d17a2 100644
@@ -5,10 +5,10 @@ DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scal
 LICENSE = "MIT"
 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] = "50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"
 
+DEPENDS = "python3-setuptools-scm-native"
+
 inherit update-alternatives pypi setuptools3
 
 RDEPENDS_${PN}_class-target += " \
Signature · 1 line
2.17.1