summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorTim Orling <ticotimo@gmail.com>2021-08-26 18:31:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-27 11:54:33 +0100
commit64f0fcb236c80ecde69eecb92b3fc9d0908d4d51 (patch)
tree666fd37b85a096a8335a43e77f739b49b3affcd4 /meta/recipes-devtools
parentdf27e9928ca5bc6f7984bcaf5e804ab02ebe7d96 (diff)
downloadpoky-64f0fcb236c80ecde69eecb92b3fc9d0908d4d51.tar.gz
python3-pytest: allow python3-pluggy >=1.0.0
Fixes ptest failures in python3-jinja2. Backport patch from upstream, for now. Modify upstream patch to use toml and not tomli. We will add the new recipe for python3-tomli when we have an upgrade to python3-pytest. Remove this when we upgrade pytest to a version containing the commit: fbba504cd5e1a74d528a41a11a7b82297cd7da74 (From OE-Core rev: b4cfb0b0dab6bc7f43bab04cdf4f16c145be0223) Signed-off-by: Tim Orling <timothy.t.orling@intel.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-Allow-pluggy-1.0.patch65
-rw-r--r--meta/recipes-devtools/python/python3-pytest_6.2.4.bb1
2 files changed, 66 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3-pytest/0001-Allow-pluggy-1.0.patch b/meta/recipes-devtools/python/python3-pytest/0001-Allow-pluggy-1.0.patch
new file mode 100644
index 0000000000..175ef987ad
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pytest/0001-Allow-pluggy-1.0.patch
@@ -0,0 +1,65 @@
1From 637d4400d2bab0457688f950ea18cc4a04147c11 Mon Sep 17 00:00:00 2001
2From: Bruno Oliveira <nicoddemus@gmail.com>
3Date: Thu, 26 Aug 2021 09:26:51 -0300
4Subject: [PATCH] Allow pluggy >=1.0
5
6Now that pluggy 1.0 has been released, we can allow pluggy 1.0 with new pytest versions.
7
8Upstream-Status: Backport [commit: fbba504]
9
10Modify to use toml and not tomli. We will create a
11python3-tomli recipe when we do an python3-pytest
12upgrade.
13
14Signed-off-by: Tim Orling <timothy.t.orling@intel.com>
15---
16 setup.cfg | 36 ++++++++++++++++++------------------
17 1 file changed, 18 insertions(+), 18 deletions(-)
18
19diff --git a/setup.cfg b/setup.cfg
20index f919a9491..a8aeab813 100644
21--- a/setup.cfg
22+++ b/setup.cfg
23@@ -32,24 +32,24 @@ project_urls =
24 Tracker=https://github.com/pytest-dev/pytest/issues
25
26 [options]
27-packages =
28- _pytest
29- _pytest._code
30- _pytest._io
31- _pytest.assertion
32- _pytest.config
33- _pytest.mark
34- pytest
35-install_requires =
36- attrs>=19.2.0
37- iniconfig
38- packaging
39- pluggy>=0.12,<1.0.0a1
40- py>=1.8.2
41- toml
42- atomicwrites>=1.0;sys_platform=="win32"
43- colorama;sys_platform=="win32"
44- importlib-metadata>=0.12;python_version<"3.8"
45+packages =
46+ _pytest
47+ _pytest._code
48+ _pytest._io
49+ _pytest.assertion
50+ _pytest.config
51+ _pytest.mark
52+ pytest
53+install_requires =
54+ attrs>=19.2.0
55+ iniconfig
56+ packaging
57+ pluggy>=0.12,<2.0
58+ py>=1.8.2
59+ toml
60+ atomicwrites>=1.0;sys_platform=="win32"
61+ colorama;sys_platform=="win32"
62+ importlib-metadata>=0.12;python_version<"3.8"
63 python_requires = >=3.6
64 package_dir =
65 =src
diff --git a/meta/recipes-devtools/python/python3-pytest_6.2.4.bb b/meta/recipes-devtools/python/python3-pytest_6.2.4.bb
index f0fd30aeda..2e90acaf36 100644
--- a/meta/recipes-devtools/python/python3-pytest_6.2.4.bb
+++ b/meta/recipes-devtools/python/python3-pytest_6.2.4.bb
@@ -5,6 +5,7 @@ DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scal
5LICENSE = "MIT" 5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b" 6LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b"
7 7
8SRC_URI += "file://0001-Allow-pluggy-1.0.patch"
8SRC_URI[sha256sum] = "50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b" 9SRC_URI[sha256sum] = "50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"
9 10
10DEPENDS = "python3-setuptools-scm-native" 11DEPENDS = "python3-setuptools-scm-native"