chore: merge main-v510 into main, ending the two-main branch era
#988
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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 <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Jim Pivarski <[email protected]>
* 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 <[email protected]> Co-authored-by: Jim Pivarski <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
#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 <[email protected]> * 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 <[email protected]>
* 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 <[email protected]> * 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 <[email protected]>
* 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 <[email protected]> * 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 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is going to be a commit merge, not a squash-and-merge, so that all of the individual commits in
main-v510, each of which is a PR, will appear as individual commits inmain.