Skip to content

Commit

Permalink
feat: set fsspec (s3fs) as default handler for s3 paths (#1032)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
lobis authored Nov 17, 2023
1 parent a0cd734 commit b8711b2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/uproot/_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -435,8 +435,8 @@ def file_path_to_source_class(file_path, options):
return source_cls, file_path

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

elif scheme in ("http", "https"):
Expand Down
2 changes: 1 addition & 1 deletion src/uproot/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

import re

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

Expand Down

0 comments on commit b8711b2

Please sign in to comment.