utilo 2.112.0__tar.gz → 2.112.2__tar.gz

{utilo-2.112.0/utilo.egg-info → utilo-2.112.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utilo
-Version: 2.112.0
+Version: 2.112.2
 Author-email: Helmut Konrad Schewe <helmutus@outlook.com>
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/anaticulae/utilo
@@ -11,13 +11,13 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: filelock<5.0.0,>=4.0.0
+Requires-Dist: filelock<5.0.0,>=4.2.10
 Requires-Dist: utilosafe<2.0.0,>=1.0.0
 Provides-Extra: dev
 Requires-Dist: PyYAML<7.0.0,>=6.0.3; extra == "dev"
 Requires-Dist: pytest-timeout<3.0.0,>=2.4.0; extra == "dev"
 Requires-Dist: utilotest<2.0.0,>=1.1.1; extra == "dev"
-Requires-Dist: iamraw<5.0.0,>=4.95.0; extra == "dev"
+Requires-Dist: iamraw<5.0.0,>=4.95.1; extra == "dev"
 Dynamic: license-file
 
 UTILA

{utilo-2.112.0 → utilo-2.112.2}/pyproject.toml

@@ -7,14 +7,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "utilo"
-version = "2.112.0"
+version = "2.112.2"
 description = ""
 requires-python = ">=3.12"
 authors = [
     { name = "Helmut Konrad Schewe", email = "helmutus@outlook.com" },
 ]
 dependencies = [
-    "filelock>=4.0.0,<5.0.0",
+    "filelock>=4.2.10,<5.0.0",
     "utilosafe>=1.0.0,<2.0.0",
 ]
 keywords = []
@@ -43,7 +43,7 @@ dev = [
     "PyYAML>=6.0.3,<7.0.0",
     "pytest-timeout>=2.4.0,<3.0.0",
     "utilotest>=1.1.1,<2.0.0",
-    "iamraw>=4.95.0,<5.0.0",
+    "iamraw>=4.95.1,<5.0.0",
 ]
 
 [project.urls]
@@ -63,21 +63,20 @@ output_format = "md"
 changelog_file = "CHANGELOG"
 
 [tool.semantic_release.commit_parser_options]
-patch_tags = [
+allowed_tags = [
     "build",
     "chore",
     "ci",
     "deps",
     "docs",
+    "feat",
     "fix",
     "perf",
     "refactor",
     "style",
     "test",
 ]
-minor_tags = [
-    "feat",
-]
+default_bump_level = 2
 
 [tool.setuptools.packages.find]
 where = [

{utilo-2.112.0 → utilo-2.112.2}/tests/test_file.py

@@ -7,6 +7,7 @@
 # be prosecuted under federal law. Its content is company confidential.
 #==============================================================================
 
+import multiprocessing
 import os
 
 import pytest
@@ -602,3 +603,28 @@ def test_file_create_owner(tmpdir):
     # -rw-rw-r-- local
     # -rw-r--r-- github
     assert mode in {33204, 33188}
+
+
+def test_file_replace_binary_overlap(tmpdir):
+    """Verify that concurrent processes replace file correctly."""
+    expected = b'binary'
+    path = utilo.join(tmpdir, 'file.txt')
+    concurrent_run(
+        target=utilo.file_replace_binary,
+        args=(path, expected),
+    )
+    content = utilo.file_read_binary(path, lock=True)
+    assert content == expected
+
+
+def concurrent_run(target, args, times: int = 100):
+    processes = [
+        multiprocessing.Process(
+            target=target,
+            args=args,
+        ) for _ in range(times)
+    ]
+    for p in processes:
+        p.start()
+    for p in processes:
+        p.join()

{utilo-2.112.0 → utilo-2.112.2}/utilo/cacher.py

@@ -78,8 +78,12 @@ def safehash(item):
         return hash(str(item))
 
 
-functools._HashedSeq.__init__.__defaults__ = (safehash,)
-
+try:
+    # python <= 3.12
+    functools._HashedSeq.__init__.__defaults__ = (safehash,)
+except AttributeError:
+    pass
+    # python >= 3.13
 # pylint:disable=all
 
 ################################################################################

{utilo-2.112.0 → utilo-2.112.2}/utilo/file/__init__.py

@@ -85,12 +85,14 @@ def file_append(path: str, content: str, create: bool = False, private: bool = F
 
 
 @contextlib.contextmanager
-def lock_file(path: str, lock: bool = True):  # pylint:disable=unused-argument
-    if not lock:
-        yield
-        return
-    lockpath = utilo.tmpfile(root=tmp('/utilo'))
-    with filelock.FileLock(lockpath):
+def lock_file(path: str, lock: bool = True):
+    if lock:
+        lockdir = tmp('/utilo')
+        simple = utilo.simple(path, maxlength=255)
+        lockpath = utilo.join(lockdir, simple)
+        with filelock.FileLock(lockpath):
+            yield
+    else:
         yield
 
 
@@ -211,8 +213,11 @@ def file_read_binary(
     """Read binary file content"""
     with lock_file(path, lock=lock):
         utilo.exists_assert(path)
-        with utilo.file.securewrapper.open(path, mode='rb',
-                                           private=private) as fp:
+        with utilo.file.securewrapper.open(
+                path,
+                mode='rb',
+                private=private,
+        ) as fp:
             content = fp.read(size)
     return content
 
@@ -252,7 +257,11 @@ def file_replace(
                 lock=False,
             )
             return
-        current_content = file_read(path, private=private)
+        current_content = file_read(
+            path,
+            private=private,
+            lock=False,
+        )
         if current_content == content:
             return
         with utilo.file.securewrapper.open(
@@ -279,9 +288,18 @@ def file_replace_binary(path: str, content: bytes, private: bool = False):
     """
     with lock_file(path, lock=True):
         if not os.path.exists(path):
-            file_create_binary(path, content, private=private)
+            file_create_binary(
+                path,
+                content,
+                private=private,
+                lock=False,
+            )
             return
-        current_content = file_read_binary(path, private=private)
+        current_content = file_read_binary(
+            path,
+            private=private,
+            lock=False,
+        )
         if current_content == content:
             return
         with utilo.file.securewrapper.open(

{utilo-2.112.0 → utilo-2.112.2}/utilo/string/__init__.py

@@ -386,6 +386,8 @@ def simple(item: str, maxlength: int = 25) -> str:
 
     >>> simple('No spaces _+; 133')
     'Nospaces133'
+    >>> simple('/c/windows/tmp/abc/test.txt')
+    'cwindowstmpabctesttxt'
     """
     item = utilo.fix_encoding(item)
     item = item.translate(SIMPLIFY)

{utilo-2.112.0 → utilo-2.112.2/utilo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utilo
-Version: 2.112.0
+Version: 2.112.2
 Author-email: Helmut Konrad Schewe <helmutus@outlook.com>
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/anaticulae/utilo
@@ -11,13 +11,13 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: filelock<5.0.0,>=4.0.0
+Requires-Dist: filelock<5.0.0,>=4.2.10
 Requires-Dist: utilosafe<2.0.0,>=1.0.0
 Provides-Extra: dev
 Requires-Dist: PyYAML<7.0.0,>=6.0.3; extra == "dev"
 Requires-Dist: pytest-timeout<3.0.0,>=2.4.0; extra == "dev"
 Requires-Dist: utilotest<2.0.0,>=1.1.1; extra == "dev"
-Requires-Dist: iamraw<5.0.0,>=4.95.0; extra == "dev"
+Requires-Dist: iamraw<5.0.0,>=4.95.1; extra == "dev"
 Dynamic: license-file
 
 UTILA

{utilo-2.112.0 → utilo-2.112.2}/utilo.egg-info/requires.txt

@@ -1,8 +1,8 @@
-filelock<5.0.0,>=4.0.0
+filelock<5.0.0,>=4.2.10
 utilosafe<2.0.0,>=1.0.0
 
 [dev]
 PyYAML<7.0.0,>=6.0.3
 pytest-timeout<3.0.0,>=2.4.0
 utilotest<2.0.0,>=1.1.1
-iamraw<5.0.0,>=4.95.0
+iamraw<5.0.0,>=4.95.1