jetpytools 2.2.1__tar.gz → 2.2.2__tar.gz

{jetpytools-2.2.1 → jetpytools-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jetpytools
-Version: 2.2.1
+Version: 2.2.2
 Summary: Collection of stuff that's useful in general python programming
 Project-URL: Source Code, https://github.com/Jaded-Encoding-Thaumaturgy/jetpytools
 Project-URL: Contact, https://discord.gg/XTpc6Fa9eB

jetpytools-2.2.2/jetpytools/_version.py

@@ -0,0 +1,2 @@
+__version__ = "2.2.2"
+__version_tuple__ = (2, 2, 2)

{jetpytools-2.2.1 → jetpytools-2.2.2}/jetpytools/enums/base.py

@@ -71,7 +71,7 @@ class CustomEnum(Enum):
             var_name=var_name,
             enum_name=cls,
             value=value,
-            readable_enum=(f"{name} ({value!r})" for name, value in cls.__members__.items()),
+            readable_enum=(f"{name} ({value!s})" for name, value in cls.__members__.items()),
             reason=value,
         ) from None
 

{jetpytools-2.2.1 → jetpytools-2.2.2}/jetpytools/types/file.py

@@ -132,7 +132,7 @@ class SPath(Path):
         import shutil
 
         try:
-            return shutil.rmtree(str(self.get_folder()), ignore_errors)
+            return shutil.rmtree(self.get_folder(), ignore_errors)
         except FileNotFoundError:
             if not missing_ok:
                 raise
@@ -161,9 +161,11 @@ class SPath(Path):
 
         return self.is_dir() and not any(self.iterdir())
 
-    def move_dir(self, dst: SPath, *, mode: int = 0o777) -> None:
+    def move_dir(self, dst: SPathLike, *, mode: int = 0o777) -> None:
         """Move the directory to the specified destination."""
 
+        dst = SPath(dst)
+
         dst.mkdir(mode, True, True)
 
         for file in listdir(self):
@@ -177,21 +179,22 @@ class SPath(Path):
 
         self.rmdir()
 
-    def copy_dir(self, dst: SPath) -> SPath:
+    def copy_dir(self, dst: SPathLike) -> SPath:
         """Copy the directory to the specified destination."""
+        import shutil
 
         if not self.is_dir():
             from ..exceptions import PathIsNotADirectoryError
 
             raise PathIsNotADirectoryError('The given path, "{self}" is not a directory!', self.copy_dir)
 
-        dst.mkdirp()
+        dst = SPath(dst)
 
-        import shutil
+        dst.mkdirp()
 
         shutil.copytree(self, dst, dirs_exist_ok=True)
 
-        return SPath(dst)
+        return dst
 
     def lglob(self, pattern: str = "*") -> list[SPath]:
         """Glob the path and return the list of paths."""
@@ -209,17 +212,16 @@ class SPath(Path):
 
         return None
 
-    def find_newest_file(self, pattern: str = "*") -> SPath | None:
+    def find_newest_file(
+        self, pattern: str = "*", *, case_sensitive: bool | None = None, recurse_symlinks: bool = False
+    ) -> SPath | None:
         """Find the most recently modified file matching the given pattern in the directory."""
 
-        matching_files = self.get_folder().glob(pattern)
-
-        try:
-            next(matching_files)
-        except StopIteration:
-            return None
-
-        return max(matching_files, key=lambda p: p.stat().st_mtime)
+        return max(
+            self.get_folder().glob(pattern, case_sensitive=case_sensitive, recurse_symlinks=recurse_symlinks),
+            key=lambda p: p.stat().st_mtime,
+            default=None,
+        )
 
     def get_size(self) -> int:
         """Get the size of the file or directory in bytes."""

{jetpytools-2.2.1 → jetpytools-2.2.2}/jetpytools/types/utils.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import sys
 from contextlib import suppress
 from functools import wraps
+from threading import Lock
 from types import LambdaType
 from typing import (
     TYPE_CHECKING,
@@ -156,7 +157,7 @@ _P0 = ParamSpec("_P0")
 _P1 = ParamSpec("_P1")
 
 
-class _InjectedSelfFunc(Protocol[_T_co, _P, _R_co]):
+class _InjectedSelfFunc(Protocol[_T_co, _P, _R_co]):  # type: ignore[misc]
     """
     Protocol defining the callable interface for wrapped functions under `inject_self`.
 
@@ -858,6 +859,8 @@ class KwargsNotNone(KwargsT):
 
 class SingletonMeta(type):
     _instances: ClassVar[dict[SingletonMeta, Any]] = {}
+    _lock = Lock()
+
     _singleton_init: bool
 
     def __new__[MetaSelf: SingletonMeta](
@@ -876,12 +879,16 @@ class SingletonMeta(type):
     if not TYPE_CHECKING:
 
         def __call__(cls, *args: Any, **kwargs: Any) -> Any:
-            if cls not in cls._instances:
-                cls._instances[cls] = obj = super().__call__(*args, **kwargs)
-                return obj
+            if cls in cls._instances and not cls._singleton_init:
+                return cls._instances[cls]
+
+            with cls._lock:
+                if cls not in cls._instances:
+                    cls._instances[cls] = obj = super().__call__(*args, **kwargs)
+                    return obj
 
-            if cls._singleton_init:
-                cls._instances[cls].__init__(*args, **kwargs)
+                if cls._singleton_init:
+                    cls._instances[cls].__init__(*args, **kwargs)
 
             return cls._instances[cls]
 

{jetpytools-2.2.1 → jetpytools-2.2.2}/pyproject.toml

@@ -25,7 +25,7 @@ dependencies = ["typing_extensions>=4.15.0; python_version<'3.13'"]
 "Contact" = "https://discord.gg/XTpc6Fa9eB"
 
 [dependency-groups]
-dev = ["mypy~=1.18.0", "ruff~=0.14.0", "pytest>=9.0.0, <10.0.0", "twine>=6.2.0"]
+dev = ["mypy~=1.19.0", "ruff~=0.14.0", "pytest>=9.0.0, <10.0.0", "twine>=6.2.0"]
 
 [build-system]
 requires = ["hatchling>=1.27.0", "versioningit"]

jetpytools-2.2.1/jetpytools/_version.py

@@ -1,2 +0,0 @@
-__version__ = "2.2.1"
-__version_tuple__ = (2, 2, 1)