dvc-objects 5.0.0__tar.gz → 5.1.1__tar.gz

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/.github/workflows/tests.yml

@@ -20,11 +20,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-latest, macos-latest]
-        pyv: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        pyv: ['3.9', '3.10', '3.11', '3.12', '3.13']
         include:
-        - {os: ubuntu-latest, pyv: 'pypy3.8'}
-        - {os: macos-14, pyv: '3.12'}
+        - {os: ubuntu-latest, pyv: 'pypy3.9'}
 
     steps:
     - name: Check out the repository
@@ -37,7 +36,8 @@ jobs:
       with:
         python-version: ${{ matrix.pyv }}
         cache: pip
-        cache-dependency-path: setup.cfg
+        allow-prereleases: true
+        cache-dependency-path: pyproject.toml
 
     - name: Upgrade pip and nox
       run: |
@@ -45,14 +45,14 @@ jobs:
         pip --version
         nox --version
 
-    - name: Lint code and check dependencies
-      run: nox -s lint safety
+    - name: Lint code
+      run: nox -s lint
 
     - name: Run tests
       run: nox -s tests-${{ matrix.nox_pyv || matrix.pyv }} -- --cov-report=xml
 
     - name: Upload coverage report
-      uses: codecov/codecov-action@v3.1.4
+      uses: codecov/codecov-action@v5
 
     - name: Run benchmarks
       run: nox -s bench

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/.pre-commit-config.yaml

@@ -2,7 +2,7 @@ default_language_version:
   python: python3
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
       - id: check-case-conflict
@@ -20,18 +20,13 @@ repos:
       - id: sort-simple-yaml
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.1.7'
+    rev: 'v0.11.12'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.4.1
     hooks:
       - id: codespell
         additional_dependencies: ["tomli"]
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
-    hooks:
-      - id: pyupgrade
-        args: [--py38-plus]

{dvc-objects-5.0.0/src/dvc_objects.egg-info → dvc_objects-5.1.1}/PKG-INFO

@@ -1,25 +1,25 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dvc-objects
-Version: 5.0.0
+Version: 5.1.1
 Summary: dvc objects - filesystem and object-db level abstractions to use in dvc and dvc-data
 Author-email: Iterative <support@dvc.org>
 License: Apache-2.0
 Project-URL: Issues, https://github.com/iterative/dvc-objects/issues
 Project-URL: Source, https://github.com/iterative/dvc-objects
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Development Status :: 4 - Beta
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: funcy>=1.14; python_version < "3.12"
 Requires-Dist: fsspec>=2024.2.0
+Requires-Dist: funcy>=1.14; python_version < "3.12"
 Provides-Extra: tests
-Requires-Dist: pytest<8,>=7; extra == "tests"
+Requires-Dist: pytest<9,>=7; extra == "tests"
 Requires-Dist: pytest-sugar; extra == "tests"
 Requires-Dist: pytest-cov>=4.1.0; extra == "tests"
 Requires-Dist: pytest-mock; extra == "tests"
@@ -28,7 +28,8 @@ Requires-Dist: pytest-asyncio<1,>=0.23.2; extra == "tests"
 Requires-Dist: reflink; extra == "tests"
 Provides-Extra: dev
 Requires-Dist: dvc-objects[tests]; extra == "dev"
-Requires-Dist: mypy==1.8.0; extra == "dev"
+Requires-Dist: mypy==1.16.0; extra == "dev"
+Dynamic: license-file
 
 DVC objects
 ===========

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/noxfile.py

@@ -1,4 +1,5 @@
 """Automation using nox."""
+
 import glob
 import os
 
@@ -11,7 +12,9 @@ locations = "src", "tests"
 pip_dev_flags = ["--use-pep517"]  # reflink package is still missing wheels
 
 
