Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: fsspec as required dependency #1022

Merged
merged 9 commits into from
Dec 13, 2023
Merged

feat: fsspec as required dependency #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e502c46
feat: add fsspec as required dependency (#1021)
lobis Nov 14, 2023
8f37e6f
feat: set fsspec as default source (#1023)
lobis Nov 15, 2023
7bf6e8a
feat: set `fsspec` (`s3fs`) as default handler for s3 paths (#1032)
lobis Nov 17, 2023
2d84cfe
feat: simplify object path split (#1028)
lobis Nov 16, 2023
0c57861
feat: fsspec for all non-object writing - %-encoded urls no longer de…
lobis Nov 20, 2023
afeeee7
test: improve path object split tests (#1039)
lobis Nov 27, 2023
6330f65
test: add test for issue 1054 (newer fsspec failing to parse files wi…
lobis Dec 11, 2023
5dc898f
feat: globbing with fsspec (#1061)
lobis Dec 13, 2023
9d597dc
fix: dask distributed fsspec issue (#1065)
lobis Dec 13, 2023
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 pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ dependencies = [
"awkward>=2.4.6",
"importlib-metadata;python_version<\"3.8\"",
"numpy",
"fsspec",
"packaging",
"typing_extensions>=4.1.0; python_version < \"3.11\""
]
Expand All @@ -52,7 +53,7 @@ requires-python = ">=3.8"
dev = [
"boost_histogram>=0.13",
"dask-awkward>=2023.12.1",
"dask[array]",
"dask[array,distributed]",
"hist>=1.2",
"pandas",
"awkward-pandas"
Expand All @@ -63,7 +64,6 @@ test = [
"zstandard",
"minio",
"aiohttp",
"fsspec",
"fsspec-xrootd",
"s3fs",
"paramiko",
Expand Down
2 changes: 1 addition & 1 deletion src/uproot/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
isort:skip_file
"""


from uproot.version import __version__
import uproot.const
import uproot.extras
Expand All @@ -92,6 +91,7 @@
from uproot.source.xrootd import MultithreadedXRootDSource
from uproot.source.s3 import S3Source
from uproot.source.object import ObjectSource
from uproot.source.fsspec import FSSpecSource
from uproot.source.cursor import Cursor
from uproot.source.futures import TrivialExecutor
from uproot.source.futures import ThreadPoolExecutor
Expand Down
7 changes: 1 addition & 6 deletions src/uproot/_dask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,6 @@ def dask(
Options (type; default):

* handler (:doc:`uproot.source.chunk.Source` class; None)
* file_handler (:doc:`uproot.source.chunk.Source` class; None) (Deprecated: Use `handler` instead. If set, this will take precedence over `handler`)
* xrootd_handler (:doc:`uproot.source.chunk.Source` class; None) (Deprecated: Use `handler` instead. If set, this will take precedence over `handler`)
* s3_handler (:doc:`uproot.source.chunk.Source` class; None) (Deprecated: Use `handler` instead. If set, this will take precedence over `handler`)
* http_handler (:doc:`uproot.source.chunk.Source` class; None) (Deprecated: Use `handler` instead. If set, this will take precedence over `handler`)
* object_handler (:doc:`uproot.source.chunk.Source` class; None) (Deprecated: Use `handler` instead. If set, this will take precedence over `handler`)
* timeout (float for HTTP, int for XRootD; 30)
* max_num_elements (None or int; None)
* num_workers (int; 1)
Expand All @@ -166,7 +161,7 @@ def dask(
array from ``TTrees``.
"""

files = uproot._util.regularize_files(files, steps_allowed=True)
files = uproot._util.regularize_files(files, steps_allowed=True, **options)

is_3arg = [len(x) == 3 for x in files]
if any(is_3arg):
Expand Down
Loading