Backport PR #631 to 0.12.x #670
Merged
Conversation
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
…631) * Concat: fix using 'move' with a missing conflicting metadata column. This commit fixes `TypeError`s when trying to concatenate three or more samples using `--mode move`. The error occurs when one of the samples does not contain the column that does trigger a conflict in the other samples. In mode `move`, the conflicting metadata columns are gathered across the samples and moved to the multidimensional annotation data slot (obsm or varm). The problem is that the sample names are used as the column namnes for the dataframe, but because one or more columns is missing, the number of input samples is differs from the number of columns. * Update CHANGELOG with PR number * Fix test looking at wrong attribute * Revert changing attribute in tests
This reverts commit 827d483.
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.
Changelog
Backport PR #631 to 0.12.x
Issue ticket number and link
Closes #xxxx (Replace xxxx with the GitHub issue number)
Checklist before requesting a review
I have performed a self-review of my code
Conforms to the Contributor's guide
Check the correct box. Does this PR contain:
Proposed changes are described in the CHANGELOG.md
CI tests succeed!