Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
with:
fetch-depth: 0

- name: Set up Python 3.14
- name: Set up Python 3.15
uses: actions/setup-python@v6
with:
python-version: '3.14'
python-version: '3.15'

- name: Upgrade pip and nox
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
pyv: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
pyv: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14', '3.15']

steps:
- name: Check out the repository
Expand Down
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ classifiers = [
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Programming Language :: Python :: 3.15",
"Development Status :: 4 - Beta",
]
requires-python = ">=3.9"
Expand All @@ -39,7 +40,7 @@ tests = [
"pytest-cov>=4.1.0",
"pytest-mock",
"pytest-benchmark",
"pytest-asyncio>=0.23.2,<2",
"pytest-asyncio>=0.24,<2",
"reflink",
]
dev = [
Expand All @@ -56,6 +57,7 @@ dvc_objects = ["py.typed"]

[tool.pytest.ini_options]
addopts = "-ra -Werror --benchmark-skip"
asyncio_default_fixture_loop_scope = "function"

[tool.coverage.run]
branch = true
Expand Down
6 changes: 1 addition & 5 deletions src/dvc_objects/fs/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import os
import posixpath
import shutil
from collections.abc import Iterable, Iterator, Sequence
from collections.abc import Iterable, Iterator
from functools import partial
from multiprocessing import cpu_count
from typing import (
Expand Down Expand Up @@ -133,10 +133,6 @@ def abspath(self, path: str) -> str:
path = self.join(self.getcwd(), path)
return self.normpath(path)

@classmethod
def commonprefix(cls, paths: Sequence[str]) -> str:
return cls.flavour.commonprefix(paths)

@classmethod
def commonpath(cls, paths: Iterable[str]) -> str:
return cls.flavour.commonpath(list(paths))
Expand Down
5 changes: 4 additions & 1 deletion src/dvc_objects/fs/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ def resolve_network_drive_windows(path_to_resolve):

path = resolve_network_drive_windows(os.path.abspath(path))
start = resolve_network_drive_windows(start)
if not os.path.commonprefix([start, path]):
try:
os.path.commonpath([start, path])
except ValueError:
# paths are on different drives
return path
return os.path.relpath(path, start)

Expand Down
Loading