Merge dask-expr repository into dask#11623
Merged
Conversation
…assign (dask#887) Co-authored-by: Hendrik Makait <hendrik@makait.com>
Co-authored-by: Patrick Hoefler <61934744+phofl@users.noreply.github.com>
Co-authored-by: James Bourbeau <jrbourbeau@users.noreply.github.com>
# Conflicts: # .flake8 # .github/workflows/conda.yml # .github/workflows/pre-commit.yml # .gitignore # .pre-commit-config.yaml # LICENSE.txt # codecov.yml # pyproject.toml
Contributor
Unit Test ResultsSee test report for an extended history of previous test failures. This is useful for diagnosing flaky tests. 15 files ± 0 15 suites ±0 4h 31m 57s ⏱️ + 41m 3s Results for commit a817ce9. ± Comparison against base commit d280e16. This pull request removes 7 and adds 4553 tests. Note that renamed tests count towards both.This pull request removes 7 skipped tests and adds 39 skipped tests. Note that renamed tests count towards both.♻️ This comment has been updated with latest results. |
Collaborator
Author
|
We will have to use a merge commit here, not squash commit |
2d14d9b to
03776e7
Compare
Member
|
have we figured out the docs redirect problem? |
Remove duplicated files and clean up merge
Collaborator
Author
Not yet, but most of them will be in the same place anyway, we should be able to fix the remaining ones through moving the place where we are importing them from hopefully. That's something I'd tackle after this is in though |
Member
|
A note to myself: We will have to change the repo settings to allow merges without squashing to preserve the git history |
This was referenced Jan 8, 2025
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
14 participants
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.
pre-commit run --all-files