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 --aligner #283

Merged
merged 11 commits into from
Sep 22, 2020
Merged

Add --aligner #283

merged 11 commits into from
Sep 22, 2020

Conversation

maxulysse
Copy link
Member

nf-core/sarek pull request

Many thanks for contributing to nf-core/sarek!

Please fill in the appropriate checklist below (delete whatever is not relevant).
These are the most common things requested on pull requests (PRs).

PR checklist

  • This comment contains a description of changes (with reason)
  • If you've fixed a bug or added code that should be tested, add tests!
  • If necessary, also make a PR on the nf-core/sarek branch on the nf-core/test-datasets repo
  • Ensure the test suite passes (nextflow run . -profile test,docker).
  • Make sure your code lints (nf-core lint .).
  • Documentation in docs is updated
  • CHANGELOG.md is updated
  • README.md is updated

Learn more about contributing: CONTRIBUTING.md

@maxulysse maxulysse added the DSL2 label Sep 21, 2020
@maxulysse maxulysse marked this pull request as ready for review September 21, 2020 15:06
@maxulysse
Copy link
Member Author

both commands work:

nextflow run . -profile test,docker --aligner bwa-mem2 -resume

and

nextflow run . -profile test,docker --aligner bwa-mem -resume

@maxulysse
Copy link
Member Author

Sorry for the huge PR.
Trying to synchronise a bit with the current dev at the same time, especially regarding the documentation.

@maxulysse maxulysse requested a review from a team September 22, 2020 08:21
@FriederikeHanssen
Copy link
Contributor

Is the documentation a copy from dev ? (except for bwamem2)

@maxulysse
Copy link
Member Author

I checked-out most of the files from dev

docs/output.md Outdated Show resolved Hide resolved
docs/output.md Outdated Show resolved Hide resolved
docs/output.md Outdated Show resolved Hide resolved

#### GATK MarkDuplicatesSpark
Such files are intermediate and not kept in the final files delivered to users.
Copy link
Contributor

Choose a reason for hiding this comment

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

It is a bit unclear for me here, which files are not delivered to the user. The mapped bams? Similar in the BWA section

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, especially since they're not merged.
But yeah, not very clear

docs/usage.md Show resolved Hide resolved
bam_bwamem2 = BWAMEM2_MEM.out
}

bam_bwamem2 = bam_bwamem2.mix(bwa_mem_out)
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should use just bam_bwa or something. If bwamem2 was not used for mapping, the channel will still be called that for the remainder of the pipeline

Copy link
Contributor

Choose a reason for hiding this comment

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

Or will this not work because of empty channels or what not?I suppose we can also work on naming as we go, since all the things are changing so much still

@@ -0,0 +1,59 @@
/*
Copy link
Contributor

Choose a reason for hiding this comment

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

These are the functions from the modules repo right? We should probably find a common place for them, otherwise we will have them x-times in the end (if that works)

Copy link
Member Author

Choose a reason for hiding this comment

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

Actually just used nf-core modules install . bwa/index
Maybe it's something that need to be fixed within the nf-core/modules repo

Copy link
Contributor

Choose a reason for hiding this comment

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

ok, maybe this can be discussed in the modules channel. Could be tricky to figure out during the installation whether another module has been installed and thus the functions are there.

Copy link
Member Author

Choose a reason for hiding this comment

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

If it's always the same functions, then it can be in a specific path within the modules folder.
Should be easy to check if it exists

Copy link
Contributor

Choose a reason for hiding this comment

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

I guess for now, here we can leave it as is

@FriederikeHanssen
Copy link
Contributor

FriederikeHanssen commented Sep 22, 2020

I checked-out most of the files from dev

ok, I have not read about everything in the docu now. Focused on the changes for the aligner. Skimmed only over the rest

Co-authored-by: FriederikeHanssen <Friederike.hanssen@qbic.uni-tuebingen.de>
docs/usage.md Outdated Show resolved Hide resolved
docs/usage.md Outdated Show resolved Hide resolved
@maxulysse maxulysse merged commit 7f6a57e into nf-core:dsl2 Sep 22, 2020
@maxulysse maxulysse deleted the dsl2-bwa-mem-both branch September 22, 2020 12:39
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.

2 participants