Merge branch 'master' into dependabot/pip/pywin32-301

Author: judahrand

.github/workflows/release.yml

@@ -0,0 +1,27 @@
+name: Release
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  release:
+    name: Release to PyPi
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install Poetry
+        run: pipx install poetry
+
+      - name: Build
+        run: poetry build
+
+      - name: Publish
+        env:
+          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.POETRY_PYPI_TOKEN_PYPI }}
+        run: |
+          poetry config pypi-token.pypi "$POETRY_PYPI_TOKEN_PYPI"
+          poetry publish

CHANGELOG.rst

@@ -4,6 +4,26 @@ CHANGELOG
 Development Version
 +++++++++++++++++++
 
+0.4.0
+*****
+
+* [BREAKING] Drop support for `python<3.7`
+
+* [FEAT] Add `KubernetesLock` backend
+* [FEAT] Add `FileLock` backend
+* [FEAT] Install backend specific dependencies with extras #59_
+* [FEAT] Add `.renew()` method to all backends #61_
+
+* [BUGFIX] Use `ARGV` in Redis Lua scripts to add RedisCluster compatibility #31_
+* [BUGFIX] `redis>=2.10.6` client won't work with `sherlock 0.3.1` #32_
+* [BUGFIX] `timeout=0` doesn't work as expected with `RedisLock` #60_
+
+.. _#31: https://github.com/vaidik/sherlock/issues/31
+.. _#32: https://github.com/vaidik/sherlock/issues/32
+.. _#59: https://github.com/py-sherlock/sherlock/pull/59
+.. _#60: https://github.com/py-sherlock/sherlock/pull/60
+.. _#61: https://github.com/py-sherlock/sherlock/pull/61
+
 0.3.2
 *****
 

poetry.lock

@@ -2,7 +2,7 @@
 
 [tool.poetry]
 name = "sherlock"
-version = "0.4.0a0"
+version = "0.4.0"
 description = "Distributed inter-process locks with a choice of backend"
 license =  "MIT"
 authors = [

pyproject.toml

@@ -412,16 +412,16 @@ class RedisLock(BaseLock):
     """
 
     _acquire_script = """
-    local result = redis.call('SETNX', KEYS[1], KEYS[2])
-    if result == 1 and KEYS[3] ~= -1 then
-        redis.call('EXPIRE', KEYS[1], KEYS[3])
+    local result = redis.call('SETNX', KEYS[1], ARGV[1])
+    if result == 1 and ARGV[2] ~= -1 then
+        redis.call('EXPIRE', KEYS[1], ARGV[2])
     end
     return result
     """
 
     _release_script = """
     local result = 0
-    if redis.call('GET', KEYS[1]) == KEYS[2] then
+    if redis.call('GET', KEYS[1]) == ARGV[1] then
         redis.call('DEL', KEYS[1])
         result = 1
     end
@@ -430,9 +430,9 @@ class RedisLock(BaseLock):
 
     _renew_script = """
     local result = 0
-    if redis.call('GET', KEYS[1]) == KEYS[2] then
-        if KEYS[3] ~= -1 then
-            redis.call('EXPIRE', KEYS[1], KEYS[3])
+    if redis.call('GET', KEYS[1]) == ARGV[1] then
+        if ARGV[2] ~= -1 then
+            redis.call('EXPIRE', KEYS[1], ARGV[2])
         else
             redis.call('PERSIST', KEYS[1])
         end
@@ -485,7 +485,7 @@ def _acquire(self):
             expire = -1
         else:
             expire = self.expire
-        if self._acquire_func(keys=[self._key_name, owner, expire]) != 1:
+        if self._acquire_func(keys=[self._key_name], args=[owner, expire]) != 1:
             return False
         self._owner = owner
         return True
@@ -494,7 +494,7 @@ def _release(self):
         if self._owner is None:
             raise LockException("Lock was not set by this process.")
 
-        if self._release_func(keys=[self._key_name, self._owner]) != 1:
+        if self._release_func(keys=[self._key_name], args=[self._owner]) != 1:
             raise LockException(
                 "Lock could not be released because it was "
                 "not acquired by this instance."
@@ -506,7 +506,10 @@ def _renew(self) -> bool:
         if self._owner is None:
             raise LockException("Lock was not set by this process.")
 
-        if self._release_func(keys=[self._key_name, self._owner, self.expire]) != 1:
+        if (
+            self._release_func(keys=[self._key_name], args=[self._owner, self.expire])
+            != 1
+        ):
             return False
         return True