superpathlib 2.0.3__tar.gz → 2.0.5__tar.gz

{superpathlib-2.0.3/src/superpathlib.egg-info → superpathlib-2.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: superpathlib
-Version: 2.0.3
+Version: 2.0.5
 Summary: Extended Pathlib
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License: MIT
@@ -11,7 +11,7 @@ License-File: LICENSE
 Requires-Dist: simple-classproperty<5,>=4.0.2
 Provides-Extra: full
 Requires-Dist: dirhash<1,>=0.2.1; extra == "full"
-Requires-Dist: numpy<2,>=1.26.4; extra == "full"
+Requires-Dist: numpy<3,>=1.26.4; extra == "full"
 Requires-Dist: package-utils<1,>=0.6.1; extra == "full"
 Requires-Dist: PyYaml<7,>=6.0.1; extra == "full"
 Requires-Dist: xattr<2,>=0.10.1; extra == "full"
@@ -20,7 +20,7 @@ Requires-Dist: hypothesis<7,>=6.97.1; extra == "dev"
 Requires-Dist: package-dev-tools<1,>=0.5.12; extra == "dev"
 Requires-Dist: types-PyYaml<7,>=6.0.12.12; extra == "dev"
 Requires-Dist: dirhash<1,>=0.2.1; extra == "dev"
-Requires-Dist: numpy<2,>=1.26.4; extra == "dev"
+Requires-Dist: numpy<3,>=1.26.4; extra == "dev"
 Requires-Dist: package-utils<1,>=0.6.1; extra == "dev"
 Requires-Dist: PyYaml<7,>=6.0.1; extra == "dev"
 Requires-Dist: xattr<2,>=0.10.1; extra == "dev"

{superpathlib-2.0.3 → superpathlib-2.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "superpathlib"
-version = "2.0.3"
+version = "2.0.5"
 description = "Extended Pathlib"
 authors = [{name = "Quinten Roets", email = "qdr2104@columbia.edu"}]
 license = {text = "MIT"}
@@ -13,7 +13,7 @@ dependencies = [
 [project.optional-dependencies]
 full = [
     "dirhash >=0.2.1, <1",
-    "numpy >=1.26.4, <2",
+    "numpy >=1.26.4, <3",
     "package-utils >=0.6.1, <1",
     "PyYaml >=6.0.1, <7",
     "xattr >=0.10.1, <2",
@@ -27,7 +27,7 @@ dev = [
 
     # full
     "dirhash >=0.2.1, <1",
-    "numpy >=1.26.4, <2",
+    "numpy >=1.26.4, <3",
     "package-utils >=0.6.1, <1",
     "PyYaml >=6.0.1, <7",
     "xattr >=0.10.1, <2",
@@ -41,7 +41,7 @@ requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
 [tool.coverage.run]
-command_line = "-m pytest"
+command_line = "-m pytest tests"
 
 [tool.coverage.report]
 precision = 4
@@ -67,12 +67,12 @@ pythonpath = [
 fix = true
 
 [tool.ruff.lint]
-select = [
-    "E",  # pycodestyle errors
-    "W",  # pycodestyle warnings
-    "F",  # pyflakes
-    "I",  # isort
-    "UP",  # pyupgrade
+select = ["ALL"]
+ignore = [
+    "ANN101",  # annotate self
+    "ANN102",  # annotate cls
+    "ANN401",  # annotated with Any
+    "D", # docstrings
 ]
 
 [tool.ruff.lint.isort]
@@ -80,6 +80,7 @@ known-first-party = ["src"]
 
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]
+"tests/*" = ["S101"]  # assert used
 
 [tool.setuptools.package-data]
 superpathlib = ["py.typed"]

{superpathlib-2.0.3 → superpathlib-2.0.5}/src/superpathlib/base.py

@@ -3,21 +3,21 @@ import pathlib
 import sys
 
 
-class Path(pathlib.Path):
+class Path(pathlib.Path):  # pragma: nocover
     """
     Extend pathlib functionality and enable further extensions by inheriting.
     """
 
     # _flavour attribute explicitly required to inherit from pathlib
-    if sys.version_info.minor <= 11:
+    if sys.version_info < (3, 12):
         _flavour = (
-            pathlib._windows_flavour  # type: ignore[attr-defined] # noqa
+            pathlib._windows_flavour  # type: ignore[attr-defined] # noqa: SLF001
             if os.name == "nt"
-            else pathlib._posix_flavour  # type: ignore[attr-defined] # noqa
+            else pathlib._posix_flavour  # type: ignore[attr-defined] # noqa: SLF001
         )
-    else:  # pragma: nocover
+    else:
         _flavour = (
-            pathlib.ntpath  # type: ignore[attr-defined] # noqa
+            pathlib.ntpath  # type: ignore[attr-defined]
             if os.name == "nt"
-            else pathlib.posixpath  # type: ignore[attr-defined] # noqa
+            else pathlib.posixpath  # type: ignore[attr-defined]
         )

{superpathlib-2.0.3 → superpathlib-2.0.5}/src/superpathlib/cached_content.py

@@ -21,12 +21,12 @@ class Path(metadata_properties.Path):
     def cached_content(self) -> CachedFileContent[dict[str, str]]:
         from package_utils.storage import CachedFileContent
 
-        return CachedFileContent(self, default={})  # type: ignore
+        return CachedFileContent(self, default={})  # type: ignore[arg-type]
 
     def create_cached_content(self, default: T) -> CachedFileContent[T]:
         from package_utils.storage import CachedFileContent
 
-        return CachedFileContent(self, default=default)  # type: ignore
+        return CachedFileContent(self, default=default)  # type: ignore[arg-type]
 
     @cached_property
     def cached_text(self) -> CachedFileContent[str]:
@@ -39,7 +39,7 @@ class Path(metadata_properties.Path):
             self.text = content
 
         return CachedFileContent(
-            self,  # type: ignore
+            self,  # type: ignore[arg-type]
             default="",
             load_function=load_function,
             save_function=save_function,
@@ -56,7 +56,7 @@ class Path(metadata_properties.Path):
             self.byte_content = content
 
         return CachedFileContent(
-            self,  # type: ignore
+            self,  # type: ignore[arg-type]
             default=b"",
             load_function=load_function,
             save_function=save_function,

{superpathlib-2.0.3 → superpathlib-2.0.5}/src/superpathlib/common_folders.py

@@ -19,7 +19,7 @@ class Path(base.Path):
 
     @classmethod
     @classproperty
-    def HOME(cls: type[T]) -> T:
+    def HOME(cls: type[T]) -> T:  # noqa: N802
         return cls.home()
 
     @classmethod

{superpathlib-2.0.3 → superpathlib-2.0.5}/src/superpathlib/content_properties.py

@@ -2,12 +2,13 @@ from __future__ import annotations
 
 import json
 import typing
-from collections.abc import Iterable
 from typing import Any
 
 from . import base
 
 if typing.TYPE_CHECKING:  # pragma: nocover
+    from collections.abc import Iterable
+
     from numpy.typing import NDArray
 
 
@@ -68,17 +69,17 @@ class Path(base.Path):
         import yaml
 
         # C implementation much faster but only supported on Linux
-        Loader: type[yaml.CFullLoader | yaml.FullLoader] = (
+        Loader: type[yaml.CFullLoader | yaml.FullLoader] = (  # noqa: N806
             yaml.CFullLoader if hasattr(yaml, "CFullLoader") else yaml.FullLoader
         )
-        return yaml.load(self.text, Loader=Loader) or {}
+        return yaml.load(self.text, Loader=Loader) or {}  # noqa: S506
 
     @yaml.setter
     def yaml(self, value: dict[str, Any] | list[Any]) -> None:
         import yaml
 
         # C implementation much faster but only supported on Linux
-        Dumper = yaml.CDumper if hasattr(yaml, "CDumper") else yaml.Dumper
+        Dumper = yaml.CDumper if hasattr(yaml, "CDumper") else yaml.Dumper  # noqa: N806
         self.text = yaml.dump(value, Dumper=Dumper, width=1024)
 
     @property
@@ -86,11 +87,11 @@ class Path(base.Path):
         import numpy as np
 
         with self.open("rb") as fp:
-            return np.load(fp)  # type: ignore
+            return np.load(fp)  # type: ignore[no-any-return]
 
     @numpy.setter
     def numpy(self, value: NDArray[Any]) -> None:
         import numpy as np
 
         with self.open("wb") as fp:
-            np.save(fp, value)  # noqa
+            np.save(fp, value)

{superpathlib-2.0.3 → superpathlib-2.0.5}/src/superpathlib/encryption.py

@@ -22,10 +22,10 @@ class EncryptedPath(Path):
     @cached_property
     def password(self) -> str:  # pragma: nocover
         if "GITHUB_ACTION" in os.environ:
-            password = "github_action_password"
+            password = "github_action_password"  # noqa: S105
         else:
             command = 'ksshaskpass -- "Enter passphrase for file encryption: "'
-            password = subprocess.getoutput(command)
+            password = subprocess.getoutput(command)  # noqa: S605
         return password
 
     @property
@@ -39,24 +39,32 @@ class EncryptedPath(Path):
     def read_bytes(self) -> bytes:
         encrypted_bytes = super().read_bytes()
         if encrypted_bytes:
-            process = subprocess.Popen(
-                self.decryption_command, stdin=subprocess.PIPE, stdout=subprocess.PIPE
+            process = subprocess.Popen(  # noqa: S603
+                self.decryption_command,
+                stdin=subprocess.PIPE,
+                stdout=subprocess.PIPE,
             )
             decrypted_bytes, _ = process.communicate(input=encrypted_bytes)
         else:
             decrypted_bytes = encrypted_bytes
         return decrypted_bytes
 
-    def write_bytes(self, data: bytes) -> int:  # type: ignore
-        process = subprocess.Popen(
-            self.encryption_command, stdin=subprocess.PIPE, stdout=subprocess.PIPE
+    def write_bytes(self, data: bytes) -> int:  # type: ignore[override]
+        process = subprocess.Popen(  # noqa: S603
+            self.encryption_command,
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
         )
         encrypted_data = process.communicate(input=data)[0]
         return super().write_bytes(encrypted_data)
 
-    def read_text(self, encoding: str | None = None, errors: str | None = None) -> str:
+    def read_text(
+        self,
+        encoding: str | None = None,  # noqa: ARG002
+        errors: str | None = None,  # noqa: ARG002
+    ) -> str:
         return self.read_bytes().decode()
 
-    def write_text(self, data: str, **_: Any) -> int:  # type: ignore
+    def write_text(self, data: str, **_: Any) -> int:  # type: ignore[override]
         byte_data = data.encode()
         return self.write_bytes(byte_data)

{superpathlib-2.0.3 → superpathlib-2.0.5}/src/superpathlib/extra_functionality.py

@@ -1,23 +1,20 @@
+import contextlib
 import os
 import shutil
 import tempfile
 import time
 import typing
 import urllib.parse
-from collections.abc import Callable, Generator
+from collections.abc import Callable, Iterator
 from functools import cached_property
 from types import TracebackType
-from typing import Any, TypeVar
+from typing import Any, TypeVar, cast
 
 from . import cached_content
 from .utils import find_first_match
 
 PathType = TypeVar("PathType", bound="Path")
 
-# Long import times relative to usage frequency: lazy imports
-# from datetime import datetime
-# import dirhash
-
 
 class Path(cached_content.Path):
     """
@@ -45,14 +42,16 @@ class Path(cached_content.Path):
         return path
 
     def with_timestamp(self: PathType) -> PathType:
-        from datetime import datetime  # noqa: E402, autoimport
+        from datetime import datetime, timezone
 
-        timestamp = datetime.fromtimestamp(int(time.time()))  # precision up to second
-        return self.with_stem(f"{self.stem} {timestamp}")
+        timestamp = int(time.time())  # precision up to second
+        datetime_timestamp = datetime.fromtimestamp(timestamp, tz=timezone.utc)
+        return self.with_stem(f"{self.stem} {datetime_timestamp}")
 
     def copy_to(
         self,
         dest: PathType,
+        *,
         include_properties: bool = True,
         only_if_newer: bool = False,
     ) -> None:
@@ -70,18 +69,22 @@ class Path(cached_content.Path):
     def archive_format(self) -> str:
         # noinspection PyProtectedMember
         path_str = str(self)
-        format_ = shutil._find_unpack_format(path_str)  # type: ignore[attr-defined]
+        format_ = shutil._find_unpack_format(path_str)  # type: ignore[attr-defined] # noqa: SLF001
         return typing.cast(str, format_)
 
     def unpack_if_archive(
-        self, extract_dir: PathType | None = None, recursive: bool = True
+        self,
+        *,
+        extraction_directory: PathType | None = None,
+        recursive: bool = True,
     ) -> None:
         if self.archive_format is not None:
-            self.unpack(extract_dir, recursive=recursive)
+            self.unpack(extraction_directory, recursive=recursive)
 
-    def unpack(
+    def unpack(  # noqa: PLR0913
         self: PathType,
-        extract_dir: PathType | None = None,
+        extraction_directory: PathType | None = None,
+        *,
         remove_existing: bool = True,
         preserve_properties: bool = True,
         remove_original: bool = True,
@@ -94,43 +97,48 @@ class Path(cached_content.Path):
             if subfolder.exists() and cleanup_path.number_of_children == 1:
                 subfolder.pop_parent()  # pragma: nocover
 
-        def cast_path(casted_path: PathType | None) -> PathType:
-            return casted_path  # type: ignore
-
         if archive_format is None:
             archive_format = self.archive_format
 
-        if extract_dir is None:
-            extract_name = self.name
-            # noinspection PyProtectedMember
-            unpack_formats = shutil._UNPACK_FORMATS  # type: ignore[attr-defined]
-            unpack_info = unpack_formats[archive_format]
-            for archive_ext in unpack_info[0]:
-                if extract_name.endswith(archive_ext):
-                    extract_name = extract_name.replace(archive_ext, "")
-            extract_dir = self.with_name(extract_name)
-
-        extract_dir = cast_path(extract_dir)
+        extraction_directory = (
+            self.create_extraction_directory(archive_format=archive_format)
+            if extraction_directory is None
+            else extraction_directory
+        )
 
         if remove_existing:
-            if extract_dir.is_dir():
-                extract_dir.rmtree(missing_ok=True)
+            if extraction_directory.is_dir():
+                extraction_directory.rmtree(missing_ok=True)
             else:
-                extract_dir.unlink(missing_ok=True)
+                extraction_directory.unlink(missing_ok=True)
 
-        shutil.unpack_archive(self, extract_dir=extract_dir, format=archive_format)
+        shutil.unpack_archive(
+            self,
+            extract_dir=extraction_directory,
+            format=archive_format,
+        )
 
-        cleanup(extract_dir)
+        cleanup(extraction_directory)
         if preserve_properties:
-            self.copy_properties_to(extract_dir)
+            self.copy_properties_to(extraction_directory)
 
         if remove_original:
             self.unlink()
 
         if recursive:
-            for path in extract_dir.find():
+            for path in extraction_directory.find():
                 path.unpack_if_archive()
 
+    def create_extraction_directory(self: PathType, archive_format: str) -> PathType:
+        extract_name = self.name
+        # noinspection PyProtectedMember
+        unpack_formats = shutil._UNPACK_FORMATS  # type: ignore[attr-defined] # noqa: SLF001
+        unpack_info = unpack_formats[archive_format]
+        for archive_ext in unpack_info[0]:
+            if extract_name.endswith(archive_ext):
+                extract_name = extract_name.replace(archive_ext, "")
+        return self.with_name(extract_name)
+
     def pop_parent(self) -> None:
         """
         Remove first parent from path in filesystem.
@@ -162,87 +170,85 @@ class Path(cached_content.Path):
         This can be used to instantiate any object
         :return: Content in path that contains yaml format
         """
-        import yaml  # noqa: E402, autoimport
+        import yaml  # , autoimport
 
-        Loader: type[yaml.CFullLoader | yaml.FullLoader] = (
+        Loader: type[yaml.CFullLoader | yaml.FullLoader] = (  # noqa: N806
             yaml.CFullLoader if hasattr(yaml, "CFullLoader") else yaml.FullLoader
         )
-        return yaml.load(self.text, Loader=Loader) or {}
+        return yaml.load(self.text, Loader=Loader) or {}  # noqa: S506
 
     def update(self, value: dict[Any, Any]) -> dict[Any, Any]:
         # only read and write if value to add not empty
         if value:
-            current_content = self.yaml
-            assert isinstance(current_content, dict)
+            current_content = cast(dict[Any, Any], self.yaml)
             updated_content = current_content | value
             self.yaml = updated_content
         else:
             updated_content = value
         return updated_content
 
-    def find(
+    def find(  # noqa: PLR0913
         self: PathType,
         condition: Callable[[PathType], bool] | None = None,
-        exclude: Callable[[PathType], bool] | None = None,
+        exclude: Callable[[PathType], bool] = lambda _: False,
+        *,
         recurse_on_match: bool = False,
         follow_symlinks: bool = False,
         only_folders: bool = False,
-    ) -> Generator[PathType, None, None]:
+    ) -> Iterator[PathType]:
         """Find all subpaths under path that match condition.
 
         only_folders option can be used for efficiency reasons
         """
+
+        def extract_children_to_recurse_on(path: PathType) -> Iterator[PathType]:
+            # skip folders that do not allow listing
+            with contextlib.suppress(PermissionError):
+                for child in path.iterdir():
+                    should_follow_symlink = follow_symlinks or not child.is_symlink()
+                    should_follow_directories = not only_folders or child.is_dir()
+                    if should_follow_symlink and should_follow_directories:
+                        yield child
+
         if condition is None:
             recurse_on_match = True
 
             def condition(_: PathType) -> bool:
                 return True
 
-        if exclude is None:
-
-            def exclude(_: PathType) -> bool:
-                return False
-
         to_traverse = [self] if self.exists() else []
         while to_traverse:
             path = to_traverse.pop(0)
-
             if not exclude(path):
                 match = condition(path)
                 if match:
                     yield path
-
-                if not match or recurse_on_match:
-                    if only_folders or path.is_dir():
-                        try:
-                            for child in path.iterdir():
-                                if follow_symlinks or not child.is_symlink():
-                                    if not only_folders or child.is_dir():
-                                        to_traverse.append(child)
-                        except PermissionError:  # pragma: nocover
-                            # skip folders that do not allow listing
-                            pass
+                should_recurse = recurse_on_match or not match
+                should_recurse_folder = only_folders or path.is_dir()
+                if should_recurse and should_recurse_folder:
+                    to_traverse += list(extract_children_to_recurse_on(path))
 
     def rmtree(
         self,
+        *,
         missing_ok: bool = False,
         remove_root: bool = True,
         ignore_errors: bool = False,
     ) -> None:
-        try:
-            shutil.rmtree(self, ignore_errors=ignore_errors, onerror=self._on_error)  # type: ignore
-        except FileNotFoundError as exception:
-            if missing_ok:
-                pass
-            else:
-                raise exception
+        context = (
+            contextlib.suppress(FileNotFoundError)
+            if missing_ok
+            else contextlib.nullcontext()
+        )
+        with context:
+            shutil.rmtree(self, ignore_errors=ignore_errors, onerror=self._on_error)  # type: ignore[arg-type]
         if not remove_root:
             self.mkdir()
 
     @classmethod
     def _on_error(
         cls,
-        _: bool,
+        _: bool,  # noqa: FBT001
         path_str: str,
         exc_info: tuple[type[Exception], Exception, TracebackType],
     ) -> None:
@@ -258,7 +264,7 @@ class Path(cached_content.Path):
         tokens_to_replace = self._flavour.sep, "."
         for part in parts:
             for token in tokens_to_replace:
-                part = part.replace(token, "_")
+                part = part.replace(token, "_")  # noqa: PLW2901
             path /= part
         return path
 
@@ -269,7 +275,11 @@ class Path(cached_content.Path):
 
     @classmethod
     def tempfile(
-        cls: type[PathType], in_memory: bool = True, create: bool = True, **kwargs: Any
+        cls: type[PathType],
+        *,
+        in_memory: bool = True,
+        create: bool = True,
+        **kwargs: Any,
     ) -> PathType:
         """Usage:
 
@@ -288,7 +298,7 @@ class Path(cached_content.Path):
         return path
 
     @classmethod
-    def tempdir(cls: type[PathType], in_memory: bool = True) -> PathType:
+    def tempdir(cls: type[PathType], *, in_memory: bool = True) -> PathType:
         path = cls.tempfile(in_memory=in_memory, create=False)
         path.mkdir()
         return path
@@ -296,7 +306,7 @@ class Path(cached_content.Path):
     def __enter__(self: PathType) -> PathType:
         return self
 
-    def __exit__(self, *_: Any) -> None:
+    def __exit__(self, *_: object) -> None:
         if self.is_file():
             self.unlink(missing_ok=True)
         else:

{superpathlib-2.0.3 → superpathlib-2.0.5}/src/superpathlib/metadata_properties.py

@@ -1,12 +1,12 @@
+import contextlib
 import hashlib
 import mimetypes
 import os
 import subprocess
-import typing
 import warnings
 from collections.abc import Callable
 from functools import wraps
-from typing import Any, TypeVar
+from typing import Any, TypeVar, cast
 
 from . import content_properties
 
@@ -45,20 +45,20 @@ class Path(content_properties.Path):
         os.utime(self, (time, time))  # set create time as well
 
         command = "touch", "-d", f"@{time}", self
-        try:
-            subprocess.run(command)
-        except subprocess.CalledProcessError:  # pragma: nocover
-            pass  # Doesn't work on Windows
+        with contextlib.suppress(
+            subprocess.CalledProcessError,
+        ):  # Doesn't work on Windows
+            subprocess.run(command, check=False)  # noqa: S603
 
     @property
     def tags(self) -> list[str]:
-        from .tags import XDGTags  # noqa: E402, autoimport
+        from .tags import XDGTags  # , autoimport
 
         return XDGTags(self).get()
 
     @tags.setter
     def tags(self, values: list[str | int | None]) -> None:
-        from .tags import XDGTags  # noqa: E402, autoimport
+        from .tags import XDGTags  # , autoimport
 
         if len(values) == 0:
             XDGTags(self).clear()
@@ -71,7 +71,7 @@ class Path(content_properties.Path):
 
     @tag.setter
     def tag(self, value: str | int | None) -> None:
-        from .tags import XDGTags  # noqa: E402, autoimport
+        from .tags import XDGTags  # , autoimport
 
         XDGTags(self).set(value)
 
@@ -110,15 +110,16 @@ class Path(content_properties.Path):
     def dir_content_hash(self) -> str | None:
         # dirhash package throws annoying warnings
         warnings.filterwarnings(
-            action="ignore", module="pkg_resources|dirhash", category=DeprecationWarning
+            action="ignore",
+            module="pkg_resources|dirhash",
+            category=DeprecationWarning,
         )
 
-        import dirhash  # noqa: E402, F401, autoimport
+        import dirhash  # , autoimport
 
         # use default algorithm used in cloud provider checksums
         # can be efficient because not used for cryptographic security
-        content_hash = dirhash.dirhash(self, "md5") if self.exists() else None
-        return typing.cast(str, content_hash)
+        return cast(str, dirhash.dirhash(self, "md5")) if self.has_children else None
 
     @property
     def file_content_hash(self) -> str:

{superpathlib-2.0.3 → superpathlib-2.0.5}/src/superpathlib/override.py

@@ -33,7 +33,11 @@ class Path(encryption.Path):
 
     @create_parent_on_missing
     def touch(
-        self, mode: int = 0o666, exist_ok: bool = True, mtime: float | None = None
+        self,
+        mode: int = 0o666,
+        *,
+        exist_ok: bool = True,
+        mtime: float | None = None,
     ) -> None:
         super().touch(mode=mode, exist_ok=exist_ok)
         if mtime is not None:
@@ -43,22 +47,22 @@ class Path(encryption.Path):
     def rmdir(self) -> None:
         return super().rmdir()
 
-    def iterdir(self: T, missing_ok: bool = True) -> Generator[T, None, None]:
+    def iterdir(self: T, *, missing_ok: bool = True) -> Generator[T, None, None]:
         if self.exists() or not missing_ok:
             yield from super().iterdir()
 
     @create_parent_on_missing
-    def rename(self: T, target: str | T, exist_ok: bool = False) -> T:
+    def rename(self: T, target: str | T, *, exist_ok: bool = False) -> T:
         target_path = self.__class__(target)
         rename = super().replace if exist_ok else super().rename
         try:
             target_path.create_parent()
             target_path = rename(target_path)
-        except OSError as e:
-            if exist_ok and "Directory not empty" in str(e):
+        except OSError as exception:
+            if exist_ok and "Directory not empty" in str(exception):
                 target_path.rmtree()
                 target_path = rename(target_path)
-            elif "Invalid cross-device link" in str(e):
+            elif "Invalid cross-device link" in str(exception):
                 # target is on different file system
                 if target_path.exists():
                     if exist_ok:
@@ -68,7 +72,7 @@ class Path(encryption.Path):
                             target_path.unlink()  # pragma: nocover
                     else:
                         message = f"Target already exists: {target_path }"
-                        raise Exception(message)
+                        raise RuntimeError(message) from exception
                 else:
                     target_path.create_parent()
                 target_path = shutil.move(self, target_path)
@@ -80,7 +84,7 @@ class Path(encryption.Path):
         path = self.rename(target, exist_ok=True)
         return typing.cast(T, path)
 
-    def open(self, mode: str = "r", **kwargs: Any) -> IO[Any]:  # type: ignore
+    def open(self, mode: str = "r", **kwargs: Any) -> IO[Any]:  # type: ignore[override]
         try:
             res = super().open(mode, **kwargs)
         except FileNotFoundError:

{superpathlib-2.0.3 → superpathlib-2.0.5}/src/superpathlib/tags.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 try:
-    import xattr  # noqa
+    import xattr
 
 except ModuleNotFoundError:  # pragma: nocover
     # Don't fail if xattr not supported (Windows)

{superpathlib-2.0.3 → superpathlib-2.0.5/src/superpathlib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: superpathlib
-Version: 2.0.3
+Version: 2.0.5
 Summary: Extended Pathlib
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License: MIT
@@ -11,7 +11,7 @@ License-File: LICENSE
 Requires-Dist: simple-classproperty<5,>=4.0.2
 Provides-Extra: full
 Requires-Dist: dirhash<1,>=0.2.1; extra == "full"
-Requires-Dist: numpy<2,>=1.26.4; extra == "full"
+Requires-Dist: numpy<3,>=1.26.4; extra == "full"
 Requires-Dist: package-utils<1,>=0.6.1; extra == "full"
 Requires-Dist: PyYaml<7,>=6.0.1; extra == "full"
 Requires-Dist: xattr<2,>=0.10.1; extra == "full"
@@ -20,7 +20,7 @@ Requires-Dist: hypothesis<7,>=6.97.1; extra == "dev"
 Requires-Dist: package-dev-tools<1,>=0.5.12; extra == "dev"
 Requires-Dist: types-PyYaml<7,>=6.0.12.12; extra == "dev"
 Requires-Dist: dirhash<1,>=0.2.1; extra == "dev"
-Requires-Dist: numpy<2,>=1.26.4; extra == "dev"
+Requires-Dist: numpy<3,>=1.26.4; extra == "dev"
 Requires-Dist: package-utils<1,>=0.6.1; extra == "dev"
 Requires-Dist: PyYaml<7,>=6.0.1; extra == "dev"
 Requires-Dist: xattr<2,>=0.10.1; extra == "dev"

{superpathlib-2.0.3 → superpathlib-2.0.5}/src/superpathlib.egg-info/requires.txt

@@ -5,14 +5,14 @@ hypothesis<7,>=6.97.1
 package-dev-tools<1,>=0.5.12
 types-PyYaml<7,>=6.0.12.12
 dirhash<1,>=0.2.1
-numpy<2,>=1.26.4
+numpy<3,>=1.26.4
 package-utils<1,>=0.6.1
 PyYaml<7,>=6.0.1
 xattr<2,>=0.10.1
 
 [full]
 dirhash<1,>=0.2.1
-numpy<2,>=1.26.4
+numpy<3,>=1.26.4
 package-utils<1,>=0.6.1
 PyYaml<7,>=6.0.1
 xattr<2,>=0.10.1

{superpathlib-2.0.3 → superpathlib-2.0.5}/tests/test_cached_content.py

@@ -1,10 +1,11 @@
 import typing
 from typing import Any
 
-from content import byte_content, text_content
 from package_utils.storage import CachedFileContent
 from superpathlib import Path
-from utils import ignore_fixture_warning
+
+from tests.content import byte_content, text_content
+from tests.utils import ignore_fixture_warning
 
 
 @ignore_fixture_warning
@@ -31,7 +32,8 @@ def test_text(content: str) -> None:
 def test_content(path: Path, content: dict[str, dict[str, str]]) -> None:
     class Storage:
         content: CachedFileContent[dict[str, dict[str, str]]] = typing.cast(
-            CachedFileContent[dict[str, dict[str, str]]], path.cached_content
+            CachedFileContent[dict[str, dict[str, str]]],
+            path.cached_content,
         )
 
     verify_storage(Storage, content)
@@ -42,14 +44,16 @@ def test_content(path: Path, content: dict[str, dict[str, str]]) -> None:
 def test_created_content(path: Path, content: dict[str, dict[str, str]]) -> None:
     class Storage:
         content: CachedFileContent[dict[str, dict[str, str]]] = typing.cast(
-            CachedFileContent[dict[str, dict[str, str]]], path.create_cached_content({})
+            CachedFileContent[dict[str, dict[str, str]]],
+            path.create_cached_content({}),
         )
 
     verify_storage(Storage, content)
 
 
 def verify_storage(
-    storage_class: type[Any], content: str | bytes | dict[str, dict[str, str]]
+    storage_class: type[Any],
+    content: str | bytes | dict[str, dict[str, str]],
 ) -> None:
     storage = storage_class()
     assert storage.content is not None

{superpathlib-2.0.3 → superpathlib-2.0.5}/tests/test_common_folders.py

@@ -1,6 +1,7 @@
-from content import byte_content
 from superpathlib import Path
-from utils import ignore_fixture_warning
+
+from tests.content import byte_content
+from tests.utils import ignore_fixture_warning
 
 
 @ignore_fixture_warning

{superpathlib-2.0.3 → superpathlib-2.0.5}/tests/test_content.py

@@ -1,5 +1,7 @@
 import numpy as np
-from content import (
+from superpathlib import Path
+
+from tests.content import (
     byte_content,
     dictionary_content,
     floats_content,
@@ -7,8 +9,7 @@ from content import (
     text_content,
     text_lines_content,
 )
-from superpathlib import Path
-from utils import ignore_fixture_warning
+from tests.utils import ignore_fixture_warning
 
 
 @ignore_fixture_warning

{superpathlib-2.0.3 → superpathlib-2.0.5}/tests/test_encrypted_content.py

@@ -1,7 +1,8 @@
-from content import byte_content, text_content
 from hypothesis import HealthCheck, settings
 from superpathlib import Path
 
+from tests.content import byte_content, text_content
+
 slow_test_settings = settings(
     max_examples=2,
     deadline=3000,

{superpathlib-2.0.3 → superpathlib-2.0.5}/tests/test_functionality.py

@@ -1,14 +1,15 @@
 from collections.abc import Callable
 
 import pytest
-from content import (
+from superpathlib import Path
+
+from tests.content import (
     byte_content,
     dictionary_content,
     slower_test_settings,
     text_lines_content,
 )
-from superpathlib import Path
-from utils import ignore_fixture_warning
+from tests.utils import ignore_fixture_warning
 
 
 def test_tempfile() -> None:
@@ -47,7 +48,7 @@ def test_unpack_check(directory: Path) -> None:
     non_archive_assets = Path(__file__).parent / "assets" / "non_archives"
     assert not non_archive_assets.is_empty()
     for path in non_archive_assets.iterdir():
-        path.unpack_if_archive(directory)
+        path.unpack_if_archive(extraction_directory=directory)
         assert directory.is_empty()
 
 
@@ -103,7 +104,9 @@ def test_move_existing(path: Path, path2: Path, content: bytes) -> None:
 @ignore_fixture_warning
 @byte_content
 def test_move_parent_not_existing(
-    directory: Path, directory2: Path, content: bytes
+    directory: Path,
+    directory2: Path,
+    content: bytes,
 ) -> None:
     directory.rmtree()
     path = directory / directory.name
@@ -133,7 +136,9 @@ def test_move_directory(directory: Path, directory2: Path, content: bytes) -> No
 @ignore_fixture_warning
 @byte_content
 def test_move_directory_existing(
-    directory: Path, directory2: Path, content: bytes
+    directory: Path,
+    directory2: Path,
+    content: bytes,
 ) -> None:
     def move_function() -> None:
         directory.rename(directory2, exist_ok=True)
@@ -144,7 +149,9 @@ def test_move_directory_existing(
 @ignore_fixture_warning
 @byte_content
 def test_replace_directory_existing(
-    directory: Path, directory2: Path, content: bytes
+    directory: Path,
+    directory2: Path,
+    content: bytes,
 ) -> None:
     def move_function() -> None:
         directory.replace(directory2)
@@ -155,7 +162,9 @@ def test_replace_directory_existing(
 @ignore_fixture_warning
 @byte_content
 def test_move_directory_different_filesystem(
-    directory: Path, in_memory_directory: Path, content: bytes
+    directory: Path,
+    in_memory_directory: Path,
+    content: bytes,
 ) -> None:
     filename = directory.name
     subpath = directory / filename
@@ -173,7 +182,9 @@ def test_move_directory_different_filesystem(
 @ignore_fixture_warning
 @byte_content
 def test_move_directory_existing_different_filesystem(
-    directory: Path, in_memory_directory: Path, content: bytes
+    directory: Path,
+    in_memory_directory: Path,
+    content: bytes,
 ) -> None:
     def move_function() -> None:
         directory.rename(in_memory_directory, exist_ok=True)

{superpathlib-2.0.3 → superpathlib-2.0.5}/tests/test_metadata.py

@@ -2,11 +2,12 @@ import hashlib
 import math
 import time
 
-from content import byte_content, text_strategy
 from hypothesis import given, strategies
 from hypothesis.strategies import lists
 from superpathlib import Path
-from utils import ignore_fixture_warning
+
+from tests.content import byte_content, text_strategy
+from tests.utils import ignore_fixture_warning
 
 
 @ignore_fixture_warning