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

Sync changes from development with main for v0.8.0 #728

Merged
merged 457 commits into from
Mar 13, 2024
Merged

Conversation

allyhawkins
Copy link
Member

In preparation for #654, this syncs all changes from development to main. This includes the merge workflow, updates to cell typing, and rds file compression.

sjspielman and others added 30 commits January 17, 2024 13:01
… NA confusion, especially with singler which CAN assign NAs
…pes-during-merge

Keep cell type columns when merging
…olumns-when-merging

Retain filter columns when merging
…data-gene_ids

Don't rename rowdata `gene_ids` column
…in-check

Fix merge.nf workflow adt and multiplex check
…e-unlassified

Actually remove unclassified cells from heatmap
…er a string, or named vector if there are multiple samples (multiplex)
jashapiro and others added 24 commits March 7, 2024 10:38
Co-authored-by: Stephanie Spielman <stephanie.spielman@gmail.com>
Co-authored-by: Stephanie Spielman <stephanie.spielman@gmail.com>
Handle empty sample type columns and add sentence about references not having tumor cells
Use `mem_max` for all merging and sync changes from `main`
Update version tag and scpcaTools container
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.3.0 → v0.3.2](astral-sh/ruff-pre-commit@v0.3.0...v0.3.2)
- [github.com/pre-commit/mirrors-prettier: v3.0.3 → v4.0.0-alpha.8](pre-commit/mirrors-prettier@v3.0.3...v4.0.0-alpha.8)
Copy link
Member

@jashapiro jashapiro left a comment

Choose a reason for hiding this comment

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

LGTM. I had one tiny suggestion because of #729 (which I think we should otherwise just close)

@@ -30,7 +32,7 @@ repos:
args: [--update-only, --title=**Table of Contents**]
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff for linting and formatting python
rev: v0.2.1
rev: v0.3.0
Copy link
Member

Choose a reason for hiding this comment

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

Because the precommit ci just suggested this change...

Suggested change
rev: v0.3.0
rev: v0.3.2

@allyhawkins allyhawkins merged commit 246c3d7 into main Mar 13, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants