File tree Expand file tree Collapse file tree 3 files changed +6
-14
lines changed Expand file tree Collapse file tree 3 files changed +6
-14
lines changed Original file line number Diff line number Diff line change @@ -36,6 +36,7 @@ dependencies = [
3636 " awkward>=2.4.6" ,
3737 " importlib-metadata;python_version<\" 3.8\" " ,
3838 " numpy" ,
39+ " fsspec" ,
3940 " packaging" ,
4041 " typing_extensions>=4.1.0; python_version < \" 3.11\" "
4142]
@@ -63,7 +64,6 @@ test = [
6364 " zstandard" ,
6465 " minio" ,
6566 " aiohttp; python_version<\" 3.12\" " , # asyncio not available
66- " fsspec" ,
6767 " fsspec-xrootd" ,
6868 " s3fs; python_version<\" 3.12\" " , # asyncio not available
6969 " paramiko" ,
Original file line number Diff line number Diff line change 1919from collections .abc import Iterable
2020from urllib .parse import unquote , urlparse
2121
22+ import fsspec
2223import numpy
2324import packaging .version
2425
@@ -290,15 +291,7 @@ def regularize_path(path):
290291_windows_absolute_path_pattern_slash = re .compile (r"^[\\/][A-Za-z]:[\\/]" )
291292
292293_remote_schemes = ["root" , "s3" , "http" , "https" ]
293- _schemes = ["file" , * _remote_schemes ]
294-
295- try :
296- # TODO: remove this try/except when fsspec becomes a required dependency
297- import fsspec
298-
299- _schemes = list ({* _schemes , * fsspec .available_protocols ()})
300- except ImportError :
301- pass
294+ _schemes = list ({* _remote_schemes , * fsspec .available_protocols ()})
302295
303296_uri_scheme = re .compile ("^(" + "|" .join ([re .escape (x ) for x in _schemes ]) + ")://" )
304297_uri_scheme_chain = re .compile (
Original file line number Diff line number Diff line change 66import concurrent .futures
77import queue
88
9+ import fsspec
10+ import fsspec .asyn
11+
912import uproot
1013import uproot .source .chunk
1114import uproot .source .futures
@@ -24,8 +27,6 @@ class FSSpecSource(uproot.source.chunk.Source):
2427 """
2528
2629 def __init__ (self , file_path : str , ** options ):
27- import fsspec .core
28-
2930 options = dict (uproot .reading .open .defaults , ** options )
3031 storage_options = {
3132 k : v
@@ -200,8 +201,6 @@ def closed(self) -> bool:
200201class FSSpecLoopExecutor (uproot .source .futures .Executor ):
201202 @property
202203 def loop (self ) -> asyncio .AbstractEventLoop :
203- import fsspec .asyn
204-
205204 return fsspec .asyn .get_loop ()
206205
207206 def submit (self , coroutine ) -> concurrent .futures .Future :
You can’t perform that action at this time.
0 commit comments