diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-12-28 21:04:29 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-31 11:53:26 +0000 |
commit | 9b894b9f963467a23ef07aded85d1cd424120d0f (patch) | |
tree | 849ae035edc6eb8dabed5c923a9d489f3885da70 /meta/recipes-devtools | |
parent | 34ec636f192d739cfbf43590b04b48d2cf7994d7 (diff) | |
download | poky-9b894b9f963467a23ef07aded85d1cd424120d0f.tar.gz |
python3-pytest: update 6.1.2 -> 6.2.1
(From OE-Core rev: 7c84d3b0112daa6006c35c19d66b544f7d2ef31b)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch | 17 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-pytest_6.2.1.bb (renamed from meta/recipes-devtools/python/python3-pytest_6.1.2.bb) | 2 |
2 files changed, 8 insertions, 11 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 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 @@ | |||
1 | From ff784f4803ab33f5e3389e40d038d52d1e211843 Mon Sep 17 00:00:00 2001 | 1 | From ead04f2da75efeca3369feff6161ea4a8baecbc9 Mon Sep 17 00:00:00 2001 |
2 | From: Yuan Chao <yuanc.fnst@cn.fujitsu.com> | 2 | From: Yuan Chao <yuanc.fnst@cn.fujitsu.com> |
3 | Date: Wed, 28 Aug 2019 16:12:27 +0900 | 3 | Date: Wed, 28 Aug 2019 16:12:27 +0900 |
4 | Subject: [PATCH] [PATCH] setup.py: remove the setup_requires for | 4 | Subject: [PATCH] setup.py: remove the setup_requires for setuptools-scm |
5 | setuptools-scm | ||
6 | 5 | ||
7 | The setup_requires argument forces the download of the egg file for setuptools-scm | 6 | The setup_requires argument forces the download of the egg file for setuptools-scm |
8 | during the do_compile phase. This download is incompatible with the typical fetch | 7 | during the do_compile phase. This download is incompatible with the typical fetch |
@@ -18,22 +17,20 @@ Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com> | |||
18 | Rebase for pytest 6.1.0. | 17 | Rebase for pytest 6.1.0. |
19 | 18 | ||
20 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 19 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
20 | |||
21 | --- | 21 | --- |
22 | setup.cfg | 1 - | 22 | setup.cfg | 1 - |
23 | 1 file changed, 1 deletion(-) | 23 | 1 file changed, 1 deletion(-) |
24 | 24 | ||
25 | diff --git a/setup.cfg b/setup.cfg | 25 | diff --git a/setup.cfg b/setup.cfg |
26 | index 60f6564..c4d1471 100644 | 26 | index 6ed0792..0137090 100644 |
27 | --- a/setup.cfg | 27 | --- a/setup.cfg |
28 | +++ b/setup.cfg | 28 | +++ b/setup.cfg |
29 | @@ -55,7 +55,6 @@ package_dir = | 29 | @@ -53,7 +53,6 @@ package_dir = |
30 | =src | 30 | =src |
31 | setup_requires = | 31 | setup_requires = |
32 | setuptools>=40.0 | 32 | setuptools>=>=42.0 |
33 | - setuptools-scm | 33 | - setuptools-scm>=3.4 |
34 | zip_safe = no | 34 | zip_safe = no |
35 | 35 | ||
36 | [options.entry_points] | 36 | [options.entry_points] |
37 | -- | ||
38 | 2.17.1 | ||
39 | |||
diff --git a/meta/recipes-devtools/python/python3-pytest_6.1.2.bb b/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" | |||
5 | 5 | ||
6 | SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch " | 6 | SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch " |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e" | 8 | SRC_URI[sha256sum] = "66e419b1899bc27346cb2c993e12c5e5e8daba9073c1fbce33b9807abc95c306" |
9 | 9 | ||
10 | inherit update-alternatives pypi setuptools3 | 10 | inherit update-alternatives pypi setuptools3 |
11 | 11 | ||