diff --git a/pyproject.toml b/pyproject.toml index 1b38c9ef3..e74bbfc55 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,10 +37,10 @@ classifiers = [ "Topic :: Utilities", ] dependencies = [ - "awkward>=2.4.8", + "awkward>=2.5.0", "uproot>=5.1.2", "dask[array]>=2023.4.0", - "dask-awkward>=2023.11.0", + "dask-awkward>=2023.11.3", "dask-histogram>=2023.10.0", "correctionlib>=2.3.3", "pyarrow>=6.0.0", diff --git a/tests/test_analysis_tools.py b/tests/test_analysis_tools.py index bc3ebf05a..8562ebc77 100644 --- a/tests/test_analysis_tools.py +++ b/tests/test_analysis_tools.py @@ -836,11 +836,11 @@ def test_packed_selection_nminusone_dak(optimization_enabled): ] assert list(dask.compute(*nev)) == [ - len(events), - len(events[nomuon & leadpt20]), - len(events[twoelectron & leadpt20]), - len(events[twoelectron & nomuon]), - len(events[twoelectron & nomuon & leadpt20]), + dak.num(events, axis=0).compute(), + dak.num(events[nomuon & leadpt20], axis=0).compute(), + dak.num(events[twoelectron & leadpt20], axis=0).compute(), + dak.num(events[twoelectron & nomuon], axis=0).compute(), + dak.num(events[twoelectron & nomuon & leadpt20], axis=0).compute(), ] for mask, truth in zip( @@ -956,17 +956,17 @@ def test_packed_selection_cutflow_dak(optimization_enabled): assert labels == ["initial", "noMuon", "twoElectron", "leadPt20"] assert list(dask.compute(*nevonecut)) == [ - len(events), - len(events[nomuon]), - len(events[twoelectron]), - len(events[leadpt20]), + dak.num(events, axis=0).compute(), + dak.num(events[nomuon], axis=0).compute(), + dak.num(events[twoelectron], axis=0).compute(), + dak.num(events[leadpt20], axis=0).compute(), ] assert list(dask.compute(*nevcutflow)) == [ - len(events), - len(events[nomuon]), - len(events[nomuon & twoelectron]), - len(events[nomuon & twoelectron & leadpt20]), + dak.num(events, axis=0).compute(), + dak.num(events[nomuon], axis=0).compute(), + dak.num(events[nomuon & twoelectron], axis=0).compute(), + dak.num(events[nomuon & twoelectron & leadpt20], axis=0).compute(), ] for mask, truth in zip(masksonecut, [nomuon, twoelectron, leadpt20]): @@ -1091,11 +1091,11 @@ def test_packed_selection_nminusone_dak_uproot_only(optimization_enabled): ] assert list(dask.compute(*nev)) == [ - len(events), - len(events[nomuon & leadpt20]), - len(events[twoelectron & leadpt20]), - len(events[twoelectron & nomuon]), - len(events[twoelectron & nomuon & leadpt20]), + dak.num(events, axis=0).compute(), + dak.num(events[nomuon & leadpt20], axis=0).compute(), + dak.num(events[twoelectron & leadpt20], axis=0).compute(), + dak.num(events[twoelectron & nomuon], axis=0).compute(), + dak.num(events[twoelectron & nomuon & leadpt20], axis=0).compute(), ] for mask, truth in zip( @@ -1211,17 +1211,17 @@ def test_packed_selection_cutflow_dak_uproot_only(optimization_enabled): assert labels == ["initial", "noMuon", "twoElectron", "leadPt20"] assert list(dask.compute(*nevonecut)) == [ - len(events), - len(events[nomuon]), - len(events[twoelectron]), - len(events[leadpt20]), + dak.num(events, axis=0).compute(), + dak.num(events[nomuon], axis=0).compute(), + dak.num(events[twoelectron], axis=0).compute(), + dak.num(events[leadpt20], axis=0).compute(), ] assert list(dask.compute(*nevcutflow)) == [ - len(events), - len(events[nomuon]), - len(events[nomuon & twoelectron]), - len(events[nomuon & twoelectron & leadpt20]), + dak.num(events, axis=0).compute(), + dak.num(events[nomuon], axis=0).compute(), + dak.num(events[nomuon & twoelectron], axis=0).compute(), + dak.num(events[nomuon & twoelectron & leadpt20], axis=0).compute(), ] for mask, truth in zip(masksonecut, [nomuon, twoelectron, leadpt20]):