uproot 5.6.0__tar.gz → 5.6.2__tar.gz

uproot-5.6.2/.github/workflows/build-distributions.yml

@@ -0,0 +1,17 @@
+name: Build sdist and wheel
+
+on:
+  # Run on demand with workflow dispatch
+  workflow_dispatch:
+  # Use from other workflows
+  workflow_call:
+
+jobs:
+  dist:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: hynek/build-and-inspect-python-package@v2

{uproot-5.6.0 → uproot-5.6.2}/.github/workflows/build-test.yml

@@ -29,26 +29,28 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Get conda
-        uses: conda-incubator/setup-miniconda@v3
+      - name: Get micromamba
+        uses: mamba-org/setup-micromamba@v2
         with:
-          auto-update-conda: true
-          python-version: ${{ matrix.python-version }}
-          miniforge-version: latest
-          use-mamba: true
+          environment-name: test-env
+          init-shell: bash
+          create-args: >-
+            python=${{ matrix.python-version }}
+
+      - uses: astral-sh/setup-uv@v6
 
       - name: Check active Python version
         run: python -c "import sys; assert '.'.join(str(s) for s in sys.version_info[:2]) == '${{ matrix.python-version }}', f'{version} incorrect!'"
 
       - name: Install ROOT
-        if: matrix.python-version == 3.9  &&  runner.os != 'macOS'  &&  runner.os != 'Windows'
+        if: matrix.python-version == 3.9  &&  runner.os == 'Linux'
         run: |
-          conda env list
-          mamba install root
-          conda list
+          micromamba env list
+          micromamba install root
+          micromamba list
 
       - name: Install sshd for fsspec ssh tests
-        if: runner.os != 'macOS' && runner.os != 'Windows'
+        if: runner.os == 'Linux'
         run: |
           sudo apt-get install -y openssh-server
           sudo service ssh restart
@@ -61,12 +63,12 @@ jobs:
       - name: Install XRootD
         if: runner.os != 'Windows'
         run: |
-          conda env list
-          mamba install xrootd
-          conda list
+          micromamba env list
+          micromamba install xrootd
+          micromamba list
 
       - name: Pip install the package
-        run: python -m pip install .[test,dev]
+        run: uv pip install --system -e. --group=dev
 
       - name: Run pytest
         run: |
@@ -90,10 +92,10 @@ jobs:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
 
-      - uses: astral-sh/setup-uv@v5
+      - uses: astral-sh/setup-uv@v6
 
       - name: Pip install the package
-        run: uv pip install --system .[test,dev]
+        run: uv pip install --system -e. --group=dev
 
       - name: Run pytest
         run: |
@@ -116,19 +118,23 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - uses: astral-sh/setup-uv@v6
+
       - name: Pip install the package
-        run: python -m pip install 'numpy<2' .[test]
+        run: |
+          uv venv
+          uv pip install -e. 'numpy<2' --group test
 
       - name: Run pytest
         run: |
-          python -m pytest -vv tests --reruns 10 --reruns-delay 30 --only-rerun "(?i)http|ssl|timeout|expired|connection|socket"
+          uv run --no-sync pytest -vv tests --reruns 10 --reruns-delay 30 --only-rerun "(?i)http|ssl|timeout|expired|connection|socket"
 
   pyodide-build:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     env:
-      PYODIDE_VERSION: 0.27.3
-      PYODIDE_BUILD_VERSION: 0.29.3
+      PYODIDE_VERSION: 0.27.5
+      PYODIDE_BUILD_VERSION: 0.30.0
       AWKWARD_VERSION: v2.7.4
 
     steps:
@@ -140,6 +146,8 @@ jobs:
         with:
           python-version: '3.12'
 
+      - uses: astral-sh/setup-uv@v6
+
       - name: Install pyodide-build
         run: python3 -m pip install pyodide-build==$PYODIDE_BUILD_VERSION
 
@@ -176,11 +184,11 @@ jobs:
         with:
           runner: selenium
           browser: chrome
-          browser-version: latest
+          browser-version: 1446681
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install dependencies
-        run: pip install .[test-pyodide] pyodide-py==$PYODIDE_VERSION
+        run: uv pip install --system -e. --group=test-pyodide pyodide-py==$PYODIDE_VERSION
 
       - name: Run pytest
         run: |

