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

feat: add support for shape touching in Dask #966

Merged
merged 30 commits into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7b5d2f5
adapt to new shape touching in awkward/dask-awkward
lgray Sep 18, 2023
e585f59
style: pre-commit fixes
pre-commit-ci[bot] Sep 18, 2023
5b62c10
change set to list when selecting form columns
lgray Sep 18, 2023
110a29b
checkpoitn
agoose77 Sep 26, 2023
09c99b8
wip
agoose77 Sep 28, 2023
07c7085
wip 2
agoose77 Sep 29, 2023
66ada9b
fix: use trivial form mapping if missing
agoose77 Oct 3, 2023
3f17fcf
fix: type hints
agoose77 Oct 3, 2023
883da1e
refactor: add mixin to share code
agoose77 Oct 3, 2023
48d160d
chore: fix typos
agoose77 Oct 3, 2023
74c165b
fix: take first field, not last
agoose77 Oct 3, 2023
fc643fa
fix: update to newest dask-awkward API
agoose77 Oct 3, 2023
c634524
fix: update to return report
agoose77 Oct 3, 2023
573cd1d
fix: aggregate keys to read ahead of time
agoose77 Oct 4, 2023
f63ca09
Revert "fix: aggregate keys to read ahead of time"
agoose77 Oct 4, 2023
5d0f8f3
fix: update to reflect changes to dask-awkward PR
agoose77 Oct 4, 2023
2003edc
feat: add support for "necessary_columns"
agoose77 Oct 5, 2023
d2f724c
fix: use typing_extensions
agoose77 Oct 6, 2023
5128482
fix: don't convert to array via asarray
agoose77 Oct 6, 2023
ac33112
fix: don't import `dask_awkward`
agoose77 Oct 6, 2023
0937334
chore: update dependency warning
agoose77 Oct 6, 2023
e7dfe2a
Merge branch 'main' into agoose77/wip-shape-tracking
agoose77 Oct 6, 2023
f6cd524
test: fix typo
agoose77 Oct 6, 2023
3e81c4f
Merge remote-tracking branch 'origin/agoose77/wip-shape-tracking' int…
agoose77 Oct 6, 2023
4d1df60
The next release will be 5.1.0rc1.
jpivarski Oct 6, 2023
39d76a9
chore: bump dask-awkward to include the pre-release
agoose77 Oct 6, 2023
33fb1ab
Merge remote-tracking branch 'origin/agoose77/wip-shape-tracking' int…
agoose77 Oct 6, 2023
17b164f
chore: bump awkward dependency
agoose77 Oct 6, 2023
294c47a
feat: export interfaces
agoose77 Oct 8, 2023
0524744
The next release will be 5.1.0rc2.
jpivarski Oct 9, 2023
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
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ classifiers = [
"Topic :: Utilities",
]
dependencies = [
"awkward>=2.0.0",
"awkward>=2.4.5",
"importlib-metadata;python_version<\"3.8\"",
"numpy",
"packaging",
"typing_extensions>=4.1.0; python_version < \"3.11\""
]
dynamic = [
"version",
Expand All @@ -50,7 +51,7 @@ dynamic = [
[project.optional-dependencies]
dev = [
"boost_histogram>=0.13",
"dask-awkward>=2023.9.0;python_version >= \"3.8\"",
"dask-awkward>=2023.10.0a1;python_version >= \"3.8\"",
"dask[array];python_version >= \"3.8\"",
"hist>=1.2",
"pandas",
Expand Down
2 changes: 1 addition & 1 deletion src/uproot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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