Merge pull request #7 from ramonaoptics/compatibility_with_filelock_3.13

Compatibility with filelock 3.13

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.9', '3.11']
+        python-version: ['3.7', '3.9', '3.10', '3.11', '3.12']
       fail-fast: false
 
     steps:

CHANGELOG.md

@@ -1,4 +1,8 @@
-## 0.0.6 (2023/04/18)
+## 0.0.8 (2023/10/30)
+
+- Fix compatibility with filelock 3.13.0.
+
+## 0.0.7 (2023/04/18)
 
 - Fix compatibility with filelock 3.12.0.
 - multiuserfilelock (all version) are incompatible with filelock 3.11.0.

multiuserfilelock/__init__.py

@@ -31,6 +31,21 @@
 
 
 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

@@ -16,6 +16,19 @@
     long_description_content_type='text/markdown',
     license='BSD',
     python_requires='>=3.7',
+    classifiers=[
+        'Development Status :: 2 - Pre-Alpha',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: BSD License',
+        'Natural Language :: English',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+    ],
     install_requires=[
         'filelock!=3.11.0',
     ],

tox.ini

@@ -14,6 +14,8 @@ setenv =
 deps =
     -r{toxinidir}/requirements_dev.txt
     3.9: filelock==3.10.7
+    3.10: filelock==3.12.4
+    3.11: filelock==3.13.0
 ; 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