Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ This guide will help you get started with contributing.
conda install root
conda install pandas
conda install dask
conda install minio

# pip-only dependencies
pip install scikit-hep-testdata
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ The following libraries are also useful in conjunction with Uproot, but are not

**For accessing remote files:**

* `minio`: if reading files with `s3://` URIs.
* `s3fs`: if reading files with `s3://` URIs.
* `xrootd`: if reading files with `root://` URIs.
* HTTP/S access is built in (Python standard library).

Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ test = [
"deflate",
"fsspec-xrootd>=0.5.0",
"isal",
"minio",
"paramiko",
"pytest-rerunfailures",
"rangehttpserver",
Expand Down
1 change: 0 additions & 1 deletion src/uproot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
from uproot.source.http import MultithreadedHTTPSource
from uproot.source.xrootd import XRootDSource
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
Expand Down
20 changes: 0 additions & 20 deletions src/uproot/extras.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,26 +60,6 @@ def pandas():
return pandas


def Minio_client():
"""
Imports and returns ``minio.Minio``.
"""
try:
from minio import Minio
except ModuleNotFoundError as err:
raise ModuleNotFoundError(
"""install the 'minio' package with:

pip install minio

or

conda install minio"""
) from err
else:
return Minio


def XRootD_client():
"""
Imports and returns ``XRootD.client`` (after setting the
Expand Down
90 changes: 0 additions & 90 deletions src/uproot/source/s3.py

This file was deleted.

2 changes: 0 additions & 2 deletions tests/test_0692_fsspec_reading.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import uproot.source.fsspec
import uproot.source.file
import uproot.source.xrootd
import uproot.source.s3

is_windows = sys.platform.startswith("win")

Expand Down Expand Up @@ -91,7 +90,6 @@ def test_open_fsspec_local():
"handler",
[
uproot.source.fsspec.FSSpecSource,
uproot.source.s3.S3Source,
None,
],
)
Expand Down
8 changes: 4 additions & 4 deletions tests/test_0916_read_from_s3.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

import uproot

pytest.importorskip("minio")
pytest.importorskip("s3fs")


@pytest.mark.network
def test_s3_fail():
with pytest.raises((FileNotFoundError, TimeoutError, socket.timeout)):
# Sometimes this raises a timeout error that doesn't go away for a long time, we might as well skip it.
with uproot.source.s3.S3Source(
"s3://pivarski-princeton/does-not-exist", timeout=0.1
with uproot.source.fsspec.FSSpecSource(
"s3://pivarski-princeton/does-not-exist", timeout=0.1, anon=True
) as source:
uproot._util.tobytes(source.chunk(0, 100).raw_data)

Expand All @@ -23,7 +23,7 @@ def test_s3_fail():
def test_read_s3():
with uproot.open(
"s3://pivarski-princeton/pythia_ppZee_run17emb.picoDst.root:PicoDst",
handler=uproot.source.s3.S3Source,
anon=True,
) as f:
data = f["Event/Event.mEventId"].array(library="np")
assert len(data) == 8004