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

Add umicollapse as an alternative to umi-tools #1369

Merged
merged 15 commits into from
Dec 4, 2024

Conversation

siddharthab
Copy link

@siddharthab siddharthab commented Sep 3, 2024

Checklist:

TODO:
- [ ] Benchmark paired ends mode
- [ ] Include in multiqc
Copy link
Member

@MatthiasZepper MatthiasZepper left a comment

Choose a reason for hiding this comment

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

Excellent work, clean and well-structured! I think, you found very smart solutions to not duplicate too much of the code.

Of course, we should wait for the lead developers of the pipeline to review as well prior to merging, but in general you have my support for this addition! Ideally, your fix for umicollapse would also be included in the form of an updated tool version.

Please don't forget the Changelog later and also to add your name to the contributors (well deserved)!

nextflow_schema.json Outdated Show resolved Hide resolved
@@ -30,6 +30,7 @@ params {
with_umi = false
skip_umi_extract = false
umitools_extract_method = 'string'
umi_dedup_tool = 'umicollapse'
umitools_grouping_method = 'directional'
Copy link
Member

Choose a reason for hiding this comment

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

Reading that makes we wonder if we should be conservative regarding the parameter names or make them more generic, e.g. renaming umitools_grouping_method to something like umi_grouping_method / umi_dedup_grouping_method etc.

Copy link
Author

Choose a reason for hiding this comment

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

Yes, I thought about that too. Depends on your policy for introducing breaking changes between versions. If the authors are OK, I can rename these parameters to be more generic.

workflows/rnaseq/main.nf Show resolved Hide resolved
workflows/rnaseq/main.nf Outdated Show resolved Hide resolved
workflows/rnaseq/nextflow.config Show resolved Hide resolved
workflows/rnaseq/nextflow.config Show resolved Hide resolved
Copy link
Author

@siddharthab siddharthab left a comment

Choose a reason for hiding this comment

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

Thanks for the quick review. I am tracking all remaining items in the PR summary.

@@ -30,6 +30,7 @@ params {
with_umi = false
skip_umi_extract = false
umitools_extract_method = 'string'
umi_dedup_tool = 'umicollapse'
umitools_grouping_method = 'directional'
Copy link
Author

Choose a reason for hiding this comment

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

Yes, I thought about that too. Depends on your policy for introducing breaking changes between versions. If the authors are OK, I can rename these parameters to be more generic.

nextflow_schema.json Outdated Show resolved Hide resolved
workflows/rnaseq/main.nf Outdated Show resolved Hide resolved
workflows/rnaseq/main.nf Show resolved Hide resolved
workflows/rnaseq/nextflow.config Show resolved Hide resolved
Signed-off-by: Siddhartha Bagaria <[email protected]>
@siddharthab siddharthab marked this pull request as ready for review September 4, 2024 16:46
@siddharthab
Copy link
Author

I checked the output of UMICollapse, and it definitely does not follow the assumptions stated in prepare_for_rsem.py. So PREPARE_FOR_RSEM will be needed for UMICollapse as long as it is needed for umi-tools.

@MatthiasZepper MatthiasZepper mentioned this pull request Oct 2, 2024
11 tasks
@siddharthab
Copy link
Author

@MatthiasZepper all remaining tasks are now done. Please take another look.

@MatthiasZepper
Copy link
Member

@MatthiasZepper all remaining tasks are now done. Please take another look.

Unfortunately, the UMICollapse module has not yet been upgraded...

@MatthiasZepper
Copy link
Member

@siddharthab: The module is finally upgraded, so you can replace the local path with the up-to-date module.

@siddharthab
Copy link
Author

@siddharthab: The module is finally upgraded, so you can replace the local path with the up-to-date module.

Thanks. Can you check if everything looks good now? I just ran nf-core modules update umicollapse, but do not know if I need to do more.

Copy link
Member

@pinin4fjords pinin4fjords left a comment

Choose a reason for hiding this comment

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

Can we uppercase the new process aliases please? My tiny little mind will get confused otherwise.

workflows/rnaseq/main.nf Outdated Show resolved Hide resolved
workflows/rnaseq/main.nf Outdated Show resolved Hide resolved
workflows/rnaseq/main.nf Outdated Show resolved Hide resolved
workflows/rnaseq/main.nf Outdated Show resolved Hide resolved
workflows/rnaseq/main.nf Outdated Show resolved Hide resolved
workflows/rnaseq/main.nf Outdated Show resolved Hide resolved
workflows/rnaseq/main.nf Outdated Show resolved Hide resolved
workflows/rnaseq/main.nf Outdated Show resolved Hide resolved
workflows/rnaseq/main.nf Outdated Show resolved Hide resolved
workflows/rnaseq/main.nf Outdated Show resolved Hide resolved
Co-authored-by: Jonathan Manning <[email protected]>
@siddharthab
Copy link
Author

Can we uppercase the new process aliases please?

@pinin4fjords, done.

Copy link
Member

@MatthiasZepper MatthiasZepper left a comment

Choose a reason for hiding this comment

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

I can only reiterate that I would like to see this merged. In my opinion, an outstanding job.

@pinin4fjords
Copy link
Member

@nf-core-bot fix linting

@pinin4fjords
Copy link
Member

Sorry, good in principle now for me (maybe some factoring out we can do later). Just need to get tests to run + pass.

@MatthiasZepper
Copy link
Member

MatthiasZepper commented Nov 13, 2024

Sorry, good in principle now for me (maybe some factoring out we can do later). Just need to get tests to run + pass.

Well, it appears the issue is on my end. Will fix asap! Sorry!

The UMICollapse tests are failing, because they try importing the BWA-Mem module, which isn’t included in this pipeline. As obviously everything is available in the modules directory, the tests pass in that context.

Considering that I had copied the tests from umitools dedup due to my limited experience with nf-test when creating the UMICollapse module, I was puzzled about why the umitools-tests work in here for the pipeline.

Turns out that I had coicidentially copied them as a template during a very brief period on March 4 before Maxime updated them again, which explains the discrepancy...

Long story short, I will have to fix the UMICollapse test in the modules directory to be self-reliant.

@MatthiasZepper
Copy link
Member

Just to give a brief update: I have finally found some time to update the tests. Therefore, I hope the module tests will soon be updated in the repo and subsequently this PR also be merged successfully!

@MatthiasZepper
Copy link
Member

@maxulysse: Let me know, when you have synced the test data to the S3 bucket. Ultimately, that sounds like something we could automate in the future with a CI on the test data repository?

@maxulysse
Copy link
Member

Restore truncated CHANGELOG.md with 3.0 and prior releases.

🤦

I did not see that missing when I fixed the merge conflicts, good catch @MatthiasZepper

@pinin4fjords
Copy link
Member

@nf-core-bot fix linting

@MatthiasZepper
Copy link
Member

@nf-core-bot fix linting

Thanks! Strange, that the linter is unhappy, since I literally copy and pasted that from the current dev...anyway.

@MatthiasZepper MatthiasZepper merged commit 2986385 into nf-core:dev Dec 4, 2024
39 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.

5 participants