From 54bd30a0c20b3cf8a25eed1d27d18774e57b19b3 Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Thu, 19 Oct 2023 10:52:14 -0500 Subject: [PATCH 1/6] Update test_nanoevents.py --- tests/test_nanoevents.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_nanoevents.py b/tests/test_nanoevents.py index e1fd0e92d..0251ca5aa 100644 --- a/tests/test_nanoevents.py +++ b/tests/test_nanoevents.py @@ -173,3 +173,5 @@ def test_missing_eventIds_warning(): NanoAODSchema.error_missing_event_ids = False factory = NanoEventsFactory.from_root(path, schemaclass=NanoAODSchema) factory.events() + + events.Muon.pt.compute(scheduler="processes") From d108df301678b87bd54b90bff8d59f791a4b8684 Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Thu, 19 Oct 2023 10:56:04 -0500 Subject: [PATCH 2/6] actually create variable named events --- tests/test_nanoevents.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_nanoevents.py b/tests/test_nanoevents.py index 0251ca5aa..228667388 100644 --- a/tests/test_nanoevents.py +++ b/tests/test_nanoevents.py @@ -172,6 +172,6 @@ def test_missing_eventIds_warning(): ): NanoAODSchema.error_missing_event_ids = False factory = NanoEventsFactory.from_root(path, schemaclass=NanoAODSchema) - factory.events() + events = factory.events() events.Muon.pt.compute(scheduler="processes") From 1b1f4b6dec7c7e9e95ac6dc2b5cead1c1b632f88 Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Thu, 19 Oct 2023 11:23:19 -0500 Subject: [PATCH 3/6] test dask separately --- tests/test_nanoevents.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/test_nanoevents.py b/tests/test_nanoevents.py index 228667388..18116b763 100644 --- a/tests/test_nanoevents.py +++ b/tests/test_nanoevents.py @@ -174,4 +174,8 @@ def test_missing_eventIds_warning(): factory = NanoEventsFactory.from_root(path, schemaclass=NanoAODSchema) events = factory.events() - events.Muon.pt.compute(scheduler="processes") +def test_missing_eventIds_warning_dask(): + path = os.path.abspath("tests/samples/missing_luminosityBlock.root") + ":Events" + NanoAODSchema.error_missing_event_ids = False + events = NanoEventsFactory.from_root(path, schemaclass=NanoAODSchema, permit_dask=True).events() + events.Muon.pt.compute(scheduler="processes") From effa1376dcdb0fa6c0fab40a9b8d752ed5d8c0be Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 19 Oct 2023 16:24:12 +0000 Subject: [PATCH 4/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- tests/test_nanoevents.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/test_nanoevents.py b/tests/test_nanoevents.py index 18116b763..90534be3e 100644 --- a/tests/test_nanoevents.py +++ b/tests/test_nanoevents.py @@ -174,8 +174,11 @@ def test_missing_eventIds_warning(): factory = NanoEventsFactory.from_root(path, schemaclass=NanoAODSchema) events = factory.events() + def test_missing_eventIds_warning_dask(): path = os.path.abspath("tests/samples/missing_luminosityBlock.root") + ":Events" NanoAODSchema.error_missing_event_ids = False - events = NanoEventsFactory.from_root(path, schemaclass=NanoAODSchema, permit_dask=True).events() + events = NanoEventsFactory.from_root( + path, schemaclass=NanoAODSchema, permit_dask=True + ).events() events.Muon.pt.compute(scheduler="processes") From 88e781e510be243db34b9d4d9c97e1f2f7a3c54e Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Thu, 19 Oct 2023 11:26:33 -0500 Subject: [PATCH 5/6] remove unused name --- tests/test_nanoevents.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_nanoevents.py b/tests/test_nanoevents.py index 90534be3e..2f34f714a 100644 --- a/tests/test_nanoevents.py +++ b/tests/test_nanoevents.py @@ -172,7 +172,7 @@ def test_missing_eventIds_warning(): ): NanoAODSchema.error_missing_event_ids = False factory = NanoEventsFactory.from_root(path, schemaclass=NanoAODSchema) - events = factory.events() + factory.events() def test_missing_eventIds_warning_dask(): From f430f021c000cbbfb2fb5f349d29d4e0a2bc0218 Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Thu, 19 Oct 2023 17:30:16 -0500 Subject: [PATCH 6/6] bump uproot to 5.1.2 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 689e03ff0..a64aff860 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,7 +38,7 @@ classifiers = [ ] dependencies = [ "awkward>=2.4.6", - "uproot>=5.1.1", + "uproot>=5.1.2", "dask[array]>=2023.4.0", "dask-awkward>=2023.10.0", "dask-histogram>=2023.10.0",