diff options
| author | Kai Kang <kai.kang@windriver.com> | 2021-08-01 19:41:30 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:11 +0100 |
| commit | aeaafe2fa591c601e41ea065aa9c3905db6cc438 (patch) | |
| tree | 3b81bee33b74141f5f30a6223b3b91ebde630e45 /meta/recipes-devtools/python/python3-pytest | |
| parent | 825043ec771aad54c055ec30aee007a793183487 (diff) | |
| download | poky-aeaafe2fa591c601e41ea065aa9c3905db6cc438.tar.gz | |
python3-pytest: display correct version info
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>
Diffstat (limited to 'meta/recipes-devtools/python/python3-pytest')
| -rw-r--r-- | meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch | 36 |
1 files changed, 0 insertions, 36 deletions
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 deleted file mode 100644 index 1abd531c62..0000000000 --- a/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | From ead04f2da75efeca3369feff6161ea4a8baecbc9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yuan Chao <yuanc.fnst@cn.fujitsu.com> | ||
| 3 | Date: Wed, 28 Aug 2019 16:12:27 +0900 | ||
| 4 | Subject: [PATCH] setup.py: remove the setup_requires for setuptools-scm | ||
| 5 | |||
| 6 | The setup_requires argument forces the download of the egg file for setuptools-scm | ||
| 7 | during the do_compile phase. This download is incompatible with the typical fetch | ||
| 8 | and mirror structure. The only usage of scm is the generation of the _version.py | ||
| 9 | file and in the release tarball it is already correctly created | ||
| 10 | |||
| 11 | Upstream-Status: Inappropriate [oe specific] | ||
| 12 | |||
| 13 | Signed-off-by: Derek Straka <derek@asterius.io> | ||
| 14 | |||
| 15 | Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com> | ||
| 16 | |||
| 17 | Rebase for pytest 6.1.0. | ||
| 18 | |||
| 19 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
| 20 | |||
| 21 | --- | ||
| 22 | setup.cfg | 1 - | ||
| 23 | 1 file changed, 1 deletion(-) | ||
| 24 | |||
| 25 | diff --git a/setup.cfg b/setup.cfg | ||
| 26 | index 6ed0792..0137090 100644 | ||
| 27 | --- a/setup.cfg | ||
| 28 | +++ b/setup.cfg | ||
| 29 | @@ -53,7 +53,6 @@ package_dir = | ||
| 30 | =src | ||
| 31 | setup_requires = | ||
| 32 | setuptools>=>=42.0 | ||
| 33 | - setuptools-scm>=3.4 | ||
| 34 | zip_safe = no | ||
| 35 | |||
| 36 | [options.entry_points] | ||
