summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-python/recipes-devtools/python/python3-click/0001-tests-Fix-test_bytes_args.patch41
-rw-r--r--meta-python/recipes-devtools/python/python3-click_8.1.5.bb (renamed from meta-python/recipes-devtools/python/python3-click_8.1.3.bb)7
2 files changed, 2 insertions, 46 deletions
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 @@
1From da83bd7ca0959027086115f23534957b0917aaa5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 27 Apr 2023 22:21:24 -0700
4Subject: [PATCH] tests: Fix test_bytes_args
5
6sys.stdin.encoding is readonly therefore use Mocking to wrap it.
7Sourced from - Alpine
8
9Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 tests/test_arguments.py | 6 +++++-
13 1 file changed, 5 insertions(+), 1 deletion(-)
14
15diff --git a/tests/test_arguments.py b/tests/test_arguments.py
16index 735df4b..3395c55 100644
17--- a/tests/test_arguments.py
18+++ b/tests/test_arguments.py
19@@ -1,4 +1,5 @@
20 import sys
21+from unittest import mock
22
23 import pytest
24
25@@ -86,9 +87,12 @@ def test_bytes_args(runner, monkeypatch):
26 ), "UTF-8 encoded argument should be implicitly converted to Unicode"
27
28 # Simulate empty locale environment variables
29- monkeypatch.setattr(sys.stdin, "encoding", "utf-8")
30 monkeypatch.setattr(sys, "getfilesystemencoding", lambda: "utf-8")
31 monkeypatch.setattr(sys, "getdefaultencoding", lambda: "utf-8")
32+ # sys.stdin.encoding is readonly, needs some extra effort to patch.
33+ stdin = mock.Mock(wraps=sys.stdin)
34+ stdin.encoding = "utf-8"
35+ monkeypatch.setattr(sys, "stdin", stdin)
36
37 runner.invoke(
38 from_bytes,
39--
402.40.1
41
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
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/"
8LICENSE = "BSD-3-Clause" 8LICENSE = "BSD-3-Clause"
9LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=1fa98232fd645608937a0fdc82e999b8" 9LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=1fa98232fd645608937a0fdc82e999b8"
10 10
11SRC_URI[sha256sum] = "7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e" 11SRC_URI[sha256sum] = "4be4b1af8d665c6d942909916d31a213a106800c47d0eeba73d34da3cbc11367"
12 12
13inherit pypi setuptools3 ptest 13inherit pypi setuptools3 ptest
14 14
15SRC_URI += " \ 15SRC_URI += "file://run-ptest"
16 file://0001-tests-Fix-test_bytes_args.patch \
17 file://run-ptest \
18"
19 16
20RDEPENDS:${PN}-ptest += " \ 17RDEPENDS:${PN}-ptest += " \
21 ${PYTHON_PN}-pytest \ 18 ${PYTHON_PN}-pytest \