From cd83fa054d133eb2b189ad3f0a743cc72001e064 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Tue, 12 Oct 2021 02:08:54 +0000 Subject: python3-pytest: upgrade 6.2.4 -> 6.2.5 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 Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../python3-pytest/0001-Allow-pluggy-1.0.patch | 65 ---------------------- .../python/python3-pytest_6.2.4.bb | 42 -------------- .../python/python3-pytest_6.2.5.bb | 41 ++++++++++++++ 3 files changed, 41 insertions(+), 107 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-pytest/0001-Allow-pluggy-1.0.patch delete mode 100644 meta/recipes-devtools/python/python3-pytest_6.2.4.bb create mode 100644 meta/recipes-devtools/python/python3-pytest_6.2.5.bb 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 175ef987ad..0000000000 --- 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 -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 ---- - 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 deleted file mode 100644 index 2e90acaf36..0000000000 --- a/meta/recipes-devtools/python/python3-pytest_6.2.4.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Simple powerful testing with python" -HOMEPAGE = "https://pypi.org/project/pytest/" -DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scales to support complex functional testing for applications and libraries." - -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" - -inherit update-alternatives pypi setuptools3 - -RDEPENDS:${PN}:class-target += " \ - ${PYTHON_PN}-atomicwrites \ - ${PYTHON_PN}-attrs \ - ${PYTHON_PN}-debugger \ - ${PYTHON_PN}-doctest \ - ${PYTHON_PN}-importlib-metadata \ - ${PYTHON_PN}-iniconfig \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-more-itertools \ - ${PYTHON_PN}-packaging \ - ${PYTHON_PN}-pathlib2 \ - ${PYTHON_PN}-pluggy \ - ${PYTHON_PN}-py \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-toml \ - ${PYTHON_PN}-wcwidth \ -" - -ALTERNATIVE:${PN} += "py.test pytest" - -NATIVE_LINK_NAME[pytest] = "${bindir}/pytest" -ALTERNATIVE_TARGET[pytest] = "${bindir}/pytest" - -ALTERNATIVE_LINK_NAME[py.test] = "${bindir}/py.test" -ALTERNATIVE_TARGET[py.test] = "${bindir}/py.test" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/python/python3-pytest_6.2.5.bb b/meta/recipes-devtools/python/python3-pytest_6.2.5.bb new file mode 100644 index 0000000000..0d8fdf6373 --- /dev/null +++ b/meta/recipes-devtools/python/python3-pytest_6.2.5.bb @@ -0,0 +1,41 @@ +SUMMARY = "Simple powerful testing with python" +HOMEPAGE = "https://pypi.org/project/pytest/" +DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scales to support complex functional testing for applications and libraries." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b" + +SRC_URI[sha256sum] = "131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89" + +DEPENDS = "python3-setuptools-scm-native" + +inherit update-alternatives pypi setuptools3 + +RDEPENDS:${PN}:class-target += " \ + ${PYTHON_PN}-atomicwrites \ + ${PYTHON_PN}-attrs \ + ${PYTHON_PN}-debugger \ + ${PYTHON_PN}-doctest \ + ${PYTHON_PN}-importlib-metadata \ + ${PYTHON_PN}-iniconfig \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-more-itertools \ + ${PYTHON_PN}-packaging \ + ${PYTHON_PN}-pathlib2 \ + ${PYTHON_PN}-pluggy \ + ${PYTHON_PN}-py \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-toml \ + ${PYTHON_PN}-wcwidth \ +" + +ALTERNATIVE:${PN} += "py.test pytest" + +NATIVE_LINK_NAME[pytest] = "${bindir}/pytest" +ALTERNATIVE_TARGET[pytest] = "${bindir}/pytest" + +ALTERNATIVE_LINK_NAME[py.test] = "${bindir}/py.test" +ALTERNATIVE_TARGET[py.test] = "${bindir}/py.test" + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg