summaryrefslogtreecommitdiffstats
path: root/meta-python
diff options
context:
space:
mode:
authorLiu Yiding <liuyd.fnst@fujitsu.com>2026-02-28 17:02:01 +0800
committerKhem Raj <raj.khem@gmail.com>2026-03-02 19:26:00 -0800
commit8e94c3a2a8396206785277d0cb34b8e2ead9e083 (patch)
treed4204f8b38804c634d1743950488ff1bddba3012 /meta-python
parentbc5bfbb4ecdd1a624a3c2614141298ea0c4f958a (diff)
downloadmeta-openembedded-8e94c3a2a8396206785277d0cb34b8e2ead9e083.tar.gz
python3-send2trash: upgrade 2.0.0 -> 2.1.0
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 <liuyd.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python')
-rw-r--r--meta-python/recipes-extended/send2trash/python3-send2trash/0001-add-missing-conftest.py.patch52
-rw-r--r--meta-python/recipes-extended/send2trash/python3-send2trash_2.1.0.bb (renamed from meta-python/recipes-extended/send2trash/python3-send2trash_2.0.0.bb)5
2 files changed, 2 insertions, 55 deletions
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 @@
1From ed6d20884108fd7e681baf7278e38ac4800fb5c1 Mon Sep 17 00:00:00 2001
2From: Gyorgy Sarvari <skandigraun@gmail.com>
3Date: Fri, 9 Jan 2026 18:04:08 +0100
4Subject: [PATCH] add missing conftest.py
5
6Conftest.py is missing from the source dictribution of v2.0.0,
7making the tests to fail.
8
9The issue is already solved by upstream, but not tagged yet.
10This patch can be removed with the next release.
11
12Upstream-Status: Inappropriate [workaround until https://github.com/arsenetar/send2trash/commit/f8a40143f696da41f81cae87e1c7f9a345cd4003 is tagged]
13
14Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
15---
16 tests/conftest.py | 27 +++++++++++++++++++++++++++
17 1 file changed, 27 insertions(+)
18 create mode 100644 tests/conftest.py
19
20diff --git a/tests/conftest.py b/tests/conftest.py
21new file mode 100644
22index 0000000..0753384
23--- /dev/null
24+++ b/tests/conftest.py
25@@ -0,0 +1,27 @@
26+# encoding: utf-8
27+import sys
28+import os
29+from tempfile import NamedTemporaryFile
30+import pytest
31+
32+# Only import HOMETRASH on supported platforms
33+if sys.platform != "win32":
34+ from send2trash.plat_other import HOMETRASH
35+
36+
37+@pytest.fixture(name="test_file")
38+def fixture_test_file():
39+ file = NamedTemporaryFile(dir=os.path.expanduser("~"), prefix="send2trash_test", delete=False)
40+ file.close()
41+ # Verify file was actually created
42+ assert os.path.exists(file.name) is True
43+ yield file.name
44+ # Cleanup trash files on supported platforms
45+ if sys.platform != "win32":
46+ name = os.path.basename(file.name)
47+ # Remove trash files if they exist
48+ if os.path.exists(os.path.join(HOMETRASH, "files", name)):
49+ os.remove(os.path.join(HOMETRASH, "files", name))
50+ os.remove(os.path.join(HOMETRASH, "info", name + ".trashinfo"))
51+ if os.path.exists(file.name):
52+ 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
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"
4 4
5inherit pypi python_setuptools_build_meta ptest-python-pytest 5inherit pypi python_setuptools_build_meta ptest-python-pytest
6 6
7SRC_URI += "file://0001-add-missing-conftest.py.patch \ 7SRC_URI += "file://run-ptest"
8 file://run-ptest" 8SRC_URI[sha256sum] = "1c72b39f09457db3c05ce1d19158c2cbef4c32b8bedd02c155e49282b7ea7459"
9SRC_URI[sha256sum] = "1761421da3f9930bfe51ed7c45343948573383ad4c27e3acebc91be324e7770d"
10 9
11PYPI_PACKAGE = "send2trash" 10PYPI_PACKAGE = "send2trash"
12UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" 11UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}"