Drop pluggy-1.0 patch; fixed upstream
pytest 6.2.5 (2021-08-29)
Trivial/Internal Changes
#8494: Python 3.10 is now supported.
#9040: Enable compatibility with pluggy 1.0 or later.
References:
https://github.com/pytest-dev/pytest/pull/8494
https://github.com/pytest-dev/pytest/pull/9040
Signed-off-by: Tim Orling <timothy.t.orl...@intel.com>
---
.../0001-Allow-pluggy-1.0.patch | 65 -------------------
...ytest_6.2.4.bb => python3-pytest_6.2.5.bb} | 3 +-
2 files changed, 1 insertion(+), 67 deletions(-)
delete mode 100644
meta/recipes-devtools/python/python3-pytest/0001-Allow-pluggy-1.0.patch
rename meta/recipes-devtools/python/{python3-pytest_6.2.4.bb =>
python3-pytest_6.2.5.bb} (89%)
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
deleted file mode 100644
index 175ef987adb..00000000000
--- a/meta/recipes-devtools/python/python3-pytest/0001-Allow-pluggy-1.0.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 637d4400d2bab0457688f950ea18cc4a04147c11 Mon Sep 17 00:00:00 2001
-From: Bruno Oliveira <nicodde...@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.orl...@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
diff --git a/meta/recipes-devtools/python/python3-pytest_6.2.4.bb
b/meta/recipes-devtools/python/python3-pytest_6.2.5.bb
similarity index 89%
rename from meta/recipes-devtools/python/python3-pytest_6.2.4.bb
rename to meta/recipes-devtools/python/python3-pytest_6.2.5.bb
index 2e90acaf366..0d8fdf63733 100644
--- a/meta/recipes-devtools/python/python3-pytest_6.2.4.bb
+++ b/meta/recipes-devtools/python/python3-pytest_6.2.5.bb
@@ -5,8 +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"
+SRC_URI[sha256sum] =
"131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"
DEPENDS = "python3-setuptools-scm-native"
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#156858):
https://lists.openembedded.org/g/openembedded-core/message/156858
Mute This Topic: https://lists.openembedded.org/mt/86253242/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
