Skip to content

Commit b8711b2

Browse files
authored
feat: set fsspec (s3fs) as default handler for s3 paths (#1032)
* feat: add fsspec as required dependency (#1021) * fsspec requirements * simplify fsspec import * use loop property * correctly create schemes list * feat: set fsspec as default source (#1023) * feat: add fsspec as required dependency (#1021) * fsspec requirements * simplify fsspec import * use loop property * correctly create schemes list * remove deprecated handlers from docs * simplify source selection * return object source * pickle executor * rename test * test more handlers * option to check writeable file-like object * rename test * explicitly set handler * fix s3 source * rename test * Revert "fix s3 source" This reverts commit e76fdbb. * sesparate PR for s3 fix (#1024) * strip file:// * rename test * rename tests * add aiohttp skip * attempt to parse windows paths * test ci * Revert "test ci" This reverts commit 4c1c8a5. * rename test * remove fsspec from test * remove *_handler options * update defaults * do not override default s3 * do not use fsspec for multiprocessing * rename test * fix not selecting object source * missing import * normalize doc * remove helper * never return None as source * remove unnecessary xrootd source default override since fsspec is default now * rename test * add empty class to pass old pickle test * set version to 5.2.0rc1 (release candidate) * set s3fs as default for s3 * test different handlers * correct serialization of fsspec source
1 parent a0cd734 commit b8711b2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/uproot/_util.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ def file_path_to_source_class(file_path, options):
435435
return source_cls, file_path
436436

437437
elif scheme == "s3":
438-
# https://github.com/scikit-hep/uproot5/pull/1012
439-
source_cls = uproot.source.s3.S3Source
438+
# uproot.source.s3.S3Source
439+
source_cls = uproot.source.fsspec.FSSpecSource
440440
return source_cls, file_path
441441

442442
elif scheme in ("http", "https"):

src/uproot/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import re
1414

15-
__version__ = "5.1.2"
15+
__version__ = "5.2.0rc1"
1616
version = __version__
1717
version_info = tuple(re.split(r"[-\.]", __version__))
1818

0 commit comments

Comments
 (0)