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

Use compartment tables as basis of preset joins #183

Merged
merged 9 commits into from
Apr 18, 2024

Conversation

d33bs
Copy link
Member

@d33bs d33bs commented Apr 4, 2024

Description

This PR changes the way SQL-based joins in presets produce data to avoid scenarios where there is image table data but no associated compartment table data. Many thanks to @jenna-tomkinson who helped provide details and troubleshooting via #86. To help make sure we don't run into this challenge again, I've added a test using data related to #86.

This change is based off of and should be merged after #182 .

Closes #86

What is the nature of your change?

  • Bug fix (fixes an issue).
  • Enhancement (adds functionality).
  • Breaking change (fix or feature that would cause existing functionality to not work as expected).
  • This change requires a documentation update.

Checklist

Please ensure that all boxes are checked before indicating that a pull request is ready for review.

  • I have read the CONTRIBUTING.md guidelines.
  • My code follows the style guidelines of this project.
  • I have performed a self-review of my own code.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have made corresponding changes to the documentation.
  • My changes generate no new warnings.
  • New and existing unit tests pass locally with my changes.
  • I have added tests that prove my fix is effective or that my feature works.
  • I have deleted all non-relevant text in this pull request template.

@d33bs d33bs requested a review from gwaybio April 18, 2024 17:40
@d33bs d33bs added the release-patch Creates a patch release (e.g. `v0.0.1`) label Apr 18, 2024
Copy link
Member

@gwaybio gwaybio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Elegant fix, and I appreciate the added test and citation! One clarification question that need not delay merging

tests/test_convert_threaded.py Outdated Show resolved Hide resolved
Co-Authored-By: Gregory Way <[email protected]>
@d33bs
Copy link
Member Author

d33bs commented Apr 18, 2024

Thank you @gwaybio ! Merging this in.

@d33bs d33bs merged commit c1b4765 into cytomining:main Apr 18, 2024
11 checks passed
@d33bs d33bs deleted the reorganize-preset-joins branch April 18, 2024 20:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-patch Creates a patch release (e.g. `v0.0.1`)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Using convert to merge only two compartments causes either data loss or data mismatching
2 participants