mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-06 00:38:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

python3-pytest: allow python3-pluggy >=1.0.0

Browse Source 
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>
This commit is contained in:
Tim Orling
2021-08-26 18:31:28 +00:00
committed by Richard Purdie
parent df27e9928c
commit 64f0fcb236
2 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
meta/recipes-devtools/python/python3-pytest/0001-Allow-pluggy-1.0.patch Normal file
View File

@@ -0,0 +1,65 @@
From 637d4400d2bab0457688f950ea18cc4a04147c11 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
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 <timothy.t.orling@intel.com>
---
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