Skip to content

Commit b1ba969

Browse files
committed
Remove FS base class & clean imports
Stop subclassing fs.base.FS and remove the fs import/requirement; DataverseFS is now a plain class. Reorder and clean up imports (add pandas, cachetools.TTLCache, typing_extensions.Self), remove deprecation-warning suppression and unnecessary noqa comments, and adjust placement of pyDataverse.models.file.update import. These changes simplify dependencies and tidy module imports.
1 parent d4c0801 commit b1ba969

1 file changed

Lines changed: 11 additions & 18 deletions

File tree

pyDataverse/filesystem/dvfs.py

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
1-
import warnings
21
from typing import Any, Dict, List, Literal, Optional, Set, Union, overload
32
from urllib.parse import parse_qs, urlparse
43

5-
from pyDataverse.models.file import update
6-
7-
# Suppress pkg_resources deprecation warnings from fs package
8-
# Must be before fs import to suppress warnings during import
9-
warnings.filterwarnings("ignore", category=DeprecationWarning, module="fs")
10-
warnings.filterwarnings("ignore", category=DeprecationWarning, module="pkg_resources")
4+
import pandas as pd
5+
from cachetools import TTLCache
6+
from typing_extensions import Self
117

12-
import pandas as pd # noqa: E402
13-
from cachetools import TTLCache # noqa: E402
14-
from fs.base import FS # noqa: E402
15-
from typing_extensions import Self # noqa: E402
8+
from pyDataverse.models.file import update
169

17-
from ..api import DataAccessApi, NativeApi # noqa: E402
18-
from ..models.dataset.edit_get import DataFile, File, GetDatasetResponse # noqa: E402
19-
from ..models.file.filemeta import UploadBody # noqa: E402
20-
from .reader import DataverseFileReader # noqa: E402
21-
from .tab import TABULAR_MIME_TYPES, TabSpecs # noqa: E402
22-
from .writer import DataverseFileWriter # noqa: E402
10+
from ..api import DataAccessApi, NativeApi
11+
from ..models.dataset.edit_get import DataFile, File, GetDatasetResponse
12+
from ..models.file.filemeta import UploadBody
13+
from .reader import DataverseFileReader
14+
from .tab import TABULAR_MIME_TYPES, TabSpecs
15+
from .writer import DataverseFileWriter
2316

2417

2518
class Info(DataFile):
@@ -28,7 +21,7 @@ def raw(self) -> dict:
2821
return self.model_dump()
2922

3023

31-
class DataverseFS(FS):
24+
class DataverseFS:
3225
"""
3326
A PyFilesystem2 implementation for Dataverse datasets.
3427

0 commit comments

Comments
 (0)