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 Signed-off-by: Tim Orling <[email protected]> --- .../0001-Allow-pluggy-1.0.patch | 65 +++++++++++++++++++ .../python/python3-pytest_6.2.4.bb | 1 + 2 files changed, 66 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-pytest/0001-Allow-pluggy-1.0.patch 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 @@ +From 637d4400d2bab0457688f950ea18cc4a04147c11 Mon Sep 17 00:00:00 2001 +From: Bruno Oliveira <[email protected]> +Date: Thu, 26 Aug 2021 09:26:51 -0300 +Subject: [PATCH] Allow pluggy >=1.0 + +Now that pluggy 1.0 has been released, we can allow pluggy 1.0 with new pytest versions. + +Upstream-Status: Backport [commit: fbba504] + +Modify to use toml and not tomli. We will create a +python3-tomli recipe when we do an python3-pytest +upgrade. + +Signed-off-by: Tim Orling <[email protected]> +--- + setup.cfg | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +diff --git a/setup.cfg b/setup.cfg +index f919a9491..a8aeab813 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -32,24 +32,24 @@ project_urls = + Tracker=https://github.com/pytest-dev/pytest/issues + + [options] +-packages = +- _pytest +- _pytest._code +- _pytest._io +- _pytest.assertion +- _pytest.config +- _pytest.mark +- pytest +-install_requires = +- attrs>=19.2.0 +- iniconfig +- packaging +- pluggy>=0.12,<1.0.0a1 +- py>=1.8.2 +- toml +- atomicwrites>=1.0;sys_platform=="win32" +- colorama;sys_platform=="win32" +- importlib-metadata>=0.12;python_version<"3.8" ++packages = ++ _pytest ++ _pytest._code ++ _pytest._io ++ _pytest.assertion ++ _pytest.config ++ _pytest.mark ++ pytest ++install_requires = ++ attrs>=19.2.0 ++ iniconfig ++ packaging ++ pluggy>=0.12,<2.0 ++ py>=1.8.2 ++ toml ++ atomicwrites>=1.0;sys_platform=="win32" ++ colorama;sys_platform=="win32" ++ importlib-metadata>=0.12;python_version<"3.8" + python_requires = >=3.6 + package_dir = + =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 LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b" +SRC_URI += "file://0001-Allow-pluggy-1.0.patch" SRC_URI[sha256sum] = "50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b" DEPENDS = "python3-setuptools-scm-native" -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155379): https://lists.openembedded.org/g/openembedded-core/message/155379 Mute This Topic: https://lists.openembedded.org/mt/85168381/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
