Merge remote-tracking branch 'origin/main' into emscripten-ci

* origin/main: (41 commits)
  chore: hatch-vcs generates 'version.py'; add it to .gitignore
  docs: add bnavigator as a contributor for test (#1087)
  feat: support for writing hist derived profiles (#1000)
  feat: add the ability to read RNTuple alias columns (#1004)
  chore: update pre-commit hooks (#1082)
  docs: fix ReadTheDocs documentation (#1084)
  chore: update pre-commit hooks (#1073)
  chore(deps): bump actions/upload-artifact from 3 to 4 (#1071)
  chore(deps): bump actions/download-artifact from 3 to 4 (#1072)
  build: change build to autogen version info (#1062)
  chore: remove src/uproot/version.py (for #1062).
  The next release will be 5.2.1.
  add known_base_form option so that opening root files can be avoided for mature analyses (#1077)
  test: fsspec cache (#1075)
  test: xrootd server fixture (#1076)
  The next release will be 5.2.0.
  fix: correct typo in fsspec globbing (#1067)
  chore(deps): bump actions/setup-python from 4 to 5 (#1059)
  The next release will be 5.2.0rc5.
  fix: dask distributed fsspec issue (#1065)
  ...

.all-contributorsrc

@@ -515,6 +515,24 @@
       "contributions": [
         "test"
       ]
+    },
+    {
+      "login": "HaarigerHarald",
+      "name": "HaarigerHarald",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8050292?v=4",
+      "profile": "https://github.com/HaarigerHarald",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "bnavigator",
+      "name": "Ben Greiner",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4623504?v=4",
+      "profile": "https://github.com/bnavigator",
+      "contributions": [
+        "test"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/build-test.yml

@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Get conda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
@@ -67,7 +67,7 @@ jobs:
 
       - name: Run pytest
         run: |
-          python -m pytest -vv tests --reruns 3 --reruns-delay 30 --only-rerun "(?i)http|timeout|connection"
+          python -m pytest -vv tests --reruns 10 --reruns-delay 30 --only-rerun "(?i)http|ssl|timeout|expired|connection|socket"
 
   vanilla-build:
     strategy:
@@ -82,7 +82,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -91,4 +91,4 @@ jobs:
 
       - name: Run pytest
         run: |
-          python -m pytest -vv tests --reruns 3 --reruns-delay 30 --only-rerun "(?i)http|timeout|connection"
+          python -m pytest -vv tests --reruns 10 --reruns-delay 30 --only-rerun "(?i)http|ssl|timeout|expired|connection|socket"

.github/workflows/deploy.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Check metadata
         run: pipx run twine check dist/*
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: dist/*
 
@@ -29,7 +29,7 @@ jobs:
     if: github.event_name == 'release' && github.event.action == 'published'
 
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: artifact
           path: dist

.gitignore

@@ -1,3 +1,6 @@
+# hatch-vcs
+src/uproot/version.py
+
 # Sphinx documentation
 docs-sphinx/_build
 docs-sphinx/changelog.rst

.pre-commit-config.yaml

@@ -18,12 +18,12 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 23.10.1
+    rev: 23.12.1
     hooks:
       - id: black
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.4
+    rev: v0.1.13
     hooks:
       - id: ruff
         args: [--fix, --show-fixes]
@@ -36,7 +36,7 @@ repos:
         args: [--py38-plus]
 
   - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-    rev: v2.11.0
+    rev: v2.12.0
     hooks:
       - id: pretty-format-toml
         args: [--autofix]

.readthedocs.yml

@@ -3,8 +3,12 @@ version: 2
 sphinx:
   configuration: docs-sphinx/conf.py
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: '3.8'
+
 python:
-  version: 3.7
   install:
     - requirements: docs-sphinx/requirements.txt
     - method: pip

README.md

@@ -179,6 +179,10 @@ 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/natsukium"><img src="https://avatars.githubusercontent.com/u/25083790?v=4?s=100" width="100px;" alt="OTABI Tomoya"/><br /><sub><b>OTABI Tomoya</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=natsukium" title="Tests">⚠️</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/JostMigenda"><img src="https://avatars.githubusercontent.com/u/16189747?v=4?s=100" width="100px;" alt="Jost Migenda"/><br /><sub><b>Jost Migenda</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=JostMigenda" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://glepage.com"><img src="https://avatars.githubusercontent.com/u/33058747?v=4?s=100" width="100px;" alt="Gaétan Lepage"/><br /><sub><b>Gaétan Lepage</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=GaetanLepage" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/HaarigerHarald"><img src="https://avatars.githubusercontent.com/u/8050292?v=4?s=100" width="100px;" alt="HaarigerHarald"/><br /><sub><b>HaarigerHarald</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=HaarigerHarald" title="Code">💻</a></td>
+    </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>
     </tr>
   </tbody>
 </table>

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
 import ROOT

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
 

docs-sphinx/requirements.txt

@@ -1 +1,2 @@
 sphinx>=2.4.4
+sphinx-rtd-theme

pyproject.toml

@@ -1,7 +1,8 @@
 [build-system]
 build-backend = "hatchling.build"
 requires = [
-  "hatchling"
+  "hatchling",
+  "hatch-vcs"
 ]
 
 [project]
@@ -36,6 +37,7 @@ dependencies = [
   "awkward>=2.5.0",
   "importlib-metadata;python_version<\"3.8\"",
   "numpy",
+  "fsspec",
   "packaging",
   "typing_extensions>=4.1.0; python_version < \"3.11\""
 ]
@@ -51,35 +53,39 @@ requires-python = ">=3.8"
 [project.optional-dependencies]
 dev = [
   "boost_histogram>=0.13",
-  "dask-awkward>=2023.10.0",
-  "dask[array]",
+  "dask-awkward>=2023.12.1",
+  "dask[array,distributed]",
   "hist>=1.2",
   "pandas",
   "awkward-pandas"
 ]
 test = [
   "lz4",
+  "xxhash",
+  "zstandard",
   "minio",
-  "aiohttp; python_version<\"3.12\"",  # asyncio not available
-  "fsspec",
+  "aiohttp",
   "fsspec-xrootd",
-  "s3fs; python_version<\"3.12\"",  # asyncio not available
+  "s3fs",
   "paramiko",
   "pytest>=6",
   "pytest-timeout",
   "pytest-rerunfailures",
   "requests",
   "scikit-hep-testdata",
-  "xxhash",
   "rangehttpserver"
 ]
 
 [project.urls]
 Download = "https://github.com/scikit-hep/uproot5/releases"
 Homepage = "https://github.com/scikit-hep/uproot5"
 
+[tool.hatch.build.hooks.vcs]
+version-file = "src/uproot/version.py"
+
 [tool.hatch.version]
-path = "src/uproot/version.py"
+path = "src/uproot/__init__.py"
+source = "vcs"
 
 [tool.isort]
 profile = "black"
@@ -142,9 +148,15 @@ select = [
 ]
 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"]
 "src/uproot/*/file.py" = ["SIM115"]
+
+[tool.setuptools_scm]
+write_to = "src/uproot/_version.py"

src/uproot/__init__.py

@@ -72,7 +72,6 @@
 isort:skip_file
 """
 
-
 from uproot.version import __version__
 import uproot.const
 import uproot.extras
@@ -92,6 +91,7 @@
 from uproot.source.xrootd import MultithreadedXRootDSource
 from uproot.source.s3 import S3Source
 from uproot.source.object import ObjectSource
+from uproot.source.fsspec import FSSpecSource
 from uproot.source.cursor import Cursor
 from uproot.source.futures import TrivialExecutor
 from uproot.source.futures import ThreadPoolExecutor