-@nox.session(python=["3.8", "3.9", "3.10", "3.11", "3.12", "pypy3.8", "pypy3.9"])
+@nox.session(
+    python=["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.8", "pypy3.9"]
+)
 def tests(session: nox.Session) -> None:
     session.install(".[tests]", *pip_dev_flags)
     session.run(
@@ -39,14 +42,6 @@ def lint(session: nox.Session) -> None:
     session.run("python", "-m", "mypy")
 
 
-@nox.session
-def safety(session: nox.Session) -> None:
-    """Scan dependencies for insecure packages."""
-    session.install(".[dev]", *pip_dev_flags)
-    session.install("safety")
-    session.run("safety", "check", "--full-report")
-
-
 @nox.session
 def build(session: nox.Session) -> None:
     session.install("build", "setuptools", "twine")

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/pyproject.toml

@@ -12,18 +12,18 @@ license = {text = "Apache-2.0"}
 authors = [{ name = "Iterative", email = "support@dvc.org" }]
 classifiers = [
     "Programming Language :: Python :: 3",
-    "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",
+    "Programming Language :: Python :: 3.13",
     "Development Status :: 4 - Beta",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 dynamic = ["version"]
 dependencies = [
-    "funcy>=1.14; python_version < '3.12'",
     "fsspec>=2024.2.0",
+    "funcy>=1.14; python_version < '3.12'",
 ]
 
 [project.urls]
@@ -32,7 +32,7 @@ Source = "https://github.com/iterative/dvc-objects"
 
 [project.optional-dependencies]
 tests = [
-    "pytest<8,>=7",
+    "pytest>=7,<9",
     "pytest-sugar",
     "pytest-cov>=4.1.0",
     "pytest-mock",
@@ -42,7 +42,7 @@ tests = [
 ]
 dev = [
     "dvc-objects[tests]",
-    "mypy==1.8.0",
+    "mypy==1.16.0",
 ]
 
 [tool.setuptools.packages.find]
@@ -102,8 +102,13 @@ module = [
 
 [tool.codespell]
 ignore-words-list = "cachable,"
+skip = "CODE_OF_CONDUCT.rst"
 
 [tool.ruff]
+output-format = "full"
+show-fixes = true
+
+[tool.ruff.lint]
 ignore = [
     "ISC001", # single-line-implicit-string-concatenation
     "PLR2004", # magic-value-comparison
@@ -156,8 +161,6 @@ select = [
     "W", # pycodestyle - Warning
     "YTT", # flake8-2020
 ]
-show-source = true
-show-fixes = true
 
 [tool.ruff.lint.flake8-pytest-style]
 fixture-parentheses = false

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/src/dvc_objects/db.py

@@ -1,5 +1,6 @@
 import itertools
 import logging
+from collections.abc import Iterable, Iterator
 from contextlib import suppress
 from functools import partial
 from io import BytesIO
@@ -7,11 +8,7 @@ from typing import (
     TYPE_CHECKING,
     BinaryIO,
     Callable,
-    Iterable,
-    Iterator,
-    List,
     Optional,
-    Tuple,
     Union,
     cast,
 )
@@ -126,7 +123,7 @@ class ObjectDB:
             raise ObjectDBPermissionError("Cannot add to read-only ODB")
 
         if isinstance(data, bytes):
-            fobj: "BinaryIO" = BytesIO(data)
+            fobj: BinaryIO = BytesIO(data)
             size: Optional[int] = len(data)
         else:
             fobj = data
@@ -139,9 +136,9 @@ class ObjectDB:
 
     def add(
         self,
-        path: Union["AnyFSPath", List["AnyFSPath"]],
+        path: Union["AnyFSPath", list["AnyFSPath"]],
         fs: "FileSystem",
-        oid: Union[str, List[str]],
+        oid: Union[str, list[str]],
         hardlink: bool = False,
         callback: "Callback" = DEFAULT_CALLBACK,
         check_exists: bool = True,
@@ -206,7 +203,7 @@ class ObjectDB:
         for oid in self.all():
             self.delete(oid)
 
-    def _oid_parts(self, oid: str) -> Tuple[str, str]:
+    def _oid_parts(self, oid: str) -> tuple[str, str]:
         return oid[:2], oid[2:]
 
     def oid_to_path(self, oid) -> str:
@@ -218,7 +215,7 @@ class ObjectDB:
         jobs: Optional[int] = None,
     ) -> Iterator[str]:
         if prefixes:
-            paths: Union[str, List[str]] = list(map(self.oid_to_path, prefixes))
+            paths: Union[str, list[str]] = list(map(self.oid_to_path, prefixes))
             if len(paths) == 1:
                 paths = paths[0]
             prefix = True
@@ -262,14 +259,11 @@ class ObjectDB:
         prefixes: Optional[Iterable[str]] = None,
         jobs: Optional[int] = None,
     ) -> Iterator[str]:
-        count = 0
-        for oid in self._list_oids(prefixes=prefixes, jobs=jobs):
+        for i, oid in enumerate(self._list_oids(prefixes=prefixes, jobs=jobs), start=1):
             yield oid
-            count += 1
-            if count > limit:
+            if i > limit:
                 logger.debug(
-                    "`_list_oids()` returned max %r oids, "
-                    "skipping remaining results",
+                    "`_list_oids()` returned max %r oids, skipping remaining results",
                     limit,
                 )
                 return
@@ -351,7 +345,7 @@ class ObjectDB:
 
         yield from self._list_oids(prefixes=traverse_prefixes, jobs=jobs)
 
-    def all(self, jobs=None):  # noqa: A003
+    def all(self, jobs=None):
         """Iterate over all oids in this fs.
 
         Hashes will be fetched in parallel threads according to prefix

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/src/dvc_objects/executors.py

@@ -1,22 +1,8 @@
 import asyncio
-import queue
-import sys
+from collections.abc import Coroutine, Iterable, Iterator, Sequence
 from concurrent import futures
 from itertools import islice
-from typing import (
-    Any,
-    Callable,
-    Coroutine,
-    Dict,
-    Iterable,
-    Iterator,
-    List,
-    Optional,
-    Sequence,
-    Set,
-    Tuple,
-    TypeVar,
-)
+from typing import Any, Callable, Optional, TypeVar
 
 from fsspec import Callback
 
@@ -24,18 +10,12 @@ _T = TypeVar("_T")
 
 
 class ThreadPoolExecutor(futures.ThreadPoolExecutor):
-    _max_workers: int
-
     def __init__(
         self, max_workers: Optional[int] = None, cancel_on_error: bool = False, **kwargs
     ):
         super().__init__(max_workers=max_workers, **kwargs)
         self._cancel_on_error = cancel_on_error
 
-    @property
-    def max_workers(self) -> int:
-        return self._max_workers
-
     def imap_unordered(
         self, fn: Callable[..., _T], *iterables: Iterable[Any]
     ) -> Iterator[_T]:
@@ -43,52 +23,25 @@ class ThreadPoolExecutor(futures.ThreadPoolExecutor):
 
         It does not create all the futures at once to reduce memory usage.
         """
-
         it = zip(*iterables)
-        if self.max_workers == 1:
+        if self._max_workers == 1:
             for args in it:
                 yield fn(*args)
             return
 
-        def create_taskset(n: int) -> Set[futures.Future]:
+        def create_taskset(n: int) -> set[futures.Future]:
             return {self.submit(fn, *args) for args in islice(it, n)}
 
-        tasks = create_taskset(self.max_workers * 5)
+        tasks = create_taskset(self._max_workers * 5)
         while tasks:
             done, tasks = futures.wait(tasks, return_when=futures.FIRST_COMPLETED)
             for fut in done:
                 yield fut.result()
             tasks.update(create_taskset(len(done)))
 
-    def shutdown(self, wait=True, *, cancel_futures=False):
-        if sys.version_info > (3, 9):
-            return super().shutdown(wait=wait, cancel_futures=cancel_futures)
-        else:  # noqa: RET505
-            with self._shutdown_lock:
-                self._shutdown = True
-                if cancel_futures:
-                    # Drain all work items from the queue, and then cancel their
-                    # associated futures.
-                    while True:
-                        try:
-                            work_item = self._work_queue.get_nowait()
-                        except queue.Empty:
-                            break
-                        if work_item is not None:
-                            work_item.future.cancel()
-
-                # Send a wake-up to prevent threads calling
-                # _work_queue.get(block=True) from permanently blocking.
-                self._work_queue.put(None)  # type: ignore[arg-type]
-            if wait:
-                for t in self._threads:
-                    t.join()
-
     def __exit__(self, exc_type, exc_val, exc_tb):
-        if self._cancel_on_error:
-            self.shutdown(wait=True, cancel_futures=exc_val is not None)
-        else:
-            self.shutdown(wait=True)
+        cancel_futures = self._cancel_on_error and exc_val is not None
+        self.shutdown(wait=True, cancel_futures=cancel_futures)
         return False
 
 
@@ -99,7 +52,7 @@ async def batch_coros(  # noqa: C901
     timeout: Optional[int] = None,
     return_exceptions: bool = False,
     nofiles: bool = False,
-) -> List[Any]:
+) -> list[Any]:
     """Run the given in coroutines in parallel.
 
     The asyncio loop will be kept saturated with up to `batch_size` tasks in
@@ -116,12 +69,12 @@ async def batch_coros(  # noqa: C901
         batch_size = len(coros)
     assert batch_size > 0
 
-    def create_taskset(n: int) -> Dict[asyncio.Task, int]:
+    def create_taskset(n: int) -> dict[asyncio.Task, int]:
         return {asyncio.create_task(coro): i for i, coro in islice(it, n)}
 
-    it: Iterator[Tuple[int, Coroutine]] = enumerate(coros)
+    it: Iterator[tuple[int, Coroutine]] = enumerate(coros)
     tasks = create_taskset(batch_size)
-    results: Dict[int, Any] = {}
+    results: dict[int, Any] = {}
     while tasks:
         done, pending = await asyncio.wait(
             tasks.keys(), timeout=timeout, return_when=asyncio.FIRST_COMPLETED
@@ -133,7 +86,7 @@ async def batch_coros(  # noqa: C901
         for fut in done:
             try:
                 result = fut.result()
-            except Exception as exc:  # noqa: BLE001
+            except Exception as exc:
                 if not return_exceptions:
                     for pending_fut in pending:
                         pending_fut.cancel()

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/src/dvc_objects/fs/__init__.py

@@ -1,5 +1,5 @@
-from collections.abc import Mapping
-from typing import TYPE_CHECKING, Iterator, Type
+from collections.abc import Iterator, Mapping
+from typing import TYPE_CHECKING
 from urllib.parse import urlparse
 
 from . import generic  # noqa: F401
@@ -83,7 +83,7 @@ class Registry(Mapping):
     def __init__(self, reg) -> None:
         self._registry = reg
 
-    def __getitem__(self, key: str) -> Type["FileSystem"]:
+    def __getitem__(self, key: str) -> type["FileSystem"]:
         entry = self._registry.get(key) or self._registry[Schemes.LOCAL]
         try:
             return _import_class(entry["class"])

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/src/dvc_objects/fs/base.py

@@ -5,6 +5,7 @@ import ntpath
 import os
 import posixpath
 import shutil
+from collections.abc import Iterable, Iterator, Sequence
 from functools import partial
 from multiprocessing import cpu_count
 from typing import (
@@ -12,14 +13,8 @@ from typing import (
     TYPE_CHECKING,
     Any,
     ClassVar,
-    Dict,
-    Iterable,
-    Iterator,
-    List,
     Literal,
     Optional,
-    Sequence,
-    Tuple,
     Union,
     overload,
 )
@@ -49,7 +44,7 @@ AnyFSPath = str
 
 # An info() entry, might evolve to a TypedDict
 # in the future (e.g for properly type 'size' etc).
-Entry = Dict[str, Any]
+Entry = dict[str, Any]
 
 
 class LinkError(OSError):
@@ -68,7 +63,7 @@ class FileSystem:
 
     flavour = posixpath
     protocol = "base"
-    REQUIRES: ClassVar[Dict[str, str]] = {}
+    REQUIRES: ClassVar[dict[str, str]] = {}
     _JOBS = 4 * cpu_count()
 
     HASH_JOBS = max(1, min(4, cpu_count() // 2))
@@ -90,13 +85,13 @@ class FileSystem:
             self.fs = fs
 
     @cached_property
-    def fs_args(self) -> Dict[str, Any]:
+    def fs_args(self) -> dict[str, Any]:
         ret = {"skip_instance_cache": True}
         ret.update(self._prepare_credentials(**self._config))
         return ret
 
     @property
-    def config(self) -> Dict[str, Any]:
+    def config(self) -> dict[str, Any]:
         return self._config
 
     @property
@@ -114,11 +109,11 @@ class FileSystem:
         return cls.flavour.join(*parts)
 
     @classmethod
-    def split(cls, path: str) -> Tuple[str, str]:
+    def split(cls, path: str) -> tuple[str, str]:
         return cls.flavour.split(path)
 
     @classmethod
-    def splitext(cls, path: str) -> Tuple[str, str]:
+    def splitext(cls, path: str) -> tuple[str, str]:
         return cls.flavour.splitext(path)
 
     def normpath(self, path: str) -> str:
@@ -147,7 +142,7 @@ class FileSystem:
         return cls.flavour.commonpath(list(paths))
 
     @classmethod
-    def parts(cls, path: str) -> Tuple[str, ...]:
+    def parts(cls, path: str) -> tuple[str, ...]:
         drive, path = cls.flavour.splitdrive(path.rstrip(cls.flavour.sep))
 
         ret = []
@@ -229,7 +224,7 @@ class FileSystem:
             start = "."
         return self.flavour.relpath(self.abspath(path), start=self.abspath(start))
 
-    def relparts(self, path: str, start: Optional[str] = None) -> Tuple[str, ...]:
+    def relparts(self, path: str, start: Optional[str] = None) -> tuple[str, ...]:
         return self.parts(self.relpath(path, start=start))
 
     @classmethod
@@ -252,7 +247,7 @@ class FileSystem:
         return self._config.get("version_aware", False)
 
     @staticmethod
-    def _get_kwargs_from_urls(urlpath: str) -> "Dict[str, Any]":
+    def _get_kwargs_from_urls(urlpath: str) -> "dict[str, Any]":
         from fsspec.utils import infer_storage_options
 
         options = infer_storage_options(urlpath)
@@ -262,14 +257,14 @@ class FileSystem:
 
     def _prepare_credentials(
         self,
-        **config: Dict[str, Any],
-    ) -> Dict[str, Any]:
+        **config: dict[str, Any],
+    ) -> dict[str, Any]:
         """Prepare the arguments for authentication to the
         host filesystem"""
         return {}
 
     @classmethod
-    def get_missing_deps(cls) -> List[str]:
+    def get_missing_deps(cls) -> list[str]:
         from importlib.util import find_spec
 
         return [pkg for pkg, mod in cls.REQUIRES.items() if not find_spec(mod)]
@@ -301,7 +296,7 @@ class FileSystem:
         return entry["size"] == 0
 
     @overload
-    def open(  # noqa: A003
+    def open(
         self,
         path: AnyFSPath,
         mode: Literal["rb", "br", "wb"],
@@ -310,15 +305,14 @@ class FileSystem:
         return self.open(path, mode, **kwargs)
 
     @overload
-    def open(  # noqa: A003
+    def open(
         self,
         path: AnyFSPath,
         mode: Literal["r", "rt", "w"] = "r",
         **kwargs: Any,
-    ) -> "TextIO":
-        ...
+    ) -> "TextIO": ...
 
-    def open(  # noqa: A003
+    def open(
         self,
         path: AnyFSPath,
         mode: str = "r",
@@ -339,21 +333,21 @@ class FileSystem:
 
     def cat(
         self,
-        path: Union[AnyFSPath, List[AnyFSPath]],
+        path: Union[AnyFSPath, list[AnyFSPath]],
         recursive: bool = False,
         on_error: Literal["raise", "omit", "return"] = "raise",
         **kwargs: Any,
-    ) -> Union[bytes, Dict[AnyFSPath, bytes]]:
+    ) -> Union[bytes, dict[AnyFSPath, bytes]]:
         return self.fs.cat(path, recursive=recursive, on_error=on_error, **kwargs)
 
     def cat_ranges(
         self,
-        paths: List[AnyFSPath],
-        starts: List[int],
-        ends: List[int],
+        paths: list[AnyFSPath],
+        starts: list[int],
+        ends: list[int],
         max_gap: Optional[int] = None,
         **kwargs,
-    ) -> List[bytes]:
+    ) -> list[bytes]:
         return self.fs.cat_ranges(paths, starts, ends, max_gap=max_gap, **kwargs)
 
     def cat_file(
@@ -409,7 +403,7 @@ class FileSystem:
 
     def pipe(
         self,
-        path: Union[AnyFSPath, Dict[AnyFSPath, bytes]],
+        path: Union[AnyFSPath, dict[AnyFSPath, bytes]],
         value: Optional[bytes] = None,
         **kwargs: Any,
     ) -> None:
@@ -434,24 +428,22 @@ class FileSystem:
         path: AnyFSPath,
         callback: fsspec.Callback = ...,
         batch_size: Optional[int] = ...,
-    ) -> bool:
-        ...
+    ) -> bool: ...
 
     @overload
     def exists(
         self,
-        path: List[AnyFSPath],
+        path: list[AnyFSPath],
         callback: fsspec.Callback = ...,
         batch_size: Optional[int] = ...,
-    ) -> List[bool]:
-        ...
+    ) -> list[bool]: ...
 
     def exists(
         self,
-        path: Union[AnyFSPath, List[AnyFSPath]],
+        path: Union[AnyFSPath, list[AnyFSPath]],
         callback: fsspec.Callback = DEFAULT_CALLBACK,
         batch_size: Optional[int] = None,
-    ) -> Union[bool, List[bool]]:
+    ) -> Union[bool, list[bool]]:
         if isinstance(path, str):
             return self.fs.exists(path)
         callback.set_size(len(path))
@@ -513,19 +505,21 @@ class FileSystem:
         return not (self.is_symlink(path) or self.is_hardlink(path))
 
     @overload
-    def ls(self, path: AnyFSPath, detail: Literal[True], **kwargs) -> "Iterator[Entry]":
-        ...
+    def ls(
+        self, path: AnyFSPath, detail: Literal[True], **kwargs
+    ) -> "Iterator[Entry]": ...
 
     @overload
-    def ls(self, path: AnyFSPath, detail: Literal[False], **kwargs) -> Iterator[str]:
-        ...
+    def ls(
+        self, path: AnyFSPath, detail: Literal[False], **kwargs
+    ) -> Iterator[str]: ...
 
     def ls(self, path, detail=False, **kwargs):
         return self.fs.ls(path, detail=detail, **kwargs)
 
     def find(
         self,
-        path: Union[AnyFSPath, List[AnyFSPath]],
+        path: Union[AnyFSPath, list[AnyFSPath]],
         prefix: bool = False,
         batch_size: Optional[int] = None,
         **kwargs,
@@ -565,7 +559,7 @@ class FileSystem:
 
     def rm(
         self,
-        path: Union[AnyFSPath, List[AnyFSPath]],
+        path: Union[AnyFSPath, list[AnyFSPath]],
         recursive: bool = False,
         **kwargs,
     ) -> None:
@@ -580,17 +574,15 @@ class FileSystem:
         callback: fsspec.Callback = ...,
         batch_size: Optional[int] = ...,
         **kwargs,
-    ) -> "Entry":
-        ...
+    ) -> "Entry": ...
 
     @overload
     def info(
         self,
-        path: List[AnyFSPath],
+        path: list[AnyFSPath],
         callback: fsspec.Callback = ...,
         batch_size: Optional[int] = ...,
-    ) -> List["Entry"]:
-        ...
+    ) -> list["Entry"]: ...
 
     def info(self, path, callback=DEFAULT_CALLBACK, batch_size=None, **kwargs):
         if isinstance(path, str):
@@ -667,7 +659,7 @@ class FileSystem:
     def size(self, path: AnyFSPath) -> Optional[int]:
         return self.fs.size(path)
 
-    def sizes(self, paths: List[AnyFSPath]) -> List[Optional[int]]:
+    def sizes(self, paths: list[AnyFSPath]) -> list[Optional[int]]:
         return self.fs.sizes(paths)
 
     def du(
@@ -676,13 +668,13 @@ class FileSystem:
         total: bool = True,
         maxdepth: Optional[int] = None,
         **kwargs: Any,
-    ) -> Union[int, Dict[AnyFSPath, int]]:
+    ) -> Union[int, dict[AnyFSPath, int]]:
         return self.fs.du(path, total=total, maxdepth=maxdepth, **kwargs)
 
     def put(
         self,
-        from_info: Union[AnyFSPath, List[AnyFSPath]],
-        to_info: Union[AnyFSPath, List[AnyFSPath]],
+        from_info: Union[AnyFSPath, list[AnyFSPath]],
+        to_info: Union[AnyFSPath, list[AnyFSPath]],
         callback: fsspec.Callback = DEFAULT_CALLBACK,
         recursive: bool = False,
         batch_size: Optional[int] = None,
@@ -714,8 +706,8 @@ class FileSystem:
 
     def get(
         self,
-        from_info: Union[AnyFSPath, List[AnyFSPath]],
-        to_info: Union[AnyFSPath, List[AnyFSPath]],
+        from_info: Union[AnyFSPath, list[AnyFSPath]],
+        to_info: Union[AnyFSPath, list[AnyFSPath]],
         callback: fsspec.Callback = DEFAULT_CALLBACK,
         recursive: bool = False,
         batch_size: Optional[int] = None,
@@ -730,8 +722,8 @@ class FileSystem:
                 self.fs.get_file(rpath, lpath, callback=child, **kwargs)
 
         if isinstance(from_info, list) and isinstance(to_info, list):
-            from_infos: List[AnyFSPath] = from_info
-            to_infos: List[AnyFSPath] = to_info
+            from_infos: list[AnyFSPath] = from_info
+            to_infos: list[AnyFSPath] = to_info
         else:
             assert isinstance(from_info, str)
             assert isinstance(to_info, str)
@@ -797,7 +789,7 @@ class ObjectFileSystem(FileSystem):
 
     def find(
         self,
-        path: Union[AnyFSPath, List[AnyFSPath]],
+        path: Union[AnyFSPath, list[AnyFSPath]],
         prefix: bool = False,
         batch_size: Optional[int] = None,
         **kwargs,
@@ -807,7 +799,7 @@ class ObjectFileSystem(FileSystem):
         else:
             paths = path
 
-        def _make_args(paths: List[AnyFSPath]) -> Iterator[Tuple[str, str]]:
+        def _make_args(paths: list[AnyFSPath]) -> Iterator[tuple[str, str]]:
             for path in paths:
                 if prefix and not path.endswith(self.flavour.sep):
                     parent = self.parent(path)

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/src/dvc_objects/fs/callbacks.py

@@ -22,4 +22,4 @@ class CallbackStream:
 
 
 def wrap_file(file, callback: "fsspec.Callback") -> BinaryIO:
-    return cast(BinaryIO, CallbackStream(file, callback))
+    return cast("BinaryIO", CallbackStream(file, callback))

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/src/dvc_objects/fs/errors.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, List, Optional
+from typing import TYPE_CHECKING, Optional
 
 if TYPE_CHECKING:
     from .base import FileSystem
@@ -18,7 +18,7 @@ class RemoteMissingDepsError(Exception):
         fs: "FileSystem",
         protocol: str,
         url: str,
-        missing: Optional[List[str]] = None,
+        missing: Optional[list[str]] = None,
     ) -> None:
         self.protocol = protocol
         self.fs = fs

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/src/dvc_objects/fs/generic.py

@@ -4,7 +4,7 @@ import logging
 import os
 from contextlib import suppress
 from functools import wraps
-from typing import TYPE_CHECKING, Any, Callable, List, Optional, Union
+from typing import TYPE_CHECKING, Any, Callable, Optional, Union
 
 from fsspec.asyn import get_loop
 from fsspec.callbacks import DEFAULT_CALLBACK
@@ -68,9 +68,9 @@ def _link(
 
 def copy(
     from_fs: "FileSystem",
-    from_path: Union["AnyFSPath", List["AnyFSPath"]],
+    from_path: Union["AnyFSPath", list["AnyFSPath"]],
     to_fs: "FileSystem",
-    to_path: Union["AnyFSPath", List["AnyFSPath"]],
+    to_path: Union["AnyFSPath", list["AnyFSPath"]],
     callback: "Callback" = DEFAULT_CALLBACK,
     batch_size: Optional[int] = None,
     on_error: Optional[TransferErrorHandler] = None,
@@ -116,7 +116,7 @@ def copy(
                     return to_fs.put_file(
                         fobj, to_p, size=size, callback=child, **put_file_kwargs
                     )
-        except Exception as exc:  # noqa: BLE001
+        except Exception as exc:
             if on_error is not None:
                 on_error(from_p, to_p, exc)
             else:
@@ -133,9 +133,9 @@ def copy(
 
 
 def _put(  # noqa: C901
-    from_paths: List["AnyFSPath"],
+    from_paths: list["AnyFSPath"],
     to_fs: "FileSystem",
-    to_paths: List["AnyFSPath"],
+    to_paths: list["AnyFSPath"],
     callback: "Callback" = DEFAULT_CALLBACK,
     batch_size: Optional[int] = None,
     on_error: Optional[TransferErrorHandler] = None,
@@ -151,7 +151,7 @@ def _put(  # noqa: C901
                 return to_fs.put_file(
                     from_path, to_path, callback=child, **put_file_kwargs
                 )
-        except Exception as exc:  # noqa: BLE001
+        except Exception as exc:
             if on_error is not None:
                 on_error(from_path, to_path, exc)
             else:
@@ -199,8 +199,8 @@ def _put(  # noqa: C901
 
 def _get(  # noqa: C901
     from_fs: "FileSystem",
-    from_paths: List["AnyFSPath"],
-    to_paths: List["AnyFSPath"],
+    from_paths: list["AnyFSPath"],
+    to_paths: list["AnyFSPath"],
     callback: "Callback" = DEFAULT_CALLBACK,
     batch_size: Optional[int] = None,
     on_error: Optional[TransferErrorHandler] = None,
@@ -217,7 +217,7 @@ def _get(  # noqa: C901
                     return from_fs.get_file(
                         from_path, tmp_file, callback=child, **get_file_kwargs
                     )
-            except Exception as exc:  # noqa: BLE001
+            except Exception as exc:
                 if on_error is not None:
                     on_error(from_path, to_path, exc)
                 else:
@@ -265,7 +265,7 @@ def _get(  # noqa: C901
 
 
 def _try_links(
-    links: List["str"],
+    links: list["str"],
     from_fs: "FileSystem",
     from_path: "AnyFSPath",
     to_fs: "FileSystem",
@@ -299,6 +299,7 @@ def _try_links(
                 errno.ENOTTY,
                 errno.ENOSYS,
                 errno.EINVAL,
+                errno.EAGAIN,
             ):
                 raise
             error = exc
@@ -310,11 +311,11 @@ def _try_links(
 
 def transfer(  # noqa: PLR0912, C901
     from_fs: "FileSystem",
-    from_path: Union["AnyFSPath", List["AnyFSPath"]],
+    from_path: Union["AnyFSPath", list["AnyFSPath"]],
     to_fs: "FileSystem",
-    to_path: Union["AnyFSPath", List["AnyFSPath"]],
+    to_path: Union["AnyFSPath", list["AnyFSPath"]],
     hardlink: bool = False,
-    links: Optional[List["str"]] = None,
+    links: Optional[list["str"]] = None,
     callback: "Callback" = DEFAULT_CALLBACK,
     batch_size: Optional[int] = None,
     on_error: Optional[TransferErrorHandler] = None,
@@ -375,7 +376,7 @@ def transfer(  # noqa: PLR0912, C901
                 on_error(from_p, to_p, exc)
             else:
                 raise
-        except Exception as exc:  # noqa: BLE001
+        except Exception as exc:
             if on_error is not None:
                 on_error(from_p, to_p, exc)
             else:
@@ -405,12 +406,12 @@ def _test_link(
 
 
 def test_links(
-    links: List["str"],
+    links: list["str"],
     from_fs: "FileSystem",
     from_path: "AnyFSPath",
     to_fs: "FileSystem",
     to_path: "AnyFSPath",
-) -> List["AnyFSPath"]:
+) -> list["AnyFSPath"]:
     from .utils import tmp_fname
 
     from_file = from_fs.join(from_path, tmp_fname())

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/src/dvc_objects/fs/local.py

@@ -127,8 +127,8 @@ class FsspecLocalFileSystem(fsspec.AbstractFileSystem):
             self.rm_file(tmp_info)
             raise
 
-    def open(self, path, mode="r", encoding=None, **kwargs):  # noqa: A003
-        return open(path, mode=mode, encoding=encoding)  # noqa: SIM115
+    def open(self, path, mode="r", encoding=None, **kwargs):
+        return open(path, mode=mode, encoding=encoding)
 
     def symlink(self, path1, path2):
         return self.fs.symlink(path1, path2)

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/src/dvc_objects/fs/utils.py

@@ -5,10 +5,11 @@ import shutil
 import stat
 import sys
 import threading
+from collections.abc import Collection, Iterator
 from concurrent import futures
 from contextlib import contextmanager, suppress
 from secrets import token_urlsafe
-from typing import TYPE_CHECKING, Any, Collection, Dict, Iterator, Optional, Set, Union
+from typing import TYPE_CHECKING, Any, Optional, Union
 
 from fsspec.callbacks import DEFAULT_CALLBACK
 
@@ -207,7 +208,7 @@ def exists(
     file_paths: Union["AnyFSPath", Collection["AnyFSPath"]],
     callback: "Callback" = DEFAULT_CALLBACK,
     batch_size: Optional[int] = None,
-) -> Dict[str, bool]:
+) -> dict[str, bool]:
     """Return batched fs.exists results.
 
     Runs batched fs.exists() calls in parallel with fs.ls() until all paths
@@ -221,7 +222,7 @@ def exists(
         return {path: fs.exists(path)}
 
     paths_lock = threading.Lock()
-    results: Dict[str, bool] = {}
+    results: dict[str, bool] = {}
     results_lock = threading.Lock()
     callback.set_size(len(paths))
     jobs = batch_size or fs.jobs
@@ -260,9 +261,9 @@ def exists(
 
 def _exist_query(
     fs: "FileSystem",
-    paths: Set["AnyFSPath"],
+    paths: set["AnyFSPath"],
     paths_lock: threading.Lock,
-    results: Dict[str, bool],
+    results: dict[str, bool],
     results_lock: threading.Lock,
     batch_size: int,
     callback: "Callback",
@@ -282,9 +283,9 @@ def _exist_query(
 
 def _list_query(
     fs: "FileSystem",
-    paths: Set["AnyFSPath"],
+    paths: set["AnyFSPath"],
     paths_lock: threading.Lock,
-    results: Dict[str, bool],
+    results: dict[str, bool],
     results_lock: threading.Lock,
     callback: "Callback",
 ):
@@ -294,7 +295,7 @@ def _list_query(
         with paths_lock:
             if not paths:
                 return
-        kwargs: Dict[str, Any] = {}
+        kwargs: dict[str, Any] = {}
         if fs.version_aware:
             kwargs["versions"] = True
         contents = fs.ls(parent, **kwargs)

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/src/dvc_objects/obj.py

@@ -5,7 +5,7 @@ if TYPE_CHECKING:
 
 
 class Object:
-    __slots__ = ("path", "fs", "oid")
+    __slots__ = ("fs", "oid", "path")
 
     def __init__(
         self,

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/src/dvc_objects/transfer.py

@@ -1,12 +1,12 @@
-from typing import TYPE_CHECKING, Optional, Set
+from typing import TYPE_CHECKING, Optional
 
 if TYPE_CHECKING:
     from .db import ObjectDB
 
 
 def transfer(
-    src: "ObjectDB", dest: "ObjectDB", oids: Set["str"], jobs: Optional[int] = None
-) -> Set["str"]:
+    src: "ObjectDB", dest: "ObjectDB", oids: set["str"], jobs: Optional[int] = None
+) -> set["str"]:
     src_exists = set(src.oids_exist(oids, jobs=jobs))
     src_missing = oids - src_exists
 

{dvc-objects-5.0.0 → dvc_objects-5.1.1/src/dvc_objects.egg-info}/PKG-INFO

@@ -1,25 +1,25 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dvc-objects
-Version: 5.0.0
+Version: 5.1.1
 Summary: dvc objects - filesystem and object-db level abstractions to use in dvc and dvc-data
 Author-email: Iterative <support@dvc.org>
 License: Apache-2.0
 Project-URL: Issues, https://github.com/iterative/dvc-objects/issues
 Project-URL: Source, https://github.com/iterative/dvc-objects
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Development Status :: 4 - Beta
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: funcy>=1.14; python_version < "3.12"
 Requires-Dist: fsspec>=2024.2.0
+Requires-Dist: funcy>=1.14; python_version < "3.12"
 Provides-Extra: tests
-Requires-Dist: pytest<8,>=7; extra == "tests"
+Requires-Dist: pytest<9,>=7; extra == "tests"
 Requires-Dist: pytest-sugar; extra == "tests"
 Requires-Dist: pytest-cov>=4.1.0; extra == "tests"
 Requires-Dist: pytest-mock; extra == "tests"
@@ -28,7 +28,8 @@ Requires-Dist: pytest-asyncio<1,>=0.23.2; extra == "tests"
 Requires-Dist: reflink; extra == "tests"
 Provides-Extra: dev
 Requires-Dist: dvc-objects[tests]; extra == "dev"
-Requires-Dist: mypy==1.8.0; extra == "dev"
+Requires-Dist: mypy==1.16.0; extra == "dev"
+Dynamic: license-file
 
 DVC objects
 ===========

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/src/dvc_objects.egg-info/requires.txt

@@ -5,10 +5,10 @@ funcy>=1.14
 
 [dev]
 dvc-objects[tests]
-mypy==1.8.0
+mypy==1.16.0
 
 [tests]
-pytest<8,>=7
+pytest<9,>=7
 pytest-sugar
 pytest-cov>=4.1.0
 pytest-mock

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/tests/benchmarks/test_fs.py

@@ -44,9 +44,9 @@ def paths(original, links):
 
 def test_link(benchmark, paths, links, link):
     def setup():
-        for link in links.iterdir():
-            if link.is_file():
-                link.unlink()
+        for lnk in links.iterdir():
+            if lnk.is_file():
+                lnk.unlink()
 
     def _link(paths):
         for src, path in paths:

{dvc-objects-5.0.0 → dvc_objects-5.1.1}/tests/fs/test_localfs.py

@@ -1,6 +1,5 @@
 import os
 from os import fspath
-from typing import Dict, List, Set, Tuple
 
 import pytest
 
@@ -98,11 +97,11 @@ def test_walk(dir_path):
 
 def test_walk_detail(dir_path):
     fs = LocalFileSystem()
-    walk_results: List[Tuple[str, Dict[str, Dict], Dict[str, Dict]]] = list(
+    walk_results: list[tuple[str, dict[str, dict], dict[str, dict]]] = list(
         fs.walk(fspath(dir_path), detail=True)
     )
 
-    expected: List[Tuple[str, Set[str], Set[str]]] = [
+    expected: list[tuple[str, set[str], set[str]]] = [
         (str(dir_path), {"data"}, {"code.py", "bar", "тест", "foo"}),
         (str(dir_path / "data"), {"sub"}, {"file"}),
         (str(dir_path / "data" / "sub"), set(), {"file"}),