From 213d8ff19b3b9872d0673df94691533c2f24ff90bb743e0d860e3146a2ff1030 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 6 Jan 2023 11:16:19 +0000 Subject: [PATCH 1/3] - update to v2.4.0: * Implement LCS (#111), BITOP (#110) * Fix bug checking type in scan_iter (#109) * Implement GETEX (#102) * Implement support for JSON.STRAPPEND (json command) (#98) * Implement JSON.STRLEN, JSON.TOGGLE and fix bugs with JSON.DEL (#96) * Implement PUBSUB CHANNELS, PUBSUB NUMSUB * Implement JSON.CLEAR (#87) * Support for redis-py v4.4.0 * Implement json.mget (#85) * Initial json module support - JSON.GET, JSON.SET and JSON.DEL (#80) * fix: add nowait for asyncio disconnect (#76) * Refactor how commands are registered (#79) * Refactor tests from redispy4_plus (#77) * Remove support for aioredis separate from redis-py (redis-py versions 4.1.2 and below). (#65) * Add support for redis-py v4.4rc4 (#73) * Add mypy support (#74) * Implement support for zmscore by @the-wondersmith in #67 * What's Changed * implement GETDEL and SINTERCARD support by @cunla in #57 * Test get float-type behavior by @cunla in #59 * Implement BZPOPMIN/BZPOPMAX support by @cunla in #60 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-fakeredis?expand=0&rev=21 --- fakeredis-1.9.3-gh.tar.gz | 3 --- fakeredis-2.4.0-gh.tar.gz | 3 +++ fakeredis-pr54-fix-ensure_str.patch | 27 --------------------------- python-fakeredis.changes | 27 +++++++++++++++++++++++++++ python-fakeredis.spec | 21 +++++++++------------ 5 files changed, 39 insertions(+), 42 deletions(-) delete mode 100644 fakeredis-1.9.3-gh.tar.gz create mode 100644 fakeredis-2.4.0-gh.tar.gz delete mode 100644 fakeredis-pr54-fix-ensure_str.patch diff --git a/fakeredis-1.9.3-gh.tar.gz b/fakeredis-1.9.3-gh.tar.gz deleted file mode 100644 index de95997..0000000 --- a/fakeredis-1.9.3-gh.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b90d30c6d8b72e3b83da804f92528e66ee30b58ae6f167091dedc858a2e1c20e -size 87068 diff --git a/fakeredis-2.4.0-gh.tar.gz b/fakeredis-2.4.0-gh.tar.gz new file mode 100644 index 0000000..27b8eef --- /dev/null +++ b/fakeredis-2.4.0-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2069ab09d85c1f2ea4787b64f74f04826197bda2503b30a867f052d7c760bb95 +size 132163 diff --git a/fakeredis-pr54-fix-ensure_str.patch b/fakeredis-pr54-fix-ensure_str.patch deleted file mode 100644 index edd4b58..0000000 --- a/fakeredis-pr54-fix-ensure_str.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8db1b02b8649540b0d649bb884ca1ad9a9937677 Mon Sep 17 00:00:00 2001 -From: Ben Greiner -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()) diff --git a/python-fakeredis.changes b/python-fakeredis.changes index f60d670..a490dec 100644 --- a/python-fakeredis.changes +++ b/python-fakeredis.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Fri Jan 6 11:11:54 UTC 2023 - Dirk Müller + +- update to v2.4.0: + * Implement LCS (#111), BITOP (#110) + * Fix bug checking type in scan_iter (#109) + * Implement GETEX (#102) + * Implement support for JSON.STRAPPEND (json command) (#98) + * Implement JSON.STRLEN, JSON.TOGGLE and fix bugs with JSON.DEL (#96) + * Implement PUBSUB CHANNELS, PUBSUB NUMSUB + * Implement JSON.CLEAR (#87) + * Support for redis-py v4.4.0 + * Implement json.mget (#85) + * Initial json module support - JSON.GET, JSON.SET and JSON.DEL (#80) + * fix: add nowait for asyncio disconnect (#76) + * Refactor how commands are registered (#79) + * Refactor tests from redispy4_plus (#77) + * Remove support for aioredis separate from redis-py (redis-py versions + 4.1.2 and below). (#65) + * Add support for redis-py v4.4rc4 (#73) + * Add mypy support (#74) + * Implement support for zmscore by @the-wondersmith in #67 + * What's Changed + * implement GETDEL and SINTERCARD support by @cunla in #57 + * Test get float-type behavior by @cunla in #59 + * Implement BZPOPMIN/BZPOPMAX support by @cunla in #60 + ------------------------------------------------------------------- Sun Oct 9 19:22:51 UTC 2022 - Ben Greiner diff --git a/python-fakeredis.spec b/python-fakeredis.spec index 2d15475..41efe04 100644 --- a/python-fakeredis.spec +++ b/python-fakeredis.spec @@ -1,7 +1,7 @@ # # spec file for package python-fakeredis # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,33 +17,30 @@ Name: python-fakeredis -Version: 1.9.3 +Version: 2.4.0 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 -# PATCH-FIX-UPSTREAM fakeredis-pr54-fix-ensure_str.patch gh#dsoftwareinc/fakeredis#54 -Patch0: fakeredis-pr54-fix-ensure_str.patch +URL: https://github.com/cunla/fakeredis-py +Source: https://github.com/cunla/fakeredis-py/archive/refs/tags/v%{version}.tar.gz#/fakeredis-%{version}-gh.tar.gz BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pip} BuildRequires: %{python_module poetry-core} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-redis < 4.4 +Requires: python-redis < 4.5 Requires: python-sortedcontainers >= 2.4.0 -Suggests: (python-aioredis >= 2.0.1) -Suggests: python-lupa >= 1.13 +Suggests: python-lupa >= 1.14 BuildArch: noarch # SECTION test requirements -# technically requires hypothesis >= 6.47.1, but we don't have it yet +# technically requires hypothesis >= 6.56, but we don't have it yet BuildRequires: %{python_module hypothesis} -BuildRequires: %{python_module lupa >= 1.13} +BuildRequires: %{python_module lupa >= 1.14} 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 < 4.4} +BuildRequires: %{python_module redis < 4.5} BuildRequires: %{python_module sortedcontainers >= 2.4.0} # /SECTION %python_subpackages From 9becdebc0f2e20a78fdf33c5a62dd8d0fb7e49af9fba9e4d03bcdc1ca86eea14 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 23 Jan 2023 09:25:14 +0000 Subject: [PATCH 2/3] - update to v2.5.0: * Implement support for BITPOS (bitmap command) (#112) * Fix json mget when dict is returned (#114) * fix: properly export (#116) * Extract param handling (#113) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-fakeredis?expand=0&rev=22 --- fakeredis-2.4.0-gh.tar.gz | 3 --- fakeredis-2.5.0-gh.tar.gz | 3 +++ python-fakeredis.changes | 9 +++++++++ python-fakeredis.spec | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 fakeredis-2.4.0-gh.tar.gz create mode 100644 fakeredis-2.5.0-gh.tar.gz diff --git a/fakeredis-2.4.0-gh.tar.gz b/fakeredis-2.4.0-gh.tar.gz deleted file mode 100644 index 27b8eef..0000000 --- a/fakeredis-2.4.0-gh.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2069ab09d85c1f2ea4787b64f74f04826197bda2503b30a867f052d7c760bb95 -size 132163 diff --git a/fakeredis-2.5.0-gh.tar.gz b/fakeredis-2.5.0-gh.tar.gz new file mode 100644 index 0000000..acc8fbe --- /dev/null +++ b/fakeredis-2.5.0-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b64f49830123fa0089fcb516db575a2590a605249a1d185938965464818fdfc +size 139911 diff --git a/python-fakeredis.changes b/python-fakeredis.changes index a490dec..a78455d 100644 --- a/python-fakeredis.changes +++ b/python-fakeredis.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jan 23 09:19:15 UTC 2023 - Dirk Müller + +- update to v2.5.0: + * Implement support for BITPOS (bitmap command) (#112) + * Fix json mget when dict is returned (#114) + * fix: properly export (#116) + * Extract param handling (#113) + ------------------------------------------------------------------- Fri Jan 6 11:11:54 UTC 2023 - Dirk Müller diff --git a/python-fakeredis.spec b/python-fakeredis.spec index 41efe04..9b80511 100644 --- a/python-fakeredis.spec +++ b/python-fakeredis.spec @@ -17,7 +17,7 @@ Name: python-fakeredis -Version: 2.4.0 +Version: 2.5.0 Release: 0 Summary: Fake implementation of redis API for testing purposes License: BSD-3-Clause AND MIT From 7d5040de45152dcc93b63cd21dc5c57e6abbcc6ebcaa3f947539dc3c14847546 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 28 Jan 2023 09:41:24 +0000 Subject: [PATCH 3/3] - drop fakeredis-pr54-fix-ensure_str.patch (upstream) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-fakeredis?expand=0&rev=23 --- python-fakeredis.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/python-fakeredis.changes b/python-fakeredis.changes index a78455d..3fdb3e5 100644 --- a/python-fakeredis.changes +++ b/python-fakeredis.changes @@ -33,6 +33,7 @@ Fri Jan 6 11:11:54 UTC 2023 - Dirk Müller * implement GETDEL and SINTERCARD support by @cunla in #57 * Test get float-type behavior by @cunla in #59 * Implement BZPOPMIN/BZPOPMAX support by @cunla in #60 +- drop fakeredis-pr54-fix-ensure_str.patch (upstream) ------------------------------------------------------------------- Sun Oct 9 19:22:51 UTC 2022 - Ben Greiner