diff --git a/fix-tests.patch b/fix-tests.patch new file mode 100644 index 0000000..059e21e --- /dev/null +++ b/fix-tests.patch @@ -0,0 +1,37 @@ +From 6e05e1fa1c2804410f9916b27edc07076e3b156d Mon Sep 17 00:00:00 2001 +From: Sagi Buchbinder-Shadur +Date: Wed, 3 May 2023 11:16:59 -0400 +Subject: [PATCH] Update dependencies using pip-compile-multi (#2508) + +--- + requirements/build.txt | 14 +++++++------- + requirements/dev.txt | 38 ++++++++++++++++++-------------------- + requirements/docs.txt | 38 +++++++++++++++++++------------------- + requirements/tests.txt | 12 ++++++------ + tests/test_arguments.py | 6 +++++- + 5 files changed, 55 insertions(+), 53 deletions(-) + +diff --git a/tests/test_arguments.py b/tests/test_arguments.py +index 735df4b53..3395c552b 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 from_bytes(arg): + ), "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, diff --git a/python-click.changes b/python-click.changes index dbc1aeb..52da3c6 100644 --- a/python-click.changes +++ b/python-click.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 5 13:41:09 UTC 2023 - Markéta Machová + +- add fix-tests.patch to fix tests with new versions of python packages + ------------------------------------------------------------------- Fri Apr 21 12:23:20 UTC 2023 - Dirk Müller diff --git a/python-click.spec b/python-click.spec index e7cc9d9..67400d7 100644 --- a/python-click.spec +++ b/python-click.spec @@ -27,6 +27,9 @@ License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/mitsuhiko/click Source: https://files.pythonhosted.org/packages/source/c/click/click-%{version}.tar.gz +# PATCH-FIX-UPSTREAM https://github.com/pallets/click/commit/6e05e1fa1c2804410f9916b27edc07076e3b156d Update dependencies using pip-compile-multi (#2508) +# our tests were failing in a staging because of some new version and upstream came across the issue while updating dependencies, hence the weird commit message +Patch: fix-tests.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} @@ -45,7 +48,7 @@ Line Interface Creation Kit". It is configurable, and comes with defaults out of the box. %prep -%setup -q -n click-%{version} +%autosetup -p1 -n click-%{version} %build %python_build