Merge pull request #8 from ramonaoptics/fillock_0.13.1

Require filelock !=3.13.0

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.0.9 (2023/10/30)
+
+- Declare package incompatible with filelock 3.13.0. The problematic code was
+  fixed upstream in the released version 3.13.1.
+
 ## 0.0.8 (2023/10/30)
 
 - Fix compatibility with filelock 3.13.0.

multiuserfilelock/__init__.py

@@ -31,21 +31,6 @@
 
 
 class MultiUserFileLock(FileLock):
-    def __new__(cls, *args, **kwargs):
-        # Can be removed if upstream accepts our fix for this
-        # https://github.com/tox-dev/filelock/pull/284
-        if Version(filelock.__version__) >= Version("3.13.0"):
-            if 'group' in kwargs:
-                kwargs.pop('group')
-            if 'chmod' in kwargs:
-                kwargs.pop('chmod')
-            if 'user' in kwargs:
-                kwargs.pop('user')
-
-            return super().__new__(cls, *args, **kwargs)
-        else:
-            return super().__new__(cls)
-
     def __init__(self, *args, user=None, group=None, chmod=0o666, **kwargs):
         if os.name == 'nt':
             self._user = None

setup.py

@@ -30,7 +30,7 @@
         'Programming Language :: Python :: 3.12',
     ],
     install_requires=[
-        'filelock!=3.11.0',
+        'filelock!=3.11.0,!=3.13.0',
     ],
     packages=find_packages(),
     cmdclass=versioneer.get_cmdclass(),

tox.ini

@@ -15,7 +15,7 @@ deps =
     -r{toxinidir}/requirements_dev.txt
     3.9: filelock==3.10.7
     3.10: filelock==3.12.4
-    3.11: filelock==3.13.0
+    3.11: filelock==3.13.1
 ; If you want to make tox run the tests with the same versions, create a
 ; requirements.txt with the pinned versions and uncomment the following line:
 ;     -r{toxinidir}/requirements.txt