Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: scikit-hep/uproot5
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v5.0.13
Choose a base ref
...
head repository: scikit-hep/uproot5
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v5.1.0
Choose a head ref
  • 13 commits
  • 22 files changed
  • 7 contributors

Commits on Oct 11, 2023

  1. feat: add support for shape touching in Dask (#966)

    * adapt to new shape touching in awkward/dask-awkward
    
    * style: pre-commit fixes
    
    * change set to list when selecting form columns
    
    * checkpoitn
    
    * wip
    
    * wip 2
    
    * fix: use trivial form mapping if missing
    
    * fix: type hints
    
    * refactor: add mixin to share code
    
    * chore: fix typos
    
    * fix: take first field, not last
    
    * fix: update to newest dask-awkward API
    
    * fix: update to return report
    
    * fix: aggregate keys to read ahead of time
    
    * Revert "fix: aggregate keys to read ahead of time"
    
    This reverts commit 4a69863.
    
    * fix: update to reflect changes to dask-awkward PR
    
    * feat: add support for "necessary_columns"
    
    * fix: use typing_extensions
    
    * fix: don't convert to array via asarray
    
    * fix: don't import `dask_awkward`
    
    * chore: update dependency warning
    
    * test: fix typo
    
    * The next release will be 5.1.0rc1.
    
    * chore: bump dask-awkward to include the pre-release
    
    * chore: bump awkward dependency
    
    * feat: export interfaces
    
    * The next release will be 5.1.0rc2.
    
    ---------
    
    Co-authored-by: Lindsey Gray <lindsey.gray@gmail.com>
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    Co-authored-by: Jim Pivarski <jpivarski@users.noreply.github.com>
    4 people authored Oct 11, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6abbdc3 View commit details
  2. chore: bump Python version (#980)

    * chore: bump Python version
    
    * remove python 3.7 from ci
    
    * add python 3.11 to matrix build
    
    * add python 3.12
    
    * remove python 3.12
    
    * remove python 3.11 from matrix build (already in vanilla build)
    
    * fix: pull out `.data` from `NumpyArray`
    
    * ci: test 3.12
    
    * fix: don't require aiohttp for 3.12
    
    * ci: fix line breaks
    
    Windows PS1 does not like this.
    
    * fix: deprecated `ast.Str`
    
    * fix: deprecated parameters to HTTPConnection
    
    * fix: check `node.value`
    
    * test: require aiohttp
    
    * fix: `ask.Num` is deprecated
    
    * fix: use `ast.Constant` in return
    
    * style: pre-commit fixes
    
    ---------
    
    Co-authored-by: Luis Antonio Obis Aparicio <luis.antonio.obis@gmail.com>
    Co-authored-by: Jim Pivarski <jpivarski@users.noreply.github.com>
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    4 people authored Oct 11, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    808baf7 View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e133be6 View commit details
  4. Verified

    This commit was signed with the committer’s verified signature.
    agoose77 Angus Hollands
    Copy the full SHA
    3522acc View commit details

Commits on Oct 12, 2023

  1. feat: improve uproot.futures compatibility with concurrent.futures (

    #983)
    
    * notifier return function compatible with futures `add_done_callback` api
    
    * rename argument `num_workers` to `max_workers` for compatibility with concurrent.futures api
    
    * add _max_workers attribute to class
    
    * Update src/uproot/source/futures.py
    
    Co-authored-by: Angus Hollands <goosey15@gmail.com>
    
    * update dev deps in attempt to fix pipeline
    
    * Revert "update dev deps in attempt to fix pipeline"
    
    This reverts commit 7f33b27.
    
    ---------
    
    Co-authored-by: Angus Hollands <goosey15@gmail.com>
    lobis and agoose77 authored Oct 12, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9f5e4c7 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f999bd9 View commit details
  3. feat: Use a single handler argument on uproot.reading.open (#971)

    * single argument for handlers
    
    * style: pre-commit fixes
    
    * fix missing object source
    
    * add deprecation warnings for handler options
    
    * style: pre-commit fixes
    
    * use handler instead of *_handler
    
    * use file in skhep testdata
    
    * remove hyphen
    
    * use tag instead of branch (#973 (comment))
    
    * remove network pytest mark (#973 (comment))
    
    * use proper http links instead of local paths
    
    * use fsspec to split url
    
    * add comment
    
    * fix bad strip
    
    * working github test
    
    * add test for path split object
    
    * Update src/uproot/_util.py
    
    Co-authored-by: Jim Pivarski <jpivarski@users.noreply.github.com>
    
    * use urllib instead of fsspec for url parsing
    
    * move tests to dedicated file
    
    * do not shadow `object`
    
    * add more test cases
    
    * fsspec source as default
    
    * fix test
    
    * add xrootd handler default
    
    * correctly strip obj
    
    * revert merge
    
    * Revert "revert merge"
    
    This reverts commit 60300d6.
    
    * Revert "Revert "revert merge""
    
    This reverts commit 2884e02.
    
    * update docstrings
    
    * update docstrings
    
    * direct the user to the handler option in docs
    
    * explain order of handler options
    
    ---------
    
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    Co-authored-by: Jim Pivarski <jpivarski@users.noreply.github.com>
    3 people authored Oct 12, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    80718ab View commit details
  4. feat: fsspec source non-blocking chunks (#979)

    * attempt at non-blocking
    
    * call Future constructor correctly
    
    * working future
    
    * remove comment (fsspec/filesystem_spec#1388)
    
    * add test for chunks
    
    * add missing import
    
    * now chunks are retrieved correctly but is blocking
    
    * now it's non-blocking
    
    * remove print from test
    
    * remove timings from test
    
    * add executor to class (no cleanup)
    
    * cleanup executor
    
    * use concurrent thread pool
    
    * Update src/uproot/source/fsspec.py
    
    Co-authored-by: Jim Pivarski <jpivarski@users.noreply.github.com>
    
    * made sources not pickleable
    
    * Revert "made sources not pickleable"
    
    This reverts commit fc2759f.
    
    * new callback
    
    * remove comment
    
    * add return type hint to `closed` and `num_bytes`
    
    * more return type hints
    
    * move "Chunk" class position in file to allow type hinting (no code changes)
    
    * add `add_done_callback` to TrivialFuture
    
    * remove tmp_path
    
    * call callback immediately in trivial future
    
    * Revert "move "Chunk" class position in file to allow type hinting (no code changes)"
    
    This reverts commit d122e20.
    
    * import annotations from __future__, type hints
    
    * chunks return type hint
    
    * import skip for aiohttp
    
    * add annotations
    
    * add license string
    
    * remove check for http
    
    * test with "use_threads" enabled and disabled
    
    ---------
    
    Co-authored-by: Jim Pivarski <jpivarski@users.noreply.github.com>
    lobis and jpivarski authored Oct 12, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9ea709b View commit details

Commits on Oct 13, 2023

  1. Copy the full SHA
    80e392c View commit details
  2. Copy the full SHA
    491d330 View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    644ba58 View commit details
  4. Merge pull request #988 from scikit-hep/main-v510

    chore: merge `main-v510` into `main`, ending the two-main branch era
    jpivarski authored Oct 13, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e649af2 View commit details
  5. chore: update pre-commit hooks (#982)

    updates:
    - [github.com/pre-commit/pre-commit-hooks: v4.4.0 → v4.5.0](pre-commit/pre-commit-hooks@v4.4.0...v4.5.0)
    
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    Co-authored-by: Jim Pivarski <jpivarski@users.noreply.github.com>
    pre-commit-ci[bot] and jpivarski authored Oct 13, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f4d473e View commit details
6 changes: 1 addition & 5 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
@@ -16,10 +16,7 @@ jobs:
fail-fast: false
matrix:
platform: ["windows-latest", "macos-latest", "ubuntu-latest"]
python-version: ["3.7", "3.8", "3.9", "3.10"]
exclude:
- platform: "windows-latest"
python-version: "3.7"
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]

runs-on: "${{ matrix.platform }}"
timeout-minutes: 30
@@ -73,7 +70,6 @@ jobs:
runs-on: "${{ matrix.platform }}"
timeout-minutes: 30


steps:
- uses: "actions/checkout@v4"

9 changes: 8 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
@@ -27,3 +27,10 @@ repos:
hooks:
- id: ruff
args: ["--fix", "--show-fixes"]


- repo: https://github.com/asottile/pyupgrade
rev: v3.13.0
hooks:
- id: pyupgrade
args: ["--py38-plus"]
15 changes: 8 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ name = "uproot"
description = "ROOT I/O in pure Python and NumPy."
readme = "README.md"
license = "BSD-3-Clause"
requires-python = ">=3.7"
requires-python = ">=3.8"
authors = [
{ name = "Jim Pivarski", email = "pivarski@princeton.edu" },
]
@@ -25,11 +25,11 @@ classifiers = [
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Scientific/Engineering",
"Topic :: Scientific/Engineering :: Information Analysis",
"Topic :: Scientific/Engineering :: Mathematics",
@@ -38,10 +38,11 @@ classifiers = [
"Topic :: Utilities",
]
dependencies = [
"awkward>=2.0.0",
"awkward>=2.4.6",
"importlib-metadata;python_version<\"3.8\"",
"numpy",
"packaging",
"typing_extensions>=4.1.0; python_version < \"3.11\""
]
dynamic = [
"version",
@@ -50,16 +51,16 @@ dynamic = [
[project.optional-dependencies]
dev = [
"boost_histogram>=0.13",
"dask-awkward>=2023.9.0;python_version >= \"3.8\"",
"dask[array];python_version >= \"3.8\"",
"dask-awkward>=2023.10.0",
"dask[array]",
"hist>=1.2",
"pandas",
"awkward-pandas;python_version >= \"3.8\"",
"awkward-pandas",
]
test = [
"lz4",
"minio",
"aiohttp",
"aiohttp; python_version<\"3.12\"",
"fsspec",
"fsspec-xrootd",
"pytest>=6",
2 changes: 1 addition & 1 deletion src/uproot/__init__.py
Original file line number Diff line number Diff line change
@@ -185,7 +185,7 @@
from uproot.behavior import behavior_of

from uproot._util import no_filter
from uproot._dask import dask
from uproot._dask import dask, ImplementsFormMapping, ImplementsFormMappingInfo

from uproot.pyroot import from_pyroot
from uproot.pyroot import to_pyroot
Loading