uproot 5.7.2__tar.gz → 5.7.3__tar.gz

{uproot-5.7.2 → uproot-5.7.3}/.all-contributorsrc

@@ -686,6 +686,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "nickwp",
+      "name": "Nick Prouse",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9571544?v=4",
+      "profile": "https://github.com/nickwp",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

{uproot-5.7.2 → uproot-5.7.3}/.github/workflows/build-test.yml

@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Get micromamba
-        uses: mamba-org/setup-micromamba@v2
+        uses: mamba-org/setup-micromamba@v3
         with:
           environment-name: test-env
           init-shell: bash
@@ -223,7 +223,7 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Get micromamba
-        uses: mamba-org/setup-micromamba@v2
+        uses: mamba-org/setup-micromamba@v3
         with:
           environment-name: test-env
           init-shell: bash
@@ -257,12 +257,12 @@ jobs:
 
       - name: Upload coverage reports to Codecov
         if: matrix.cuda-version == 13
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Upload test results to Codecov
-        if: ${{ !cancelled() }}
+        if: ${{ !cancelled() && matrix.cuda-version == 13 }}
         uses: codecov/test-results-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

{uproot-5.7.2 → uproot-5.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uproot
-Version: 5.7.2
+Version: 5.7.3
 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
@@ -249,6 +249,7 @@ Thanks especially to the gracious help of Uproot contributors (including the [or
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Rachit931"><img src="https://avatars.githubusercontent.com/u/199397286?v=4?s=100" width="100px;" alt="Rachit931"/><br /><sub><b>Rachit931</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=Rachit931" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/wdconinc"><img src="https://avatars.githubusercontent.com/u/4656391?v=4?s=100" width="100px;" alt="Wouter Deconinck"/><br /><sub><b>Wouter Deconinck</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=wdconinc" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/KaranSinghDev"><img src="https://avatars.githubusercontent.com/u/102300776?v=4?s=100" width="100px;" alt="Karan Singh"/><br /><sub><b>Karan Singh</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=KaranSinghDev" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nickwp"><img src="https://avatars.githubusercontent.com/u/9571544?v=4?s=100" width="100px;" alt="Nick Prouse"/><br /><sub><b>Nick Prouse</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=nickwp" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

{uproot-5.7.2 → uproot-5.7.3}/README.md

@@ -197,6 +197,7 @@ Thanks especially to the gracious help of Uproot contributors (including the [or
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Rachit931"><img src="https://avatars.githubusercontent.com/u/199397286?v=4?s=100" width="100px;" alt="Rachit931"/><br /><sub><b>Rachit931</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=Rachit931" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/wdconinc"><img src="https://avatars.githubusercontent.com/u/4656391?v=4?s=100" width="100px;" alt="Wouter Deconinck"/><br /><sub><b>Wouter Deconinck</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=wdconinc" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/KaranSinghDev"><img src="https://avatars.githubusercontent.com/u/102300776?v=4?s=100" width="100px;" alt="Karan Singh"/><br /><sub><b>Karan Singh</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=KaranSinghDev" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nickwp"><img src="https://avatars.githubusercontent.com/u/9571544?v=4?s=100" width="100px;" alt="Nick Prouse"/><br /><sub><b>Nick Prouse</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=nickwp" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

{uproot-5.7.2 → uproot-5.7.3}/src/uproot/_util.py

@@ -414,7 +414,7 @@ def memory_size(data, error_message=None) -> int:
     """
     if isinstance(data, str):
         m = re.match(
-            r"^\s*([+-]?(\d+(\.\d*)?|\.\d+)(e[+-]?\d+)?)\s*([kmgtpezy]?b)\s*$",
+            r"^\s*([+-]?(\d+(\.\d*)?|\.\d+)(e[+-]?\d+)?)\s*([kmgtpezy]?[i]?b)\s*$",
             data,
             re.I,
         )

{uproot-5.7.2 → uproot-5.7.3}/src/uproot/behaviors/RNTuple.py

@@ -1768,7 +1768,6 @@ def _get_recursive(hasfields, where):
 
 
 def _num_entries_for(ntuple, akform, target_num_bytes, entry_start, entry_stop):
-    # TODO: there might be a better way to estimate the number of entries
     clusters = ntuple.cluster_summaries
     cluster_starts = numpy.array([c.num_first_entry for c in clusters])
 
@@ -1784,9 +1783,10 @@ def _num_entries_for(ntuple, akform, target_num_bytes, entry_start, entry_stop):
     for key in target_cols:
         if "column" in key:
             key_nr = int(key.split("-")[1])
-            for cluster in range(start_cluster_idx, stop_cluster_idx):
-                pages = ntuple.page_link_list[cluster][key_nr].pages
-                total_bytes += sum(page.locator.num_bytes for page in pages)
+            n_entries, _, dt = ntuple._expected_array_length_starts_dtype(
+                key_nr, start_cluster_idx, stop_cluster_idx
+            )
+            total_bytes += n_entries * dt.itemsize
 
     total_entries = entry_stop - entry_start
     if total_bytes == 0:
@@ -1795,8 +1795,7 @@ def _num_entries_for(ntuple, akform, target_num_bytes, entry_start, entry_stop):
         num_entries = round(target_num_bytes * total_entries / total_bytes)
     if num_entries <= 0:
         return 1
-    else:
-        return num_entries
+    return num_entries
 
 
 def _regularize_step_size(ntuple, akform, step_size, entry_start, entry_stop):

{uproot-5.7.2 → uproot-5.7.3}/src/uproot/behaviors/TBranch.py

@@ -2655,6 +2655,8 @@ in file {self._file.file_path}"""
         if 0 <= basket_num < self._num_normal_baskets:
             start = self.member("fBasketSeek")[basket_num]
             stop = start + self.basket_compressed_bytes(basket_num)
+            # xrootd doesn't like NumPy ints
+            start, stop = int(start), int(stop)
             cursor = uproot.source.cursor.Cursor(start)
             chunk = self._file.source.chunk(start, stop)
             return chunk, cursor
@@ -3565,7 +3567,7 @@ def _hasbranches_num_entries_for(
             start = entry_offsets[0]
             for basket_num, stop in enumerate(entry_offsets[1:]):
                 if entry_start < stop and start <= entry_stop:
-                    total_bytes += branch.basket_compressed_bytes(basket_num)
+                    total_bytes += branch.basket_uncompressed_bytes(basket_num)
                 start = stop
 
     total_entries = entry_stop - entry_start

{uproot-5.7.2 → uproot-5.7.3}/src/uproot/models/RNTuple.py

@@ -229,15 +229,17 @@ in file {self.file.file_path}"""
                 ]
 
                 name_counter = Counter(new_names)
+                max_prefixes = max(len(stack) for stack in ancestor_name_stacks)
                 while len(new_names) != len(name_counter):
                     for i in range(len(n_prefixes)):
                         # For non-unique names, add one more prefix and regenerate the name
                         if name_counter[new_names[i]] > 1:
                             n_prefixes[i] += 1
 
-                            if n_prefixes[i] >= len(ancestor_name_stacks[i]):
+                            if n_prefixes[i] >= max_prefixes:
+                                self._all_fields = None
                                 raise RuntimeError(
-                                    "Ran out of prefixes to add, but names are still not unique."
+                                    "Reached maximum number of prefixes, but names are still not unique."
                                 )
 
                             new_names[i] = _generate_fieldname(

{uproot-5.7.2 → uproot-5.7.3}/src/uproot/models/TMatrixT.py

@@ -8,6 +8,7 @@ from __future__ import annotations
 
 import struct
 
+import awkward
 import numpy
 
 import uproot
@@ -56,6 +57,35 @@ class Model_TMatrixTSym_3c_double_3e__v5(uproot.model.VersionedModel):
         )
         self._num_bytes += self._members["fElements"].nbytes
 
+    @classmethod
+    def awkward_form(cls, file, context):
+        return awkward.forms.RecordForm(
+            [
+                awkward.forms.NumpyForm("int32"),
+                awkward.forms.NumpyForm("int32"),
+                awkward.forms.NumpyForm("int32"),
+                awkward.forms.NumpyForm("int32"),
+                awkward.forms.NumpyForm("uint32"),
+                awkward.forms.NumpyForm("int32"),
+                awkward.forms.NumpyForm("float64"),
+                awkward.forms.ListOffsetForm(
+                    context["index_format"],
+                    awkward.forms.NumpyForm("float64"),
+                ),
+            ],
+            [
+                "fNrows",
+                "fNcols",
+                "fRowLwb",
+                "fColLwb",
+                "fNelems",
+                "fNrowIndex",
+                "fTol",
+                "fElements",
+            ],
+            parameters={"__record__": "TMatrixTSym<double>"},
+        )
+
     _format0 = struct.Struct(">iiiiiid")
     _format_memberwise0 = struct.Struct(">i")
     _format_memberwise1 = struct.Struct(">i")

{uproot-5.7.2 → uproot-5.7.3}/src/uproot/models/TTree.py

@@ -960,15 +960,8 @@ def num_entries(paths):
     """
     paths2 = uproot._util.regularize_files(paths, steps_allowed=False)
 
-    if isinstance(paths, dict):
-        paths = list(paths.items())
-    elif not isinstance(paths, str):
-        paths = [(uproot._util.file_object_path_split(path)) for path in paths]
-    else:
-        paths = [uproot._util.file_object_path_split(paths)]
-
-    for i, (file_path, object_path) in enumerate(paths2):
+    for file_path, object_path in paths2:
         with uproot.open(
             {file_path: object_path}, custom_classes={"TTree": Model_TTree_NumEntries}
         ) as f:
-            yield paths[i][0], paths[i][1], f.all_members["fEntries"][0]
+            yield file_path, object_path, f.all_members["fEntries"][0]

uproot-5.7.3/src/uproot/version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '5.7.3'
+__version_tuple__ = version_tuple = (5, 7, 3)
+
+__commit_id__ = commit_id = None

{uproot-5.7.2 → uproot-5.7.3}/src/uproot/writing/_cascade.py

@@ -474,6 +474,7 @@ class FreeSegmentsData(CascadeLeaf):
     def slices(self, value):
         if self._slices != value:
             self._file_dirty = True
+            self._allocation = None
             self._slices = value
 
     @property
@@ -484,6 +485,7 @@ class FreeSegmentsData(CascadeLeaf):
     def end(self, value):
         if self._end != value:
             self._file_dirty = True
+            self._allocation = None
             self._end = value
 
     @property

{uproot-5.7.2 → uproot-5.7.3}/src/uproot/writing/writable.py

@@ -1237,6 +1237,7 @@ class WritableDirectory(MutableMapping):
                     self._file.uuid_function(),
                 ),
             )
+            self._subdirs[head] = directory
 
         elif key.classname.string not in ("TDirectory", "TDirectoryFile"):
             raise TypeError(
@@ -2234,9 +2235,39 @@ def _is_type_specification(obj):
             else:
                 return False
         if not isinstance(
-            obj, (numpy.dtype, awkward.types.Type, awkward.types.ArrayType, str, type)
+            obj,
+            (
+                numpy.dtype,
+                awkward.types.Type,
+                awkward.types.ArrayType,
+                type,
+                str,
+                tuple,
+            ),
         ):
             return False
+        # for tuples and strings we need to make sure they actually specify a type and are not just data
+        if isinstance(obj, tuple):
+            try:
+                numpy.dtype(obj)
+            except (TypeError, ValueError):
+                return False
+            else:
+                continue
+        if isinstance(obj, str):
+            try:
+                numpy.dtype(obj)
+            except (TypeError, ValueError):
+                pass
+            else:
+                continue
+            try:
+                awkward.types.from_datashape(obj, highlevel=False)
+            except Exception:
+                pass
+            else:
+                continue
+            return False
     return True
 
 
@@ -2245,12 +2276,45 @@ def _type_specification_to_awkward_form(obj):
         return obj
     if isinstance(obj, (awkward.types.Type, awkward.types.ArrayType)):
         return awkward.forms.from_type(obj)
-    if isinstance(obj, (numpy.dtype, type)):
-        obj = str(numpy.dtype(obj))
+    if isinstance(obj, type):
+        obj = numpy.dtype(obj)
+        if obj == numpy.dtype("O"):
+            raise TypeError(f"Cannot construct a NumPy dtype from {obj!r}.")
+    if isinstance(obj, tuple):
+        try:
+            obj = numpy.dtype(obj)
+        except (TypeError, ValueError):
+            raise TypeError(
+                f"Cannot construct a NumPy dtype from the tuple {obj!r}."
+            ) from None
     if isinstance(obj, str):
-        return awkward.forms.from_type(
-            awkward.types.from_datashape(obj, highlevel=False)
-        )
+        # First we try to interpret the string as a NumPy dtype
+        # so we can try to convert it to a string Awkward understands
+        try:
+            dt = numpy.dtype(obj)
+        except (TypeError, ValueError):
+            pass
+        else:
+            obj = dt
+    if isinstance(obj, numpy.dtype):
+        obj = obj.newbyteorder("<")
+        if obj.subdtype is None:
+            field_shape = ()
+        else:
+            obj, field_shape = obj.subdtype
+        dims = ""
+        if len(field_shape) > 0:
+            dims = dims + "".join(str(x) + " * " for x in field_shape)
+        obj = f"{dims}{obj}"
+    if isinstance(obj, str):
+        try:
+            return awkward.forms.from_type(
+                awkward.types.from_datashape(obj, highlevel=False)
+            )
+        except Exception:
+            raise TypeError(
+                f"Cannot construct an Awkward Form from type specification {obj!r}"
+            ) from None
     if isinstance(obj, Mapping):
         return awkward.forms.RecordForm(
             [_type_specification_to_awkward_form(v) for v in obj.values()],
@@ -2258,7 +2322,7 @@ def _type_specification_to_awkward_form(obj):
         )
     raise TypeError(
         f"Cannot construct an Awkward Form from {type(obj).__name__}. "
-        f"Supported types: Form, Type, ArrayType, dtype, str, Mapping"
+        f"Supported types: Form, Type, ArrayType, dtype, Mapping, str, tuple."
     )
 
 

{uproot-5.7.2 → uproot-5.7.3}/tests/test_0043_iterate_function.py

@@ -9,27 +9,27 @@ import uproot
 
 def test_num_entries_for():
     with uproot.open(skhep_testdata.data_path("uproot-HZZ.root"))["events"] as events:
-        assert events.num_entries_for("1 kB") == 12
-        assert events.num_entries_for("10 kB") == 116
-        assert events.num_entries_for("0.1 MB") == 1157
+        assert events.num_entries_for("1 kB") == 4
+        assert events.num_entries_for("10 kB") == 37
+        assert events.num_entries_for("0.1 MB") == 372
         assert events.num_entries == 2421
 
 
 def test_num_entries_for_2():
     with uproot.open(skhep_testdata.data_path("uproot-Zmumu.root"))["events"] as events:
-        assert events.num_entries_for("1 kB") == 13
-        assert events.num_entries_for("10 kB") == 133
-        assert events.num_entries_for("0.1 MB") == 1333
+        assert events.num_entries_for("1 kB") == 7
+        assert events.num_entries_for("10 kB") == 70
+        assert events.num_entries_for("0.1 MB") == 696
         assert events.num_entries == 2304
 
 
 def test_iterate_1():
     with uproot.open(skhep_testdata.data_path("uproot-Zmumu.root"))["events"] as events:
         for i, arrays in enumerate(events.iterate(step_size="0.1 MB", library="np")):
-            if i == 0:
-                assert len(arrays["px1"]) == 1333
-            elif i == 1:
-                assert len(arrays["px1"]) == 971
+            if i in range(3):
+                assert len(arrays["px1"]) == 696
+            elif i == 3:
+                assert len(arrays["px1"]) == 216
             else:
                 assert False
 

uproot-5.7.3/tests/test_0578_dask_for_numpy.py

@@ -0,0 +1,100 @@
+# BSD 3-Clause License; see https://github.com/scikit-hep/uproot5/blob/main/LICENSE
+
+import numpy
+import pytest
+import skhep_testdata
+
+import uproot
+
+dask = pytest.importorskip("dask")
+da = pytest.importorskip("dask.array")
+
+
+def test_single_dask_array():
+    test_path = skhep_testdata.data_path("uproot-Zmumu.root") + ":events"
+    ttree = uproot.open(test_path)
+
+    np_arrays = ttree.arrays(library="np")
+    dask_arrays = uproot.dask(test_path, library="np")
+
+    assert list(dask_arrays.keys()) == list(
+        np_arrays.keys()
+    ), "Different keys detected in dictionary of dask arrays and dictionary of numpy arrays"
+
+    for key in np_arrays.keys():
+        comp = dask_arrays[key].compute() == np_arrays[key]
+        assert comp.all(), f"Incorrect array at key {key}"
+
+
+def test_dask_concatenation():
+    test_path1 = skhep_testdata.data_path("uproot-Zmumu.root") + ":events"
+    test_path2 = skhep_testdata.data_path("uproot-Zmumu-uncompressed.root") + ":events"
+    test_path3 = skhep_testdata.data_path("uproot-Zmumu-zlib.root") + ":events"
+    test_path4 = skhep_testdata.data_path("uproot-Zmumu-lzma.root") + ":events"
+
+    np_arrays = uproot.concatenate(
+        [test_path1, test_path2, test_path3, test_path4], library="np"
+    )
+    dask_arrays = uproot.dask(
+        [test_path1, test_path2, test_path3, test_path4], library="np"
+    )
+
+    assert list(dask_arrays.keys()) == list(
+        np_arrays.keys()
+    ), "Different keys detected in dictionary of dask arrays and dictionary of numpy arrays"
+
+    for key in np_arrays.keys():
+        comp = dask_arrays[key].compute() == np_arrays[key]
+        assert comp.all(), f"Incorrect array at key {key}"
+
+
+def test_multidim_array():
+    test_path = (
+        skhep_testdata.data_path("uproot-sample-6.08.04-uncompressed.root") + ":sample"
+    )
+    ttree = uproot.open(test_path)
+
+    np_arrays = ttree.arrays(library="np")
+    dask_arrays = uproot.dask(test_path, library="np")
+
+    assert list(dask_arrays.keys()) == list(
+        np_arrays.keys()
+    ), "Different keys detected in dictionary of dask arrays and dictionary of numpy arrays"
+
+    comp = dask_arrays["ab"].compute() == np_arrays["ab"]
+    assert comp.all(), "Incorrect array at key {}".format("ab")
+
+
+def test_chunking_single_num():
+    filename1 = skhep_testdata.data_path("uproot-Zmumu.root") + ":events"
+    assert uproot.dask(filename1, step_size=30, library="np")["px1"].chunks == (
+        (30,) * 76 + (24,),
+    )
+
+
+def test_chunking_single_string():
+    dask = pytest.importorskip("dask")
+    da = pytest.importorskip("dask.array")
+    filename1 = skhep_testdata.data_path("uproot-Zmumu.root") + ":events"
+    print(uproot.dask(filename1, step_size="500B", library="np")["px1"].chunks)
+    assert uproot.dask(filename1, step_size="500B", library="np")["px1"].chunks == (
+        (3,) * 768,
+    )
+
+
+def test_chunking_multiple_num():
+    filename1 = skhep_testdata.data_path("uproot-Zmumu.root") + ":events"
+    filename2 = skhep_testdata.data_path("uproot-Zmumu-uncompressed.root") + ":events"
+    assert uproot.dask([filename1, filename2], step_size=30, library="np")[
+        "px1"
+    ].chunks == (
+        (30,) * 76 + (24,) + (30,) * 76 + (24,),
+    )
+
+
+def test_chunking_multiple_string():
+    filename1 = skhep_testdata.data_path("uproot-Zmumu.root") + ":events"
+    filename2 = skhep_testdata.data_path("uproot-Zmumu-uncompressed.root") + ":events"
+    assert uproot.dask([filename1, filename2], step_size="500B", library="np")[
+        "px1"
+    ].chunks == ((3,) * 1536,)

{uproot-5.7.2 → uproot-5.7.3}/tests/test_0652_dask_for_awkward.py

@@ -56,7 +56,7 @@ def test_chunking_single_num():
 
 def test_chunking_single_string():
     test_path = skhep_testdata.data_path("uproot-Zmumu.root") + ":events"
-    assert uproot.dask(test_path, step_size="500B", library="ak").npartitions == 330
+    assert uproot.dask(test_path, step_size="500B", library="ak").npartitions == 768
 
 
 def test_chunking_multiple_num():
@@ -73,7 +73,7 @@ def test_chunking_multiple_string():
     filename2 = skhep_testdata.data_path("uproot-Zmumu-uncompressed.root") + ":events"
     assert (
         uproot.dask([filename1, filename2], step_size="500B", library="ak").npartitions
-        == 922
+        == 1536
     )
 
 

{uproot-5.7.2 → uproot-5.7.3}/tests/test_1250_rntuple_improvements.py

@@ -63,15 +63,15 @@ def test_iterate():
 
         for i, arrays in enumerate(obj.iterate(step_size="10 kB")):
             if i == 0:
-                assert len(arrays) == 384
+                assert len(arrays) == 158
                 expected_pt = [10.763696670532227, 15.736522674560547]
                 expected_charge = [-1, -1]
                 assert arrays["Muon_pt"][0].tolist() == expected_pt
                 assert arrays["Muon_charge"][0].tolist() == expected_charge
-            elif i == 1:
-                assert len(arrays) == 384
-            elif i == 2:
-                assert len(arrays) == 232
+            elif i in range(1, 6):
+                assert len(arrays) == 158
+            elif i == 6:
+                assert len(arrays) == 52
             else:
                 assert False
 
@@ -84,10 +84,12 @@ def test_iterate():
 
         for i, arrays in enumerate(Muon_pt.iterate(step_size="5 kB")):
             if i == 0:
-                assert len(arrays) == 611
+                assert len(arrays) == 286
                 expected_pt = [10.763696670532227, 15.736522674560547]
                 assert arrays["Muon_pt"][0].tolist() == expected_pt
-            elif i == 1:
-                assert len(arrays) == 389
+            elif i in (1, 2):
+                assert len(arrays) == 286
+            elif i == 3:
+                assert len(arrays) == 142
             else:
                 assert False

uproot-5.7.3/tests/test_1599_mktree_mkrntuple_with_subdir.py

@@ -0,0 +1,59 @@
+# BSD 3-Clause License; see https://github.com/scikit-hep/uproot5/blob/main/LICENSE
+
+import os
+
+import uproot
+
+
+def test_mktree_repeated_same_subdir(tmp_path):
+    newfile = os.path.join(tmp_path, "newfile.root")
+
+    with uproot.recreate(newfile) as f:
+        f.mktree("tree/x", {"x": [1, 2, 3]})
+        f.mktree("tree/y", {"x": [1, 2, 3]})
+        f.mktree("tree/z", {"x": [1, 2, 3]})
+        f.mktree("tree/w", {"x": [1, 2, 3]})
+
+        assert set(f.keys(cycle=False)) == {
+            "tree",
+            "tree/x",
+            "tree/y",
+            "tree/z",
+            "tree/w",
+        }
+
+    with uproot.open(newfile) as fin:
+        assert set(fin.keys(cycle=False)) == {
+            "tree",
+            "tree/x",
+            "tree/y",
+            "tree/z",
+            "tree/w",
+        }
+
+
+def test_mkrntuple_repeated_same_subdir(tmp_path):
+    newfile = os.path.join(tmp_path, "newfile.root")
+
+    with uproot.recreate(newfile) as f:
+        f.mkrntuple("ntpl/x", {"x": [1, 2, 3]})
+        f.mkrntuple("ntpl/y", {"x": [1, 2, 3]})
+        f.mkrntuple("ntpl/z", {"x": [1, 2, 3]})
+        f.mkrntuple("ntpl/w", {"x": [1, 2, 3]})
+
+        assert set(f.keys(cycle=False)) == {
+            "ntpl",
+            "ntpl/x",
+            "ntpl/y",
+            "ntpl/z",
+            "ntpl/w",
+        }
+
+    with uproot.open(newfile) as fin:
+        assert set(fin.keys(cycle=False)) == {
+            "ntpl",
+            "ntpl/x",
+            "ntpl/y",
+            "ntpl/z",
+            "ntpl/w",
+        }