uproot 5.2.2__tar.gz → 5.3.0__tar.gz

{uproot-5.2.2 → uproot-5.3.0}/.all-contributorsrc

@@ -533,6 +533,15 @@
       "contributions": [
         "test"
       ]
+    },
+    {
+      "login": "YSelfTool",
+      "name": "Robin Sonnabend",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1640386?v=4",
+      "profile": "http://tooldev.de",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

{uproot-5.2.2 → uproot-5.3.0}/.pre-commit-config.yaml

@@ -18,19 +18,19 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 23.12.1
+    rev: 24.2.0
     hooks:
       - id: black
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.14
+    rev: v0.2.2
     hooks:
       - id: ruff
         args: [--fix, --show-fixes]
 
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.15.1
     hooks:
       - id: pyupgrade
         args: [--py38-plus]

{uproot-5.2.2 → uproot-5.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uproot
-Version: 5.2.2
+Version: 5.3.0
 Summary: ROOT I/O in pure Python and NumPy.
 Project-URL: Download, https://github.com/scikit-hep/uproot5/releases
 Project-URL: Homepage, https://github.com/scikit-hep/uproot5
@@ -31,6 +31,7 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Utilities
 Requires-Python: >=3.8
 Requires-Dist: awkward>=2.4.6
+Requires-Dist: cramjam>=2.8.1
 Requires-Dist: fsspec
 Requires-Dist: importlib-metadata; python_version < '3.8'
 Requires-Dist: numpy
@@ -46,7 +47,7 @@ Requires-Dist: pandas; extra == 'dev'
 Provides-Extra: test
 Requires-Dist: aiohttp; extra == 'test'
 Requires-Dist: fsspec-xrootd; extra == 'test'
-Requires-Dist: lz4; extra == 'test'
+Requires-Dist: isal; extra == 'test'
 Requires-Dist: minio; extra == 'test'
 Requires-Dist: paramiko; extra == 'test'
 Requires-Dist: pytest-rerunfailures; extra == 'test'
@@ -57,7 +58,6 @@ Requires-Dist: requests; extra == 'test'
 Requires-Dist: s3fs; extra == 'test'
 Requires-Dist: scikit-hep-testdata; extra == 'test'
 Requires-Dist: xxhash; extra == 'test'
-Requires-Dist: zstandard; extra == 'test'
 Description-Content-Type: text/markdown
 
 <img src="https://raw.githubusercontent.com/scikit-hep/uproot5/main/docs-img/logo/logo.svg" width="300px">
@@ -245,6 +245,7 @@ Thanks especially to the gracious help of Uproot contributors (including the [or
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/bnavigator"><img src="https://avatars.githubusercontent.com/u/4623504?v=4?s=100" width="100px;" alt="Ben Greiner"/><br /><sub><b>Ben Greiner</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=bnavigator" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://tooldev.de"><img src="https://avatars.githubusercontent.com/u/1640386?v=4?s=100" width="100px;" alt="Robin Sonnabend"/><br /><sub><b>Robin Sonnabend</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=YSelfTool" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

{uproot-5.2.2 → uproot-5.3.0}/README.md

@@ -183,6 +183,7 @@ Thanks especially to the gracious help of Uproot contributors (including the [or
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/bnavigator"><img src="https://avatars.githubusercontent.com/u/4623504?v=4?s=100" width="100px;" alt="Ben Greiner"/><br /><sub><b>Ben Greiner</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=bnavigator" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://tooldev.de"><img src="https://avatars.githubusercontent.com/u/1640386?v=4?s=100" width="100px;" alt="Robin Sonnabend"/><br /><sub><b>Robin Sonnabend</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=YSelfTool" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

{uproot-5.2.2 → uproot-5.3.0}/dev/example-objects.py

@@ -1,6 +1,7 @@
 """
 Use this to make an example ROOT file for src/uproot/models/TH.py and src/uproot/models/TGraph.py.
 """
+
 from __future__ import annotations
 
 import numpy as np

{uproot-5.2.2 → uproot-5.3.0}/dev/make-models.py

@@ -1,6 +1,7 @@
 """
 Use this to make src/uproot/models/TH.py and src/uproot/models/TGraph.py.
 """
+
 from __future__ import annotations
 
 import numpy as np

{uproot-5.2.2 → uproot-5.3.0}/docs-sphinx/prepare_docstrings.py

@@ -107,7 +107,7 @@ def ensure(filename, content):
 
 def handle_module(modulename, module):
     if any(x.startswith("_") for x in modulename.split(".")) and not any(
-        x == "_dask" for x in modulename.split(".")
+        x == "_dask" or x == "_dask_write" for x in modulename.split(".")
     ):
         return
 
@@ -125,7 +125,8 @@ def handle_module(modulename, module):
         toctree2.write("    " + modulename + " (module) <" + modulename + ">\n")
 
     if modulename != "uproot" and all(
-        not x.startswith("_") or x == "_dask" for x in modulename.split(".")
+        not x.startswith("_") or x == "_dask" or x == "_dask_write"
+        for x in modulename.split(".")
     ):
 
         def good(obj):

{uproot-5.2.2 → uproot-5.3.0}/pyproject.toml

@@ -5,6 +5,9 @@ requires = [
   "hatch-vcs"
 ]
 
+[lint.mccabe]
+max-complexity = 100
+
 [project]
 authors = [
   {name = "Jim Pivarski", email = "pivarski@princeton.edu"}
@@ -35,6 +38,7 @@ classifiers = [
 ]
 dependencies = [
   "awkward>=2.4.6",
+  "cramjam>=2.8.1",
   "importlib-metadata;python_version<\"3.8\"",
   "numpy",
   "fsspec",
@@ -60,9 +64,8 @@ dev = [
   "awkward-pandas"
 ]
 test = [
-  "lz4",
+  "isal",
   "xxhash",
-  "zstandard",
   "minio",
   "aiohttp",
   "fsspec-xrootd",
@@ -114,6 +117,9 @@ exclude = [
   "src/uproot/__init__.py",
   "docs-sphinx/*.py"
 ]
+src = ["src"]
+
+[tool.ruff.lint]
 ignore = [
   "E501",
   "E722",
@@ -122,7 +128,7 @@ ignore = [
   "SIM118",  # key in dict, broken since uproot doesn't behave like a dict
   "PGH003",  # too-broad type ignore
   "SIM114",  # combine `if` branches using logical `or` operator
-  "PGH001",  # no eval allowed
+  "S307",  # no eval allowed
   "PLC1901",  # empty string is falsey (but I don't want to rely on such weak typing)
   "RUF012"  # enforces type annotations on a codebase that lacks type annotations
 ]
@@ -146,16 +152,10 @@ select = [
   "UP",  # pyupgrade
   "YTT"  # flake8-2020
 ]
-src = ["src"]
-
-[tool.ruff.lint]
 isort.required-imports = ["from __future__ import annotations"]
 
-[tool.ruff.mccabe]
-max-complexity = 100
-
-[tool.ruff.per-file-ignores]
-"dev/*" = ["T20"]
+[tool.ruff.lint.per-file-ignores]
+"dev/*" = ["T20", "T201"]
 "src/uproot/*/file.py" = ["SIM115"]
 
 [tool.setuptools_scm]

{uproot-5.2.2 → uproot-5.3.0}/src/uproot/_dask.py

@@ -43,6 +43,8 @@ def dask(
     form_mapping=None,
     allow_read_errors_with_report=False,
     known_base_form=None,
+    decompression_executor=None,
+    interpretation_executor=None,
     **options,
 ):
     """
@@ -104,6 +106,15 @@ def dask(
             report dask-awkward collection.
         known_base_form (awkward.forms.Form | None): If not none use this form instead of opening
             one file to determine the dataset's form. Only available with open_files=False.
+        decompression_executor (None or Executor with a ``submit`` method): The
+            executor that is used to decompress ``TBaskets``; if None, a
+            :doc:`uproot.source.futures.TrivialExecutor` is created.
+            Executors attached to a file are ``shutdown`` when the file is closed.
+        interpretation_executor (None or Executor with a ``submit`` method): The
+            executor that is used to interpret uncompressed ``TBasket`` data as
+            arrays; if None, a :doc:`uproot.source.futures.TrivialExecutor`
+            is created.
+            Executors attached to a file are ``shutdown`` when the file is closed.
         options: See below.
 
     Returns dask equivalents of the backends supported by uproot. If ``library='np'``,
@@ -239,6 +250,8 @@ def dask(
                 real_options,
                 interp_options,
                 steps_per_file,
+                decompression_executor,
+                interpretation_executor,
             )
         else:
             return _get_dask_array_delay_open(
@@ -253,6 +266,8 @@ def dask(
                 real_options,
                 interp_options,
                 steps_per_file,
+                decompression_executor,
+                interpretation_executor,
             )
     elif library.name == "ak":
         if open_files:
@@ -271,6 +286,8 @@ def dask(
                 form_mapping,
                 steps_per_file,
                 allow_read_errors_with_report,
+                decompression_executor,
+                interpretation_executor,
             )
         else:
             return _get_dak_array_delay_open(
@@ -288,6 +305,8 @@ def dask(
                 steps_per_file,
                 allow_read_errors_with_report,
                 known_base_form,
+                decompression_executor,
+                interpretation_executor,
             )
     else:
         raise NotImplementedError()
@@ -438,10 +457,19 @@ def _dask_array_from_map(
 
 
 class _UprootReadNumpy:
-    def __init__(self, ttrees, key, interp_options) -> None:
+    def __init__(
+        self,
+        ttrees,
+        key,
+        interp_options,
+        decompression_executor=None,
+        interpretation_executor=None,
+    ) -> None:
         self.ttrees = ttrees
         self.key = key
         self.interp_options = interp_options
+        self.decompression_executor = decompression_executor
+        self.interpretation_executor = interpretation_executor
 
     def __call__(self, i_start_stop):
         i, start, stop = i_start_stop
@@ -450,18 +478,29 @@ class _UprootReadNumpy:
             entry_stop=stop,
             library="np",
             ak_add_doc=self.interp_options["ak_add_doc"],
+            decompression_executor=self.decompression_executor,
+            interpretation_executor=self.interpretation_executor,
         )
 
 
 class _UprootOpenAndReadNumpy:
     def __init__(
-        self, custom_classes, allow_missing, real_options, key, interp_options
+        self,
+        custom_classes,
+        allow_missing,
+        real_options,
+        key,
+        interp_options,
+        decompression_executor=None,
+        interpretation_executor=None,
     ):
         self.custom_classes = custom_classes
         self.allow_missing = allow_missing
         self.real_options = real_options
         self.key = key
         self.interp_options = interp_options
+        self.decompression_executor = decompression_executor
+        self.interpretation_executor = interpretation_executor
 
     def __call__(self, file_path_object_path_istep_nsteps_ischunk):
         (
@@ -503,6 +542,8 @@ which has {num_entries} entries"""
             entry_start=start,
             entry_stop=stop,
             ak_add_doc=self.interp_options["ak_add_doc"],
+            decompression_executor=self.decompression_executor,
+            interpretation_executor=self.interpretation_executor,
         )
 
 
@@ -519,6 +560,8 @@ def _get_dask_array(
     real_options,
     interp_options,
     steps_per_file,
+    decompression_executor,
+    interpretation_executor,
 ):
     ttrees = []
     explicit_chunks = []
@@ -670,7 +713,13 @@ which has {entry_stop} entries"""
             chunk_args.append((0, 0, 0))
 
         dask_dict[key] = _dask_array_from_map(
-            _UprootReadNumpy(ttrees, key, interp_options),
+            _UprootReadNumpy(
+                ttrees,
+                key,
+                interp_options,
+                decompression_executor,
+                interpretation_executor,
+            ),
             chunk_args,
             chunks=(tuple(chunks),),
             dtype=dt,
@@ -692,6 +741,8 @@ def _get_dask_array_delay_open(
     real_options,
     interp_options,
     steps_per_file,
+    decompression_executor,
+    interpretation_executor,
 ):
     ffile_path, fobject_path = files[0][0:2]
     obj = uproot._util.regularize_object_path(
@@ -750,7 +801,13 @@ def _get_dask_array_delay_open(
 
         dask_dict[key] = _dask_array_from_map(
             _UprootOpenAndReadNumpy(
-                custom_classes, allow_missing, real_options, key, interp_options
+                custom_classes,
+                allow_missing,
+                real_options,
+                key,
+                interp_options,
+                decompression_executor,
+                interpretation_executor,
             ),
             partition_args,
             chunks=(tuple(partitions),),
@@ -762,16 +819,13 @@ def _get_dask_array_delay_open(
 
 class ImplementsFormMappingInfo(Protocol):
     @property
-    def behavior(self) -> dict | None:
-        ...
+    def behavior(self) -> dict | None: ...
 
     buffer_key: str | Callable
 
-    def parse_buffer_key(self, buffer_key: str) -> tuple[str, str]:
-        ...
+    def parse_buffer_key(self, buffer_key: str) -> tuple[str, str]: ...
 
-    def keys_for_buffer_keys(self, buffer_keys: frozenset[str]) -> frozenset[str]:
-        ...
+    def keys_for_buffer_keys(self, buffer_keys: frozenset[str]) -> frozenset[str]: ...
 
     def load_buffers(
         self,
@@ -780,13 +834,11 @@ class ImplementsFormMappingInfo(Protocol):
         start: int,
         stop: int,
         options: Any,
-    ) -> Mapping[str, AwkArray]:
-        ...
+    ) -> Mapping[str, AwkArray]: ...
 
 
 class ImplementsFormMapping(Protocol):
-    def __call__(self, form: Form) -> tuple[Form, ImplementsFormMappingInfo]:
-        ...
+    def __call__(self, form: Form) -> tuple[Form, ImplementsFormMappingInfo]: ...
 
 
 class TrivialFormMappingInfo(ImplementsFormMappingInfo):
@@ -851,6 +903,8 @@ class TrivialFormMappingInfo(ImplementsFormMappingInfo):
         keys: frozenset[str],
         start: int,
         stop: int,
+        decompression_executor,
+        interpretation_executor,
         options: Any,
     ) -> Mapping[str, AwkArray]:
         # First, let's read the arrays as a tuple (to associate with each key)
@@ -859,6 +913,8 @@ class TrivialFormMappingInfo(ImplementsFormMappingInfo):
             entry_start=start,
             entry_stop=stop,
             ak_add_doc=options["ak_add_doc"],
+            decompression_executor=decompression_executor,
+            interpretation_executor=interpretation_executor,
             how=tuple,
         )
 
@@ -928,7 +984,13 @@ class UprootReadMixin:
         # buffer mapping in __call__, such that the high-level form can be
         # used in `from_buffers`
         mapping = self.form_mapping_info.load_buffers(
-            tree, self.common_keys, start, stop, self.interp_options
+            tree,
+            self.common_keys,
+            start,
+            stop,
+            self.decompression_executor,
+            self.interpretation_executor,
+            self.interp_options,
         )
 
         # Populate container with placeholders if keys aren't required
@@ -1102,6 +1164,8 @@ class _UprootRead(UprootReadMixin):
         expected_form: Form,
         form_mapping_info: ImplementsFormMappingInfo,
         allow_read_errors_with_report: bool | tuple[type[BaseException], ...],
+        decompression_executor,
+        interpretation_executor,
     ) -> None:
         self.ttrees = ttrees
         self.common_keys = frozenset(common_keys)
@@ -1110,6 +1174,8 @@ class _UprootRead(UprootReadMixin):
         self.expected_form = expected_form
         self.form_mapping_info = form_mapping_info
         self.allow_read_errors_with_report = allow_read_errors_with_report
+        self.decompression_executor = decompression_executor
+        self.interpretation_executor = interpretation_executor
 
     def project_keys(self: T, keys: frozenset[str]) -> T:
         return _UprootRead(
@@ -1120,6 +1186,8 @@ class _UprootRead(UprootReadMixin):
             self.expected_form,
             self.form_mapping_info,
             self.allow_read_errors_with_report,
+            self.decompression_executor,
+            self.interpretation_executor,
         )
 
     def __call__(self, i_start_stop):
@@ -1152,7 +1220,11 @@ class _UprootRead(UprootReadMixin):
         return self._call_impl(i, start, stop)
 
     def _call_impl(self, i, start, stop):
-        return self.read_tree(self.ttrees[i], start, stop)
+        return self.read_tree(
+            self.ttrees[i],
+            start,
+            stop,
+        )
 
 
 class _UprootOpenAndRead(UprootReadMixin):
@@ -1167,6 +1239,8 @@ class _UprootOpenAndRead(UprootReadMixin):
         expected_form: Form,
         form_mapping_info: ImplementsFormMappingInfo,
         allow_read_errors_with_report: bool | tuple[type[BaseException], ...],
+        decompression_executor,
+        interpretation_executor,
     ) -> None:
         self.custom_classes = custom_classes
         self.allow_missing = allow_missing
@@ -1177,6 +1251,8 @@ class _UprootOpenAndRead(UprootReadMixin):
         self.expected_form = expected_form
         self.form_mapping_info = form_mapping_info
         self.allow_read_errors_with_report = allow_read_errors_with_report
+        self.decompression_executor = decompression_executor
+        self.interpretation_executor = interpretation_executor
 
     def _call_impl(
         self, file_path, object_path, i_step_or_start, n_steps_or_stop, is_chunk
@@ -1211,7 +1287,11 @@ which has {num_entries} entries"""
 
         assert start <= stop
 
-        return self.read_tree(ttree, start, stop)
+        return self.read_tree(
+            ttree,
+            start,
+            stop,
+        )
 
     def __call__(self, blockwise_args):
         (
@@ -1268,6 +1348,8 @@ which has {num_entries} entries"""
             self.expected_form,
             self.form_mapping_info,
             self.allow_read_errors_with_report,
+            self.decompression_executor,
+            self.interpretation_executor,
         )
 
 
@@ -1305,6 +1387,8 @@ def _get_dak_array(
     form_mapping,
     steps_per_file,
     allow_read_errors_with_report,
+    decompression_executor,
+    interpretation_executor,
 ):
     dask_awkward = uproot.extras.dask_awkward()
     awkward = uproot.extras.awkward()
@@ -1468,6 +1552,8 @@ which has {entry_stop} entries"""
         expected_form=expected_form,
         form_mapping_info=form_mapping_info,
         allow_read_errors_with_report=allow_read_errors_with_report,
+        decompression_executor=decompression_executor,
+        interpretation_executor=interpretation_executor,
     )
 
     return dask_awkward.from_map(
@@ -1493,6 +1579,8 @@ def _get_dak_array_delay_open(
     steps_per_file,
     allow_read_errors_with_report,
     known_base_form,
+    decompression_executor,
+    interpretation_executor,
 ):
     dask_awkward = uproot.extras.dask_awkward()
     awkward = uproot.extras.awkward()
@@ -1568,6 +1656,8 @@ def _get_dak_array_delay_open(
         expected_form=expected_form,
         form_mapping_info=form_mapping_info,
         allow_read_errors_with_report=allow_read_errors_with_report,
+        decompression_executor=decompression_executor,
+        interpretation_executor=interpretation_executor,
     )
 
     return dask_awkward.from_map(

{uproot-5.2.2 → uproot-5.3.0}/src/uproot/behaviors/TBranch.py

@@ -2788,7 +2788,8 @@ def _regularize_expression(
         )
 
     else:
-        to_compute = aliases[expression] if expression in aliases else expression
+        # the value of `expression` is either what we want to compute or a lookup value for it
+        to_compute = aliases.get(expression, expression)
 
         is_jagged = False
         expression_branches = []
@@ -3028,7 +3029,7 @@ def _ranges_or_baskets_to_arrays(
         else:
             notifications.put(range_or_basket)
 
-        original_index += 1
+        original_index += 1  # noqa: SIM113 (don't use `enumerate` for `original_index`)
 
         branchid_to_branch[branch.cache_key] = branch