{uproot-5.6.0 → uproot-5.6.2}/.github/workflows/deploy.yml

@@ -31,14 +31,14 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: distribution-artifact
+          name: Packages
           path: dist
 
       - name: List distributions to be deployed
         run: ls -lha dist/
 
       - name: Generate artifact attestation for sdist and wheel
-        uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
+        uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0
         with:
           subject-path: dist/uproot-*
 

{uproot-5.6.0 → uproot-5.6.2}/.github/workflows/upload-nightly-wheels.yml

@@ -26,14 +26,14 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: distribution-artifact
+          name: Packages
           path: dist
 
       - name: List wheel to be deployed
         run: ls -lha dist/*.whl
 
       - name: Upload wheel to Anaconda Cloud as nightly
-        uses: scientific-python/upload-nightly-action@82396a2ed4269ba06c6b2988bb4fd568ef3c3d6b # 0.6.1
+        uses: scientific-python/upload-nightly-action@b36e8c0c10dbcfd2e05bf95f17ef8c14fd708dbf # 0.6.2
         with:
           artifacts_path: dist
           anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }}

{uproot-5.6.0 → uproot-5.6.2}/.pre-commit-config.yaml

@@ -23,7 +23,7 @@ repos:
       - id: black
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.9
+    rev: v0.11.9
     hooks:
       - id: ruff
         args: [--fix, --show-fixes]

uproot-5.6.2/CONTRIBUTING.md

@@ -0,0 +1,155 @@
+# Contributing to uproot
+
+Thank you for your interest in contributing to **uproot**! uproot is a community-driven project, and we welcome contributions of all kinds, including bug reports, feature requests, documentation improvements, and code contributions.
+
+This guide will help you get started with contributing.
+
+---
+
+## 🚀 Quick Start
+
+1. **Fork** the repository on GitHub.
+2. **Clone** your fork locally:
+   ```bash
+   git clone git@github.com:YOUR_USERNAME/uproot5.git
+   cd uproot
+   ```
+
+3. **Set up the development environment**:
+
+   We recommend using a conda environment. You can reproduce the full developer environment with:
+
+   ```bash
+   conda create -n uproot-py313 python=3.13
+   conda activate uproot-py313
+
+   # Add conda-forge channel and prioritize it
+   conda config --add channels conda-forge
+   conda config --set channel_priority strict
+
+   # Install dependencies
+   conda install xrootd
+   conda install root
+   conda install pandas
+   conda install dask
+   conda install minio
+
+   # pip-only dependencies
+   pip install scikit-hep-testdata
+   pip install rangehttpserver
+   pip install boost_histogram
+   pip install hist
+   pip install dask_awkward
+   pip install awkward-pandas
+   pip install pytest-timeout
+   pip install fsspec-xrootd
+   pip install uv
+
+   # Run local HTTP server (if needed for test data)
+   python -m RangeHTTPServer
+   ```
+
+4. **Install Uproot in editable mode**:
+   ```bash
+   uv pip install -e. --group=dev
+   ```
+
+---
+
+## 🌿 Branching and Naming Conventions
+
+- Always work on a **feature branch**:
+  ```bash
+  git checkout -b YOUR_USERNAME/my-cool-feature
+  ```
+- Use descriptive names, such as:
+  - `fix_streamer-parsing`
+  - `feature_custom-interpretation-api`
+  - `docs_improve-tutorials`
+
+---
+
+## 🎨 Code Style
+
+- Use **pre-commit** for automatic linting, style issues, and formatting:
+  ```bash
+  pre-commit run --all
+
+---
+
+## ✅ Running Tests
+
+Uproot uses **pytest** for testing.
+
+To run the full test suite:
+```bash
+python -m pytest tests -ss -vv
+```
+
+To run a specific test module:
+```bash
+pytest tests/test_my_module.py
+```
+
+Some tests may depend on having ROOT or XRootD installed. These are covered in the environment setup.
+
+---
+
+## 🔃 Submitting a Pull Request
+
+1. Make sure all tests pass and your code is cleanly formatted.
+2. Push your changes to your fork:
+   ```bash
+   git push origin YOUR_USERNAME/my-cool-feature
+   ```
+3. Open a pull request (PR) from your fork to the `main` branch of [scikit-hep/uproot](https://github.com/scikit-hep/uproot).
+4. Fill in the PR template and explain what you did and why.
+5. Be responsive to feedback from reviewers—we’re all here to help!
+
+---
+
+## 🐛 Reporting Bugs
+
+1. Check if the bug is already reported on the [issue tracker](https://github.com/scikit-hep/uproot/issues).
+2. If not, [open a new issue](https://github.com/scikit-hep/uproot/issues/new/choose) and provide:
+   - A minimal reproducible example
+   - Expected vs. actual behavior
+   - Version info (`python -m uproot --version`)
+   - Any relevant stack trace or logs
+
+---
+
+## 💡 Requesting Features
+
+1. Search the issues to see if a similar feature has been discussed.
+2. If not, open a **Feature Request** issue and describe:
+   - What problem the feature solves
+   - A suggested implementation or interface (if applicable)
+   - Any related prior art in other libraries or experiments
+
+---
+
+## 📚 Improving Documentation
+
+Documentation lives in the `docs-sphinx/` folder and is built using **Sphinx**. To build locally
+make sure you have Sphinx and the ReadTheDocs theme installed in your virtualenv:
+```bash
+pip install sphinx sphinx-rtd-theme
+```
+Navigate to your docs folder and invoke the Sphinx builder to produce HTML in the _build/html directory:
+```
+cd docs-sphinx
+sphinx-build -b html . _build/html
+```
+Once it finishes, open:
+```
+open _build/html/index.html
+```
+
+You can also suggest improvements to examples, tutorials, and API references.
+
+---
+
+## 🙌 Thanks!
+
+uproot thrives on its community. Whether you're fixing a typo, contributing a feature, or suggesting a design—you're making a difference!

{uproot-5.6.0 → uproot-5.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uproot
-Version: 5.6.0
+Version: 5.6.2
 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
@@ -37,36 +37,10 @@ Requires-Dist: numpy
 Requires-Dist: packaging
 Requires-Dist: typing-extensions>=4.1.0; python_version < '3.11'
 Requires-Dist: xxhash
-Provides-Extra: dev
-Requires-Dist: awkward-pandas; extra == 'dev'
-Requires-Dist: boost-histogram>=0.13; extra == 'dev'
-Requires-Dist: dask-awkward>=2025.2.0; extra == 'dev'
-Requires-Dist: dask[array,distributed]; extra == 'dev'
-Requires-Dist: hist>=1.2; extra == 'dev'
-Requires-Dist: pandas; extra == 'dev'
 Provides-Extra: http
 Requires-Dist: aiohttp; extra == 'http'
 Provides-Extra: s3
 Requires-Dist: s3fs; extra == 's3'
-Provides-Extra: test
-Requires-Dist: aiohttp; extra == 'test'
-Requires-Dist: deflate; extra == 'test'
-Requires-Dist: fsspec-xrootd>=0.5.0; extra == 'test'
-Requires-Dist: isal; extra == 'test'
-Requires-Dist: minio; extra == 'test'
-Requires-Dist: paramiko; extra == 'test'
-Requires-Dist: pytest-rerunfailures; extra == 'test'
-Requires-Dist: pytest-timeout; extra == 'test'
-Requires-Dist: pytest>=6; extra == 'test'
-Requires-Dist: rangehttpserver; extra == 'test'
-Requires-Dist: requests; extra == 'test'
-Requires-Dist: s3fs; extra == 'test'
-Requires-Dist: scikit-hep-testdata; extra == 'test'
-Provides-Extra: test-pyodide
-Requires-Dist: pytest-pyodide; extra == 'test-pyodide'
-Requires-Dist: pytest-timeout; extra == 'test-pyodide'
-Requires-Dist: pytest>=6; extra == 'test-pyodide'
-Requires-Dist: scikit-hep-testdata; extra == 'test-pyodide'
 Provides-Extra: xrootd
 Requires-Dist: fsspec-xrootd>=0.5.0; extra == 'xrootd'
 Description-Content-Type: text/markdown

{uproot-5.6.0 → uproot-5.6.2}/pyproject.toml

@@ -5,6 +5,42 @@ requires = [
   "hatch-vcs"
 ]
 
+[dependency-groups]
+dev = [
+  {include-group = "extra"},
+  {include-group = "test"}
+]
+extra = [
+  "boost_histogram>=0.13",
+  "dask-awkward>=2025.5.0",
+  "dask[array,distributed]",
+  "hist>=1.2",
+  "pandas",
+  "awkward-pandas"
+]
+test = [
+  "aiohttp",
+  "deflate",
+  "fsspec-xrootd>=0.5.0",
+  "isal",
+  "minio",
+  "paramiko",
+  "pytest-rerunfailures",
+  "rangehttpserver",
+  "requests",
+  "s3fs",
+  {include-group = "test-core"}
+]
+test-core = [
+  "pytest-timeout",
+  "pytest>=6",
+  "scikit-hep-testdata"
+]
+test-pyodide = [
+  "pytest-pyodide; python_version >='3.11'",
+  {include-group = "test-core"}
+]
+
 [lint.mccabe]
 max-complexity = 100
 
@@ -43,7 +79,7 @@ dependencies = [
   "numpy",
   "fsspec",
   "packaging",
-  "typing_extensions>=4.1.0; python_version < \"3.11\""
+  "typing_extensions>=4.1.0; python_version < '3.11'"
 ]
 description = "ROOT I/O in pure Python and NumPy."
 dynamic = [
@@ -55,37 +91,8 @@ readme = "README.md"
 requires-python = ">=3.9"
 
 [project.optional-dependencies]
-dev = [
-  "boost_histogram>=0.13",
-  "dask-awkward>=2025.2.0",
-  "dask[array,distributed]",
-  "hist>=1.2",
-  "pandas",
-  "awkward-pandas"
-]
 http = ["aiohttp"]
 s3 = ["s3fs"]
-test = [
-  "isal",
-  "deflate",
-  "minio",
-  "aiohttp",
-  "fsspec-xrootd>=0.5.0",
-  "s3fs",
-  "paramiko",
-  "pytest>=6",
-  "pytest-timeout",
-  "pytest-rerunfailures",
-  "requests",
-  "scikit-hep-testdata",
-  "rangehttpserver"
-]
-test-pyodide = [
-  "pytest>=6",
-  "pytest-pyodide",
-  "pytest-timeout",
-  "scikit-hep-testdata"
-]
 xrootd = ["fsspec-xrootd>=0.5.0"]
 
 [project.urls]

{uproot-5.6.0 → uproot-5.6.2}/src/uproot/_dask.py

@@ -20,6 +20,10 @@ import numpy
 
 import uproot
 from uproot._util import no_filter, unset
+from uproot.behaviors.RNTuple import HasFields
+from uproot.behaviors.RNTuple import (
+    _regularize_step_size as _RNTuple_regularize_step_size,
+)
 from uproot.behaviors.TBranch import HasBranches, TBranch, _regularize_step_size
 
 if TYPE_CHECKING:
@@ -616,7 +620,13 @@ def _get_dask_array(
                 recursive=recursive,
                 filter_name=filter_name,
                 filter_typename=filter_typename,
-                filter_branch=real_filter_branch,
+                **{
+                    (
+                        "filter_field"
+                        if isinstance(obj, HasFields)
+                        else "filter_branch"
+                    ): real_filter_branch
+                },
                 full_paths=full_paths,
                 ignore_duplicates=True,
             )
@@ -632,9 +642,7 @@ def _get_dask_array(
         assert steps_per_file is not unset  # either assigned or assumed to be 1
         total_files = len(ttrees)
         total_entries = sum(ttree.num_entries for ttree in ttrees)
-        step_size = max(
-            1, int(math.ceil(total_entries / (total_files * steps_per_file)))
-        )
+        step_size = max(1, math.ceil(total_entries / (total_files * steps_per_file)))
 
     if count == 0:
         raise ValueError(
@@ -672,7 +680,7 @@ def _get_dask_array(
         )
         step_sum += int(ttree_step)
 
-    entry_step = int(round(step_sum / len(ttrees)))
+    entry_step = round(step_sum / len(ttrees))
     assert entry_step >= 1
 
     for key in common_keys:
@@ -758,7 +766,11 @@ def _get_dask_array_delay_open(
         recursive=recursive,
         filter_name=filter_name,
         filter_typename=filter_typename,
-        filter_branch=filter_branch,
+        **{
+            (
+                "filter_field" if isinstance(obj, HasFields) else "filter_branch"
+            ): filter_branch
+        },
         full_paths=full_paths,
         ignore_duplicates=True,
     )
@@ -927,6 +939,13 @@ class TrivialFormMappingInfo(ImplementsFormMappingInfo):
             how=tuple,
         )
 
+        if isinstance(tree, HasFields):
+            # Temporary workaround to have basic support for RNTuple
+            # This is needed since currently arrays only has top-level fields
+            # TODO: Ask people how they want this handled since the previous
+            # approach might not make sense for RNTuples
+            keys = [f for f in tree.field_names if f in keys]
+
         awkward = uproot.extras.awkward()
 
         # The subform generated by awkward.to_buffers() has different form keys
@@ -1474,7 +1493,13 @@ def _get_dak_array(
                 recursive=recursive,
                 filter_name=filter_name,
                 filter_typename=filter_typename,
-                filter_branch=real_filter_branch,
+                **{
+                    (
+                        "filter_field"
+                        if isinstance(obj, HasFields)
+                        else "filter_branch"
+                    ): real_filter_branch
+                },
                 full_paths=full_paths,
                 ignore_duplicates=True,
             )
@@ -1490,9 +1515,7 @@ def _get_dak_array(
         assert steps_per_file is not unset  # either assigned or assumed to be 1
         total_files = len(ttrees)
         total_entries = sum(ttree.num_entries for ttree in ttrees)
-        step_size = max(
-            1, int(math.ceil(total_entries / (total_files * steps_per_file)))
-        )
+        step_size = max(1, math.ceil(total_entries / (total_files * steps_per_file)))
 
     if count == 0:
         raise ValueError(
@@ -1519,16 +1542,23 @@ def _get_dak_array(
         entry_start = 0
         entry_stop = ttree.num_entries
 
-        branchid_interpretation = {}
-        for key in common_keys:
-            branch = ttree[key]
-            branchid_interpretation[branch.cache_key] = branch.interpretation
-        ttree_step = _regularize_step_size(
-            ttree, step_size, entry_start, entry_stop, branchid_interpretation
-        )
-        step_sum += int(ttree_step)
+        if isinstance(ttree, HasFields):
+            akform = ttree.to_akform(filter_name=common_keys)
+            ttree_step = _RNTuple_regularize_step_size(
+                ttree, akform, step_size, entry_start, entry_stop
+            )
+            step_sum += int(ttree_step)
+        else:
+            branchid_interpretation = {}
+            for key in common_keys:
+                branch = ttree[key]
+                branchid_interpretation[branch.cache_key] = branch.interpretation
+            ttree_step = _regularize_step_size(
+                ttree, step_size, entry_start, entry_stop, branchid_interpretation
+            )
+            step_sum += int(ttree_step)
 
-    entry_step = int(round(step_sum / len(ttrees)))
+    entry_step = round(step_sum / len(ttrees))
 
     divisions = [0]
     partition_args = []
@@ -1562,9 +1592,12 @@ which has {entry_stop} entries"""
                     divisions.append(divisions[-1] + length)
                     partition_args.append((i, start, stop))
 
-    base_form = _get_ttree_form(
-        awkward, ttrees[0], common_keys, interp_options.get("ak_add_doc")
-    )
+    if isinstance(ttrees[0], HasFields):
+        base_form = ttrees[0].to_akform(filter_name=common_keys)
+    else:
+        base_form = _get_ttree_form(
+            awkward, ttrees[0], common_keys, interp_options.get("ak_add_doc")
+        )
 
     if len(partition_args) == 0:
         divisions.append(0)
@@ -1632,7 +1665,11 @@ def _get_dak_array_delay_open(
             recursive=recursive,
             filter_name=filter_name,
             filter_typename=filter_typename,
-            filter_branch=filter_branch,
+            **{
+                (
+                    "filter_field" if isinstance(obj, HasFields) else "filter_branch"
+                ): filter_branch
+            },
             full_paths=full_paths,
             ignore_duplicates=True,
         )