Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dask awkward support for uproot.dask #652

Merged
merged 26 commits into from
Aug 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b34350a
Changed everything we _think_ we need to change.
jpivarski Jul 5, 2022
5957e0e
All tests pass.
jpivarski Jul 5, 2022
506e2fe
Change test 0034
kkothari2001 Jul 7, 2022
83a3953
Alter instances of from_datashape
kkothari2001 Jul 7, 2022
2547a04
Removed 'v1/v2 insensitivity' checks. We're all-in for v2 now.
jpivarski Jul 7, 2022
d9890b2
Added basic dask-awkward support
kkothari2001 Jul 17, 2022
4a8f59e
Delay file open feature
kkothari2001 Jul 18, 2022
a476d47
Merge remote-tracking branch 'origin/main' into dask-awkward-support
kkothari2001 Jul 18, 2022
d46481f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 18, 2022
c5ed2c0
Complete dask-awkward using from_map
kkothari2001 Aug 1, 2022
42afafa
Added tests for dask_awkward
kkothari2001 Aug 1, 2022
c5c5c15
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 1, 2022
2df67c5
Added dask-awkward to testing dependancies
kkothari2001 Aug 1, 2022
18c6647
Add dask-awk to dependancies in github workflow
kkothari2001 Aug 1, 2022
2b904f8
Skip dask_awkward tests for all except python version == 3.8
kkothari2001 Aug 1, 2022
d38ac6a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 1, 2022
86501e2
Make suggested changes
kkothari2001 Aug 10, 2022
d012d70
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 10, 2022
d2fe1a6
Add back the noqa's which are being removed for some reason
kkothari2001 Aug 10, 2022
50b16f2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 10, 2022
4ab1564
Refactored uproot.dask as suggested
kkothari2001 Aug 11, 2022
da3c949
Complete tests for dask_awkward
kkothari2001 Aug 11, 2022
1e54bb1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 11, 2022
c040121
Make awkward the default library for uproot.dask
kkothari2001 Aug 11, 2022
5c0e8ef
Merge branch 'dask-awkward-support' of github.com:scikit-hep/uproot5 …
kkothari2001 Aug 11, 2022
ac585a1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 11, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ jobs:
run: |
conda env list
conda install root
pip install dask-awkward
conda list

- name: "Install XRootD"
Expand Down
2 changes: 1 addition & 1 deletion docs-sphinx/prepare_docstrings.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"uproot.reading.open",
"uproot.behaviors.TBranch.iterate",
"uproot.behaviors.TBranch.concatenate",
"uproot.behaviors.TBranch.dask",
"uproot._dask.dask",
"uproot.behaviors.TBranch.lazy",
"uproot.writing.writable.create",
"uproot.writing.writable.recreate",
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def get_version():
"xxhash",
"requests",
"dask[array]",
"dask-awkward",
],
}
extras["all"] = sum(extras.values(), [])
Expand Down
2 changes: 1 addition & 1 deletion src/uproot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@
from uproot.behaviors.TBranch import iterate
from uproot.behaviors.TBranch import concatenate
from uproot.behaviors.TBranch import lazy
from uproot.behaviors.TBranch import dask

from uproot.behavior import behavior_of

from uproot._util import no_filter
from uproot._dask import dask

from uproot.pyroot import from_pyroot
Loading