Skip to contentSkip to conversation

python3-pytest: fix display version info

PATCH Superseded kai 2 participants 5 messages Jul 30, 2021 – Aug 1, 2021

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

kai

author
#0 lore raw

PATCH 1/1 python3-pytest: fix display version info

From: Kai Kang <[email protected]>

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

$ pip3 list | grep pytest
pytest             0.0.0

Remove 0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch and depends on python3-setuptools-scm-native to make it right.

---
 ...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
#1 lore raw
Quoted 23 lines · kai

From: Kai Kang <[email protected]>

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

$ pip3 list | grep pytest
pytest             0.0.0

Remove 0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch and depends on python3-setuptools-scm-native to make it right.

---
 ...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 -0
deleted file mode 100644
index 1abd531c62..0000000000

meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch line 10

Quoted 10 lines
meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch deleted +0 -10
@@ -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
-

Recipes should not be downloading during do_compile. We need to fix this in some other way, we can't just remove the patch.

Cheers,

Richard

author
#2 lore raw
Quoted 37 lines · Richard Purdie
Quoted 23 lines · kai

From: Kai Kang <[email protected]>

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

$ pip3 list | grep pytest
pytest             0.0.0

Remove 0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch and depends on python3-setuptools-scm-native to make it right.

---
  ...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 -0
deleted file mode 100644
index 1abd531c62..0000000000

meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch line 10

Quoted 10 lines
meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch deleted +0 -10
@@ -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
-

Recipes should not be downloading during do_compile. We need to fix this in some other way, we can't just remove the patch.

Quoted 4 lines

Cheers,

Richard

Hi Richard,

It calls pip to download the egg file for setuptools-scm. But pip is not a dependency and does not exist in sysroot, so it fails when remove the patch and "python3-setuptools-scm-native" is not a dependency:

| DEBUG: Executing shell function do_compile
| WARNING: The wheel package is not available.
| /buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-sysroot-native/usr/bin/python3-native/pytho

n3: No module named pip
| Traceback (most recent call last):
|   File "/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-sysroot-native/usr/lib/python3.9/si te-packages/setuptools/installer.py", line 75, in fetch_build_egg
| subprocess.check_call(cmd)
|   File "/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-sysroot-native/usr/lib/python3.9/su bprocess.py", line 373, in check_call
|     raise CalledProcessError(retcode, cmd)
| subprocess.CalledProcessError: Command '['/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-s ysroot-native/usr/bin/python3-native/python3', '-m', 'pip', '--disable-pip-version-check', 'wheel', '--no-deps', '-w', '/tmp/tmpovfcfgaq', '--q uiet', 'setuptools-scm>=3.4']' returned non-zero exit status 1.

After add  "python3-setuptools-scm-native" to dependency, it meets the requirement in setup.cfg:

setuptools-scm>=3.4

then it does not call pip anymore to download any file.

Regards,

Signature · 2 lines
Kai Kang
Wind River Linux
#3 lore raw
Quoted 70 lines · kai
Quoted 37 lines · Richard Purdie
Quoted 23 lines · kai

From: Kai Kang <[email protected]>

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

$ pip3 list | grep pytest
pytest             0.0.0

Remove 0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch and depends on python3-setuptools-scm-native to make it right.

---
  ...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 -0
deleted file mode 100644
index 1abd531c62..0000000000

meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch line 10

Quoted 10 lines
meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch deleted +0 -10
@@ -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
-

Recipes should not be downloading during do_compile. We need to fix this in some other way, we can't just remove the patch.

Quoted 4 lines

Cheers,

Richard

Hi Richard,

It calls pip to download the egg file for setuptools-scm. But pip is not a dependency and does not exist in sysroot, so it fails when remove the patch and
"python3-setuptools-scm-native" is not a dependency:

Quoted 3 lines

DEBUG: Executing shell function do_compile
WARNING: The wheel package is not available.

/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-sysroot-native/usr/bin/python3-native/pytho
n3: No module named pip

Quoted 2 lines

Traceback (most recent call last):
   File

"/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-sysroot-native/usr/lib/python3.9/si te-packages/setuptools/installer.py", line 75, in fetch_build_egg

Quoted 2 lines

subprocess.check_call(cmd)
   File

"/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-sysroot-native/usr/lib/python3.9/su bprocess.py", line 373, in check_call

Quoted 2 lines

     raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command

'['/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-s ysroot-native/usr/bin/python3-native/python3', '-m', 'pip', '--disable-pip-version-check', 'wheel', '--no-deps', '-w',
'/tmp/tmpovfcfgaq', '--q
uiet', 'setuptools-scm>=3.4']' returned non-zero exit status 1.

Quoted 6 lines

After add  "python3-setuptools-scm-native" to dependency, it meets the requirement in setup.cfg:

setuptools-scm>=3.4

then it does not call pip anymore to download any file.

That makes more sense, thanks for clarifying. Could you update the commit message to make that clearer please?

Thanks,

Richard

author
#4 lore raw
Quoted 71 lines · Richard Purdie
Quoted 70 lines · kai
Quoted 37 lines · Richard Purdie
Quoted 23 lines · kai

From: Kai Kang <[email protected]>

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

$ pip3 list | grep pytest
pytest             0.0.0

Remove 0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch and depends on python3-setuptools-scm-native to make it right.

---
   ...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 -0
deleted file mode 100644
index 1abd531c62..0000000000

meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch line 10

Quoted 10 lines
meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch deleted +0 -10
@@ -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
-

Recipes should not be downloading during do_compile. We need to fix this in some other way, we can't just remove the patch.

Quoted 4 lines

Cheers,

Richard

Hi Richard,

It calls pip to download the egg file for setuptools-scm. But pip is not a dependency and does not exist in sysroot, so it fails when remove the patch and
"python3-setuptools-scm-native" is not a dependency:

Quoted 3 lines

DEBUG: Executing shell function do_compile
WARNING: The wheel package is not available.

/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-sysroot-native/usr/bin/python3-native/pytho
n3: No module named pip

Quoted 2 lines

Traceback (most recent call last):
   File

"/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-sysroot-native/usr/lib/python3.9/si te-packages/setuptools/installer.py", line 75, in fetch_build_egg

Quoted 2 lines

subprocess.check_call(cmd)
   File

"/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-sysroot-native/usr/lib/python3.9/su bprocess.py", line 373, in check_call

Quoted 2 lines

     raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command

'['/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-s ysroot-native/usr/bin/python3-native/python3', '-m', 'pip', '--disable-pip-version-check', 'wheel', '--no-deps', '-w',
'/tmp/tmpovfcfgaq', '--q
uiet', 'setuptools-scm>=3.4']' returned non-zero exit status 1.

Quoted 8 lines
Quoted 6 lines

After add  "python3-setuptools-scm-native" to dependency, it meets the requirement in setup.cfg:

setuptools-scm>=3.4

then it does not call pip anymore to download any file.

That makes more sense, thanks for clarifying. Could you update the commit message to make that clearer please?

v2 will be sent.

Regards,
Kai

Quoted 5 lines

Thanks,

Richard

Signature · 2 lines
Kai Kang
Wind River Linux