Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-fakeredis for openSUSE:Factory checked in at 2022-10-12 18:22:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-fakeredis (Old) and /work/SRC/openSUSE:Factory/.python-fakeredis.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-fakeredis" Wed Oct 12 18:22:54 2022 rev:10 rq:1009253 version:1.9.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-fakeredis/python-fakeredis.changes 2022-10-01 17:41:51.481528142 +0200 +++ /work/SRC/openSUSE:Factory/.python-fakeredis.new.2275/python-fakeredis.changes 2022-10-12 18:23:04.389421882 +0200 @@ -1,0 +2,12 @@ +Sun Oct 9 19:22:51 UTC 2022 - Ben Greiner <c...@bnavigator.de> + +- Update to 1.9.3 + * Removed python-six dependency + * zadd support for GT/LT by @cunla in #49 + * Remove six dependency by @cunla in #51 + * Add host to conn_pool_args by @cunla in #51 +- Drop python-fakeredis-no-six.patch which was incomplete + * all commits, including the missing ones in release now +- Add fakeredis-pr54-fix-ensure_str.patch + +------------------------------------------------------------------- Old: ---- fakeredis-1.9.1-gh.tar.gz python-fakeredis-no-six.patch New: ---- fakeredis-1.9.3-gh.tar.gz fakeredis-pr54-fix-ensure_str.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-fakeredis.spec ++++++ --- /var/tmp/diff_new_pack.Ie0hNw/_old 2022-10-12 18:23:04.829422981 +0200 +++ /var/tmp/diff_new_pack.Ie0hNw/_new 2022-10-12 18:23:04.837423001 +0200 @@ -17,32 +17,33 @@ Name: python-fakeredis -Version: 1.9.1 +Version: 1.9.3 Release: 0 Summary: Fake implementation of redis API for testing purposes License: BSD-3-Clause AND MIT URL: https://github.com//dsoftwareinc/fakeredis Source: https://github.com/dsoftwareinc/fakeredis-py/archive/refs/tags/v%{version}.tar.gz#/fakeredis-%{version}-gh.tar.gz -# https://github.com/cunla/fakeredis-py/pull/51/ -Patch0: python-fakeredis-no-six.patch +# PATCH-FIX-UPSTREAM fakeredis-pr54-fix-ensure_str.patch gh#dsoftwareinc/fakeredis#54 +Patch0: fakeredis-pr54-fix-ensure_str.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pip} BuildRequires: %{python_module poetry-core} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-redis +Requires: python-redis < 4.4 Requires: python-sortedcontainers >= 2.4.0 -Suggests: (python-aioredis if python-redis < 4.2) -Suggests: python-lupa +Suggests: (python-aioredis >= 2.0.1) +Suggests: python-lupa >= 1.13 BuildArch: noarch # SECTION test requirements -BuildRequires: %{python_module future} +# technically requires hypothesis >= 6.47.1, but we don't have it yet BuildRequires: %{python_module hypothesis} -BuildRequires: %{python_module lupa} -BuildRequires: %{python_module pytest >= 4.0} -BuildRequires: %{python_module pytest-asyncio} +BuildRequires: %{python_module lupa >= 1.13} +BuildRequires: %{python_module pytest >= 7.1.2} +BuildRequires: %{python_module pytest-asyncio >= 0.19.0} +# technically requires pytest-mock >= 3.7.0, but we don't have it yet BuildRequires: %{python_module pytest-mock} -BuildRequires: %{python_module redis} +BuildRequires: %{python_module redis < 4.4} BuildRequires: %{python_module sortedcontainers >= 2.4.0} # /SECTION %python_subpackages @@ -51,8 +52,7 @@ Fake implementation of redis API for testing purposes. %prep -%setup -q -n fakeredis-py-%{version} -%patch0 -p1 +%autosetup -p1 -n fakeredis-py-%{version} %build %pyproject_wheel ++++++ fakeredis-1.9.1-gh.tar.gz -> fakeredis-1.9.3-gh.tar.gz ++++++ ++++ 1902 lines of diff (skipped) ++++++ fakeredis-pr54-fix-ensure_str.patch ++++++ >From 8db1b02b8649540b0d649bb884ca1ad9a9937677 Mon Sep 17 00:00:00 2001 From: Ben Greiner <c...@bnavigator.de> Date: Sun, 9 Oct 2022 21:35:45 +0200 Subject: [PATCH] Fix ensure_str --- fakeredis/_fakesocket.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fakeredis/_fakesocket.py b/fakeredis/_fakesocket.py index 71cc5e3..4452d32 100644 --- a/fakeredis/_fakesocket.py +++ b/fakeredis/_fakesocket.py @@ -1517,10 +1517,10 @@ def _convert_lua_result(self, result, nested=True): return 1 if result else None return result - def ensure_str(self, s): - return (s.decode(encoding='utf-8', errors='replace') + def ensure_str(self, s, encoding, replaceerr): + return (s.decode(encoding=encoding, errors=replaceerr) if isinstance(s, bytes) - else str(s).encode(encoding='utf-8', errors='replace')) + else str(s).encode(encoding=encoding, errors=replaceerr)) def _check_for_lua_globals(self, lua_runtime, expected_globals): actual_globals = set(lua_runtime.globals().keys())