---
...ve-support-for-nonfree-Redis-modules.patch | 40 +++++++------------
community/py3-redis/APKBUILD | 6 +--
2 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/community/py3-redis/0001-all-remove-support-for-nonfree-Redis-modules.patch b/community/py3-redis/0001-all-remove-support-for-nonfree-Redis-modules.patch
index 813068cb1d..df625df446 100644
--- a/community/py3-redis/0001-all-remove-support-for-nonfree-Redis-modules.patch
@@ -1,16 +1,16 @@
-From 192dac9b9f1d93a3b2c75d6685094ce40827846c Mon Sep 17 00:00:00 2001
+From b2d9df7c788793a498f8aa0e0561bd1a6851da55 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Tue, 16 Nov 2021 08:23:10 +0100
Subject: [PATCH] all: remove support for nonfree Redis modules
---
- redis/client.py | 4 +-
+ redis/client.py | 5 +-
redis/commands/__init__.py | 2 -
redis/commands/json/__init__.py | 120 --
redis/commands/json/commands.py | 232 ----
redis/commands/json/decoders.py | 59 -
redis/commands/json/path.py | 16 -
- redis/commands/redismodules.py | 48 -
+ redis/commands/redismodules.py | 35 -
redis/commands/search/__init__.py | 96 --
redis/commands/search/_util.py | 7 -
redis/commands/search/aggregation.py | 406 -------
@@ -31,7 +31,7 @@ Subject: [PATCH] all: remove support for nonfree Redis modules
tests/test_json.py | 1416 ----------------------
tests/test_search.py | 1315 --------------------
tests/test_timeseries.py | 588 ---------
- 27 files changed, 2 insertions(+), 7162 deletions(-)
+ 27 files changed, 2 insertions(+), 7150 deletions(-)
delete mode 100644 redis/commands/json/__init__.py
delete mode 100644 redis/commands/json/commands.py
delete mode 100644 redis/commands/json/decoders.py
@@ -58,24 +58,25 @@ Subject: [PATCH] all: remove support for nonfree Redis modules
delete mode 100644 tests/test_timeseries.py
diff --git a/redis/client.py b/redis/client.py
-index 753770e..8bda244 100755
+index dc6693d..93fc459 100755
--- a/redis/client.py
+++ b/redis/client.py
-@@ -6,7 +6,7 @@ import re
+@@ -6,8 +6,7 @@ import re
import threading
import time
import warnings
--from redis.commands import CoreCommands, RedisModuleCommands, list_or_args
-+from redis.commands import CoreCommands, list_or_args
+-from redis.commands import (CoreCommands, RedisModuleCommands,
+- SentinelCommands, list_or_args)
++from redis.commands import CoreCommands, SentinelCommands, list_or_args
from redis.connection import (ConnectionPool, UnixDomainSocketConnection,
SSLConnection)
from redis.lock import Lock
-@@ -606,7 +606,7 @@ def parse_set_result(response, **options):
+@@ -607,7 +606,7 @@ def parse_set_result(response, **options):
return response and str_if_bytes(response) == 'OK'
--class Redis(RedisModuleCommands, CoreCommands, object):
-+class Redis(CoreCommands, object):
+-class Redis(RedisModuleCommands, CoreCommands, SentinelCommands, object):
++class Redis(CoreCommands, SentinelCommands, object):
"""
Implementation of the Redis protocol.
@@ -548,12 +549,11 @@ index 6d87045..0000000
- return self.strPath
diff --git a/redis/commands/redismodules.py b/redis/commands/redismodules.py
deleted file mode 100644
-index b3cbee1..0000000
+index 5f629fb..0000000
--- a/redis/commands/redismodules.py
+++ /dev/null
-@@ -1,48 +0,0 @@
+@@ -1,35 +0,0 @@
-from json import JSONEncoder, JSONDecoder
--from redis.exceptions import ModuleError
-
-
-class RedisModuleCommands:
@@ -564,10 +564,6 @@ index b3cbee1..0000000
- def json(self, encoder=JSONEncoder(), decoder=JSONDecoder()):
- """Access the json namespace, providing support for redis json.
- """
-- if 'JSON.SET' not in self.__commands__:
-- raise ModuleError("redisjson is not loaded in redis. "
-- "For more information visit "
-- "https://redisjson.io/")
-
- from .json import JSON
- jj = JSON(
@@ -579,10 +575,6 @@ index b3cbee1..0000000
- def ft(self, index_name="idx"):
- """Access the search namespace, providing support for redis search.
- """
-- if 'FT.INFO' not in self.__commands__:
-- raise ModuleError("redisearch is not loaded in redis. "
-- "For more information visit "
-- "https://redisearch.io/")
-
- from .search import Search
- s = Search(client=self, index_name=index_name)
@@ -592,10 +584,6 @@ index b3cbee1..0000000
- """Access the timeseries namespace, providing support for
- redis timeseries data.
- """
-- if 'TS.INFO' not in self.__commands__:
-- raise ModuleError("reditimeseries is not loaded in redis. "
-- "For more information visit "
-- "https://redistimeseries.io/")
-
- from .timeseries import TimeSeries
- s = TimeSeries(client=self)
diff --git a/community/py3-redis/APKBUILD b/community/py3-redis/APKBUILD
index 7d21df1965..7c80e1089f 100644
--- a/community/py3-redis/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Eivind Uggedal <eu@eju.no>
pkgname=py3-redis
_pkgname=redis
-pkgver=4.0.0
+pkgver=4.0.2
pkgrel=0
pkgdesc="Python3 client for Redis key-value store"
url="https://github.com/andymccurdy/redis-py"
@@ -34,6 +34,6 @@ package() {
}
sha512sums="
-5975407b427d9edc87903aeb015e3f62a88bcc417be9fc91de56f852eed7d1bad9cd865ba40540a7c950b1a4e9bdfde20d6d7c4616ed859b6520adcca8085ea9 redis-4.0.0.tar.gz
-59867118bba810cf25c4c0ec7b768e3fe717103d6a83c3a8d44d607c3ccee399e07ba7e8e7face94549a861db3cbbc5d2ae75b7a1ddaabc566390e1dd78193c3 0001-all-remove-support-for-nonfree-Redis-modules.patch
+3f73ddd2ceb551fa447cfb4ecdc1d393957bbfd8c184ae3d357f9f47fff860f1c4684ec0fc3cb85fea530454456c17a98a2a56e592bef4cd9ad17bb405c1a0f7 redis-4.0.2.tar.gz
+f2f890e147bd76311b6aa9d0bbdab64f44c46a52e450c7c6ca2c9eddcf30e0a6ed8e962950dc98d0160a45eb68580399707ff6a12a17c56a768382814deab626 0001-all-remove-support-for-nonfree-Redis-modules.patch
"
--
2.34.0