1.Changelog https://github.com/arsenetar/send2trash/releases/tag/2.1.0
2.Remove 0001-add-missing-conftest.py.patch as it was merged upstream. Signed-off-by: Liu Yiding <[email protected]> --- .../0001-add-missing-conftest.py.patch | 52 ------------------- ...h_2.0.0.bb => python3-send2trash_2.1.0.bb} | 5 +- 2 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 meta-python/recipes-extended/send2trash/python3-send2trash/0001-add-missing-conftest.py.patch rename meta-python/recipes-extended/send2trash/{python3-send2trash_2.0.0.bb => python3-send2trash_2.1.0.bb} (68%) diff --git a/meta-python/recipes-extended/send2trash/python3-send2trash/0001-add-missing-conftest.py.patch b/meta-python/recipes-extended/send2trash/python3-send2trash/0001-add-missing-conftest.py.patch deleted file mode 100644 index 1592fd661c..0000000000 --- a/meta-python/recipes-extended/send2trash/python3-send2trash/0001-add-missing-conftest.py.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ed6d20884108fd7e681baf7278e38ac4800fb5c1 Mon Sep 17 00:00:00 2001 -From: Gyorgy Sarvari <[email protected]> -Date: Fri, 9 Jan 2026 18:04:08 +0100 -Subject: [PATCH] add missing conftest.py - -Conftest.py is missing from the source dictribution of v2.0.0, -making the tests to fail. - -The issue is already solved by upstream, but not tagged yet. -This patch can be removed with the next release. - -Upstream-Status: Inappropriate [workaround until https://github.com/arsenetar/send2trash/commit/f8a40143f696da41f81cae87e1c7f9a345cd4003 is tagged] - -Signed-off-by: Gyorgy Sarvari <[email protected]> ---- - tests/conftest.py | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - create mode 100644 tests/conftest.py - -diff --git a/tests/conftest.py b/tests/conftest.py -new file mode 100644 -index 0000000..0753384 ---- /dev/null -+++ b/tests/conftest.py -@@ -0,0 +1,27 @@ -+# encoding: utf-8 -+import sys -+import os -+from tempfile import NamedTemporaryFile -+import pytest -+ -+# Only import HOMETRASH on supported platforms -+if sys.platform != "win32": -+ from send2trash.plat_other import HOMETRASH -+ -+ [email protected](name="test_file") -+def fixture_test_file(): -+ file = NamedTemporaryFile(dir=os.path.expanduser("~"), prefix="send2trash_test", delete=False) -+ file.close() -+ # Verify file was actually created -+ assert os.path.exists(file.name) is True -+ yield file.name -+ # Cleanup trash files on supported platforms -+ if sys.platform != "win32": -+ name = os.path.basename(file.name) -+ # Remove trash files if they exist -+ if os.path.exists(os.path.join(HOMETRASH, "files", name)): -+ os.remove(os.path.join(HOMETRASH, "files", name)) -+ os.remove(os.path.join(HOMETRASH, "info", name + ".trashinfo")) -+ if os.path.exists(file.name): -+ os.remove(file.name) diff --git a/meta-python/recipes-extended/send2trash/python3-send2trash_2.0.0.bb b/meta-python/recipes-extended/send2trash/python3-send2trash_2.1.0.bb similarity index 68% rename from meta-python/recipes-extended/send2trash/python3-send2trash_2.0.0.bb rename to meta-python/recipes-extended/send2trash/python3-send2trash_2.1.0.bb index 48dc8e793f..147603a45b 100644 --- a/meta-python/recipes-extended/send2trash/python3-send2trash_2.0.0.bb +++ b/meta-python/recipes-extended/send2trash/python3-send2trash_2.1.0.bb @@ -4,9 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a02659c2d5f4cc626e4dcf6504b865eb" inherit pypi python_setuptools_build_meta ptest-python-pytest -SRC_URI += "file://0001-add-missing-conftest.py.patch \ - file://run-ptest" -SRC_URI[sha256sum] = "1761421da3f9930bfe51ed7c45343948573383ad4c27e3acebc91be324e7770d" +SRC_URI += "file://run-ptest" +SRC_URI[sha256sum] = "1c72b39f09457db3c05ce1d19158c2cbef4c32b8bedd02c155e49282b7ea7459" PYPI_PACKAGE = "send2trash" UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#124773): https://lists.openembedded.org/g/openembedded-devel/message/124773 Mute This Topic: https://lists.openembedded.org/mt/118058494/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
