mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

python3-pytest: display correct version info

Browse Source 
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.

(From OE-Core rev: 9159db64d3b3c7633deb135e683317fd3e98852c)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kai Kang
2021-08-01 19:41:30 +08:00
committed by Richard Purdie
parent 825043ec77
commit aeaafe2fa5
2 changed files with 2 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
View File

@@ -1,36 +0,0 @@
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] 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 <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.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]

4
meta/recipes-devtools/python/python3-pytest_6.2.4.bb
View File

@@ -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 += " \