diff --git a/meta-python/recipes-devtools/python/python3-click/0001-tests-Fix-test_bytes_args.patch b/meta-python/recipes-devtools/python/python3-click/0001-tests-Fix-test_bytes_args.patch deleted file mode 100644 index e69a37c405..0000000000 --- a/meta-python/recipes-devtools/python/python3-click/0001-tests-Fix-test_bytes_args.patch +++ /dev/null @@ -1,41 +0,0 @@ -From da83bd7ca0959027086115f23534957b0917aaa5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 27 Apr 2023 22:21:24 -0700 -Subject: [PATCH] tests: Fix test_bytes_args - -sys.stdin.encoding is readonly therefore use Mocking to wrap it. -Sourced from - Alpine - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - tests/test_arguments.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tests/test_arguments.py b/tests/test_arguments.py -index 735df4b..3395c55 100644 ---- a/tests/test_arguments.py -+++ b/tests/test_arguments.py -@@ -1,4 +1,5 @@ - import sys -+from unittest import mock - - import pytest - -@@ -86,9 +87,12 @@ def test_bytes_args(runner, monkeypatch): - ), "UTF-8 encoded argument should be implicitly converted to Unicode" - - # Simulate empty locale environment variables -- monkeypatch.setattr(sys.stdin, "encoding", "utf-8") - monkeypatch.setattr(sys, "getfilesystemencoding", lambda: "utf-8") - monkeypatch.setattr(sys, "getdefaultencoding", lambda: "utf-8") -+ # sys.stdin.encoding is readonly, needs some extra effort to patch. -+ stdin = mock.Mock(wraps=sys.stdin) -+ stdin.encoding = "utf-8" -+ monkeypatch.setattr(sys, "stdin", stdin) - - runner.invoke( - from_bytes, --- -2.40.1 - diff --git a/meta-python/recipes-devtools/python/python3-click_8.1.3.bb b/meta-python/recipes-devtools/python/python3-click_8.1.5.bb similarity index 85% rename from meta-python/recipes-devtools/python/python3-click_8.1.3.bb rename to meta-python/recipes-devtools/python/python3-click_8.1.5.bb index 9b8ea94c2a..d7d50118e2 100644 --- a/meta-python/recipes-devtools/python/python3-click_8.1.3.bb +++ b/meta-python/recipes-devtools/python/python3-click_8.1.5.bb @@ -8,14 +8,11 @@ HOMEPAGE = "http://click.pocoo.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=1fa98232fd645608937a0fdc82e999b8" -SRC_URI[sha256sum] = "7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e" +SRC_URI[sha256sum] = "4be4b1af8d665c6d942909916d31a213a106800c47d0eeba73d34da3cbc11367" inherit pypi setuptools3 ptest -SRC_URI += " \ - file://0001-tests-Fix-test_bytes_args.patch \ - file://run-ptest \ -" +SRC_URI += "file://run-ptest" RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \