Merge branch 'main' into main

Author: Niccolum

.gitignore

@@ -1,3 +1,6 @@
+# OS Files
+.DS_Store
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

CHANGES.txt

@@ -1,3 +1,9 @@
+2.2.0 (unrelased)
+--------------------
+  - add ssl support for redis with sentinel, thanks @cyberjunk
+  - add RedisCluster Support, thanks @kkinder
+  - bugfixes
+
 2.1.1 (2023-06-11)
 ---------------------
  - fix compatability with Celery 5.3.0, thanks @jkseppan

makefile

@@ -8,7 +8,7 @@ version:
 version-%: OLDVERSION:=$(shell python setup.py --version)
 version-%: NEWVERSION=$(subst -,.,$*)
 version-%: 
-	sed -i -e s/$(OLDVERSION)/$(NEWVERSION)/ $(VERSION_FILE)
+	sed -i '' -e s/$(OLDVERSION)/$(NEWVERSION)/ $(VERSION_FILE)
 	git ci setup.py -m"bump version to $*"
 
 lint:

redbeat/schedulers.py

@@ -127,6 +127,8 @@ def get_redis(app=None):
 
             connection = RedisCluster.from_url(conf.redis_url, **redis_options)
         elif conf.redis_url.startswith('redis-sentinel') and 'sentinels' in redis_options:
+            from redis.sentinel import Sentinel
+
             connection_kwargs = {}
             if isinstance(conf.redis_use_ssl, dict):
                 connection_kwargs['ssl'] = True
@@ -138,7 +140,7 @@ def get_redis(app=None):
                 db=redis_options.get('db', 0),
                 decode_responses=True,
                 sentinel_kwargs=redis_options.get('sentinel_kwargs'),
-                **connection_kwargs
+                **connection_kwargs,
             )
             _set_redbeat_connect(app, REDBEAT_SENTINEL_KEY, sentinel, retry_period)
             connection = None

setup.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 from setuptools import setup
 
 long_description = open('README.rst').read()
@@ -6,7 +7,7 @@
     name="celery-redbeat",
     description="A Celery Beat Scheduler using Redis for persistent storage",
     long_description=long_description,
-    version="2.1.1",
+    version="2.2.0",
     url="https://github.com/sibson/redbeat",
     license="Apache License, Version 2.0",
     author="Marc Sibson",