From b9d974069c1a1cf0821c3b19ffba92f11a902eeb Mon Sep 17 00:00:00 2001 From: Mason Proffitt Date: Fri, 20 Oct 2023 15:17:40 +0200 Subject: [PATCH 1/3] remove quoted lambda workaround in test --- tests/test_adl_benchmarks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_adl_benchmarks.py b/tests/test_adl_benchmarks.py index f5dc742..27d4f3e 100644 --- a/tests/test_adl_benchmarks.py +++ b/tests/test_adl_benchmarks.py @@ -1204,8 +1204,8 @@ def test_adl_benchmark_8(): ) # Quotes needed around lambda here due to https://github.com/iris-hep/func_adl/issues/127 .Select( - 'lambda event: (2 * event.leading_other_lepton_p4.pt * event.met.pt' - ' * (1 - np.cos(event.leading_other_lepton_p4.deltaphi(event.met)))) ** 0.5' + lambda event: (2 * event.leading_other_lepton_p4.pt * event.met.pt + * (1 - np.cos(event.leading_other_lepton_p4.deltaphi(event.met)))) ** 0.5 ) ) ( From 14284ad1450c7c7aa8202ad978360fe9c4831f52 Mon Sep 17 00:00:00 2001 From: Mason Proffitt Date: Fri, 20 Oct 2023 15:20:20 +0200 Subject: [PATCH 2/3] formatting --- tests/test_adl_benchmarks.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/test_adl_benchmarks.py b/tests/test_adl_benchmarks.py index 27d4f3e..a5c6ef4 100644 --- a/tests/test_adl_benchmarks.py +++ b/tests/test_adl_benchmarks.py @@ -1204,8 +1204,13 @@ def test_adl_benchmark_8(): ) # Quotes needed around lambda here due to https://github.com/iris-hep/func_adl/issues/127 .Select( - lambda event: (2 * event.leading_other_lepton_p4.pt * event.met.pt - * (1 - np.cos(event.leading_other_lepton_p4.deltaphi(event.met)))) ** 0.5 + lambda event: ( + 2 + * event.leading_other_lepton_p4.pt + * event.met.pt + * (1 - np.cos(event.leading_other_lepton_p4.deltaphi(event.met))) + ) + ** 0.5 ) ) ( From 35f29152b936b0d8c4a4a19e59c89a35d160441f Mon Sep 17 00:00:00 2001 From: Mason Proffitt Date: Fri, 20 Oct 2023 15:21:12 +0200 Subject: [PATCH 3/3] bump func-adl requirement to fix https://github.com/iris-hep/func_adl/issues/127 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0ce2359..b852d9e 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ 'awkward>=2.0.9', 'dask[complete]', 'dask-awkward>=2023.8.1', - 'func-adl>=3.1', + 'func-adl>=3.2.7', 'numpy', 'qastle>=0.16.1', 'uproot>=5',