Skip to content
This repository has been archived by the owner on Jun 5, 2023. It is now read-only.

Support Redis 3 #158

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ dist/
*.swp
*.swo
.tox/
.eggs/
release.sh
3 changes: 1 addition & 2 deletions pyres/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -391,4 +391,3 @@ def decr(self, ammount=1):

def clear(self):
self.resq.redis.delete(self.key)

2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
simplejson>3.0
redis>2.4.12
redis>3.2.0
setproctitle>1.0
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down