Merge branch 'master' into resurrect_systematics

.github/workflows/ci.yml

@@ -80,9 +80,7 @@ jobs:
         pytest --cov-report=xml --cov=coffea tests
     - name: Upload codecov
       if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.10
-      run: |
-        python -m pip install codecov
-        codecov
+      uses: codecov/codecov-action@v3
     - name: Install graphviz
       if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.10
       uses: kamiazya/setup-graphviz@v1

.pre-commit-config.yaml

@@ -54,13 +54,13 @@ repos:
     exclude: coffea/processor/templates
 
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.2.2
+  rev: v2.2.4
   hooks:
   - id: codespell
-    args: ["--skip=*.ipynb","-L hist,Hist,nd,SubJet,subjet,Subjet,PTD,ptd"]
+    args: ["--skip=*.ipynb","-L hist,Hist,nd,SubJet,subjet,Subjet,PTD,ptd,fPt,fpt"]
 
 - repo: https://github.com/mgedmin/check-manifest
-  rev: "0.46"
+  rev: "0.49"
   hooks:
   - id: check-manifest
     stages: [manual]

coffea/lookup_tools/txt_converters.py

@@ -616,7 +616,7 @@ def convert_rochester_file(path, loaduncs=True):
                     assert len(values) == ntrk + 1
 
                 # tag R has 2 indices corresponding to VARIABLE BINNUMBER and has RTRK values each
-                # these variables correspond to the rsPar[3] and crystal ball (std::vector<CrystalBall> cb) of RocRes where CrystalBall has valus s, a, n
+                # these variables correspond to the rsPar[3] and crystal ball (std::vector<CrystalBall> cb) of RocRes where CrystalBall has values s, a, n
                 # (and BINNUMBER is the abseta bin)
                 # Note: crystal ball here is a symmetric double-sided crystal ball
                 elif tag == "R":

setup.py

@@ -54,11 +54,11 @@ def get_description():
 
 
 INSTALL_REQUIRES = [
-    "awkward>=2.1.0",
+    "awkward>=2.1.2",
     "uproot>=5.0.5",
     "dask[array]>=2022.12.1",
-    "dask-awkward>=2023.3",
-    "dask-histogram>=2023.2",
+    "dask-awkward>=2023.4",
+    "dask-histogram>=2023.4",
     "correctionlib>=2.0.0",
     "pyarrow>=6.0.0",
     "fsspec",