Merge branch 'master' into local_executors_to_dask

scikit-hep · Nov 30, 2023 · 54b27b6 · 54b27b6
2 parents 8625484 + 4080344
commit 54b27b6
Show file tree

Hide file tree

Showing 6 changed files with 307 additions and 223 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -51,7 +51,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Set up JDK ${{ matrix.java-distribution }}/${{ matrix.java-version }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java-version }}
         distribution: ${{ matrix.java-distribution }}

diff --git a/pyproject.toml b/pyproject.toml
@@ -40,7 +40,7 @@ dependencies = [
   "awkward>=2.5.0",
   "uproot>=5.1.2",
   "dask[array]>=2023.4.0",
-  "dask-awkward>=2023.11.3",
+  "dask-awkward>=2023.11.4",
   "dask-histogram>=2023.10.0",
   "correctionlib>=2.3.3",
   "pyarrow>=6.0.0",

diff --git a/src/coffea/jetmet_tools/CorrectedJetsFactory.py b/src/coffea/jetmet_tools/CorrectedJetsFactory.py
@@ -6,9 +6,9 @@
 import numpy
 
 _stack_parts = ["jec", "junc", "jer", "jersf"]
-_MIN_JET_ENERGY = numpy.array(1e-2, dtype=numpy.float32)
-_ONE_F32 = numpy.array(1.0, dtype=numpy.float32)
-_ZERO_F32 = numpy.array(0.0, dtype=numpy.float32)
+_MIN_JET_ENERGY = numpy.float32(1e-2)
+_ONE_F32 = numpy.float32(1.0)
+_ZERO_F32 = numpy.float32(0.0)
 _JERSF_FORM = {
     "class": "NumpyArray",
     "inner_shape": [3],

diff --git a/src/coffea/nanoevents/methods/base.py b/src/coffea/nanoevents/methods/base.py
@@ -160,12 +160,11 @@ class NanoEvents(Systematic):
     This mixin class is used as the top-level type for NanoEvents objects.
     """
 
-    def get_metadata(self, _dask_array_=None):
+    @dask_awkward.dask_property(no_dispatch=True)
+    def metadata(self):
         """Arbitrary metadata"""
         return self.layout.purelist_parameter("metadata")
 
-    metadata = property(get_metadata)
-
 
 behavior[("__typestr__", "NanoEvents")] = "event"