From c9ec4c9bc519e61c68061fda461df4721fb8d2f9 Mon Sep 17 00:00:00 2001 From: Yu Qian Date: Wed, 24 Apr 2019 11:52:23 -0400 Subject: [PATCH] Fix to support redis 3 --- .gitignore | 2 ++ pyres/__init__.py | 3 +-- requirements.txt | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e3a0b9e..0a27813 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ dist/ *.swp *.swo .tox/ +.eggs/ +release.sh diff --git a/pyres/__init__.py b/pyres/__init__.py index 011cd88..2a8045b 100644 --- a/pyres/__init__.py +++ b/pyres/__init__.py @@ -300,7 +300,7 @@ def enqueue_at_from_string(self, datetime, klass_as_string, queue, *args, **kwar def delayed_push(self, datetime, item): key = int(time.mktime(datetime.timetuple())) self.redis.rpush('resque:delayed:%s' % key, ResQ.encode(item)) - self.redis.zadd('resque:delayed_queue_schedule', key, key) + self.redis.zadd('resque:delayed_queue_schedule', {key: key}) def delayed_queue_peek(self, start, count): return [int(item) for item in self.redis.zrange( @@ -391,4 +391,3 @@ def decr(self, ammount=1): def clear(self): self.resq.redis.delete(self.key) - diff --git a/requirements.txt b/requirements.txt index 96046b5..657f348 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ simplejson>3.0 -redis>2.4.12 +redis>3.2.0 setproctitle>1.0 diff --git a/setup.py b/setup.py index e0597ed..ed5d541 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def run_tests(self): result = pytest.main(self.test_args) sys.exit(result) -version='1.5' +version='1.6.sm' setup( name='pyres', version=version,