From 7bf6e8af60ebd6c66edef130d6b2cb754bb30f79 Mon Sep 17 00:00:00 2001 From: Luis Antonio Obis Aparicio <35803280+lobis@users.noreply.github.com> Date: Thu, 16 Nov 2023 18:16:55 -0600 Subject: [PATCH] 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 e76fdbb1e3011a2ad3bd9ea8cb4634b43caa6af6. * sesparate PR for s3 fix (https://github.com/scikit-hep/uproot5/pull/1024) * strip file:// * rename test * rename tests * add aiohttp skip * attempt to parse windows paths * test ci * Revert "test ci" This reverts commit 4c1c8a5bdc3cbbab540c125807b1139a51e9c455. * 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 --- src/uproot/_util.py | 4 ++-- src/uproot/version.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/uproot/_util.py b/src/uproot/_util.py index 28ac3665e..1a86c4207 100644 --- a/src/uproot/_util.py +++ b/src/uproot/_util.py @@ -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"): diff --git a/src/uproot/version.py b/src/uproot/version.py index a395bccc8..dfdb7f2ea 100644 --- a/src/uproot/version.py +++ b/src/uproot/version.py @@ -12,7 +12,7 @@ import re -__version__ = "5.1.2" +__version__ = "5.2.0rc1" version = __version__ version_info = tuple(re.split(r"[-\.]", __version__))