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

Fastq screen #3574

Merged
merged 256 commits into from
May 3, 2024
Merged

Fastq screen #3574

merged 256 commits into from
May 3, 2024

Conversation

JPejovicApis
Copy link
Contributor

@JPejovicApis JPejovicApis commented Jun 29, 2023

PR checklist

Closes #3156
Closes #3157

  • 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 you've added a new tool - have you followed the module conventions in the contribution docs
  • Remove all TODO statements.
  • Emit the versions.yml file.
  • Follow the naming conventions.
  • Follow the parameters requirements.
  • Follow the input/output options guidelines.
  • Add a resource label
  • Use BioConda and BioContainers if possible to fulfil software requirements.
  • Ensure that the test works with either Docker / Singularity. Conda CI tests can be quite flaky:
    • PROFILE=docker pytest --tag <MODULE> --symlink --keep-workflow-wd --git-aware
    • PROFILE=singularity pytest --tag <MODULE> --symlink --keep-workflow-wd --git-aware
    • PROFILE=conda pytest --tag <MODULE> --symlink --keep-workflow-wd --git-aware

Copy link
Contributor

@SPPearce SPPearce left a comment

Choose a reason for hiding this comment

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

This is looking really close, if the suggested change fixes the error.

modules/nf-core/fastqscreen/buildfromindex/main.nf Outdated Show resolved Hide resolved
modules/nf-core/fastqscreen/fastqscreen/main.nf Outdated Show resolved Hide resolved
modules/nf-core/fastqscreen/fastqscreen/main.nf Outdated Show resolved Hide resolved
tests/modules/nf-core/fastqscreen/buildfromindex/test.yml Outdated Show resolved Hide resolved
tests/modules/nf-core/fastqscreen/buildfromindex/main.nf Outdated Show resolved Hide resolved
modules/nf-core/fastqscreen/fastqscreen/meta.yml Outdated Show resolved Hide resolved
modules/nf-core/fastqscreen/fastqscreen/meta.yml Outdated Show resolved Hide resolved
modules/nf-core/fastqscreen/buildfromindex/main.nf Outdated Show resolved Hide resolved
modules/nf-core/fastqscreen/buildfromindex/main.nf Outdated Show resolved Hide resolved
modules/nf-core/fastqscreen/buildfromindex/meta.yml Outdated Show resolved Hide resolved
Copy link
Contributor

@SPPearce SPPearce left a comment

Choose a reason for hiding this comment

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

Looking close! Just the conda check is complaining about a md5sum being different, can you swap that to a contains text?

modules/nf-core/fastqscreen/buildfromindex/meta.yml Outdated Show resolved Hide resolved
modules/nf-core/fastqscreen/fastqscreen/main.nf Outdated Show resolved Hide resolved
tests/modules/nf-core/fastqscreen/fastqscreen/test.yml Outdated Show resolved Hide resolved
Copy link
Contributor

@SPPearce SPPearce left a comment

Choose a reason for hiding this comment

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

I'd like to get another review for this before merging, as it is a very tricky tool to get working.
Well done to all those involved.

nvnieuwk and others added 7 commits October 10, 2023 14:56
* new module picard/scatterintervalsbyns

* update annotsv to 3.3.6

* update installannotations

* new module gem2/gem2bedmappability

* add sizes output

* update meta

* review comments
* new module picard/scatterintervalsbyns

* update annotsv to 3.3.6

* update installannotations

* update genmap modules

* revert label changes index
* update modules

* update uri

* review suggestions

* update germlinecnvcaller
* update modules

* update uri

* review suggestions

* update germlinecnvcaller

* update params
* Add singularity.registry = 'quay.io' for tests

* Bump min NF version to 23.04.0

* Move registry definitions to top-level config scope

---------

Co-authored-by: Gregor Sturm <mail@gregor-sturm.de>
* add README

* Implement cellranger autorename

* Fix container paths

* Various fixes

* Revert "Fix container paths"

This reverts commit 4163e2b.

* Update modules/nf-core/cellranger/count/templates/cellranger_count.py

Co-authored-by: Kevin L. Keys <klkeys@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Kevin L. Keys <klkeys@users.noreply.github.com>

* Include container registry

* Update modules/nf-core/cellranger/count/main.nf

Co-authored-by: Maxime U Garcia <maxime.garcia@seqera.io>

* Update documentation

---------

Co-authored-by: Kevin L. Keys <klkeys@users.noreply.github.com>
Co-authored-by: Maxime U Garcia <maxime.garcia@seqera.io>
* Bump taxpasta version

* Update modules/nf-core/taxpasta/merge/main.nf

Co-authored-by: Moritz E. Beber <midnighter@posteo.net>

* Update modules/nf-core/taxpasta/standardise/main.nf

Co-authored-by: Moritz E. Beber <midnighter@posteo.net>

* Update modules/nf-core/taxpasta/merge/main.nf

Co-authored-by: Moritz E. Beber <midnighter@posteo.net>

---------

Co-authored-by: Moritz E. Beber <midnighter@posteo.net>
@SPPearce SPPearce reopened this Oct 10, 2023
@edmundmiller edmundmiller requested a review from a team as a code owner October 19, 2023 16:26
@edmundmiller edmundmiller self-requested a review October 19, 2023 16:26
@edmundmiller edmundmiller removed their request for review February 6, 2024 15:35
@SPPearce
Copy link
Contributor

I've ported the tests over to nf-test.
I haven't manage to sort out the syntax to check the fastqscreen/fastqscreen output channel though, that is eluding me. It has three files:

test_fq_screen/test_1_screen.txt
test_fq_screen/test_1_screen.png
test_fq_screen/test_1_screen.html

Of which the .txt and .png files are stable, the .html isn't. But I can't manage to get it to snapshot properly without some kind of error.

Copy link
Contributor

@adamrtalbot adamrtalbot left a comment

Choose a reason for hiding this comment

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

For the variable *.txt, *.png and *.html files, capture them as separate outputs then it will be easier to separate them in the process.

e.g. in the output block:

tuple val(meta), path("*.txt"), emit: txt
tuple val(meta), path("*.png"), emit: png
tuple val(meta), path("*.html"), emit: html

in the nf-test:

assert snapshot(process.out.txt, process.out.png).match()

@SPPearce
Copy link
Contributor

Grrr, the other two files have consistent md5sums on conda and singularity, but they are different to docker...

@adamrtalbot
Copy link
Contributor

Grrr, the other two files have consistent md5sums on conda and singularity, but they are different to docker...

That's very unusual, I would expect Singularity and Docker to be the same.

Might have to accept whatever testing is possible here (process success and file exists), plus any easy file contents checking that makes sense.

@SPPearce
Copy link
Contributor

SPPearce commented May 2, 2024

Grrr, the other two files have consistent md5sums on conda and singularity, but they are different to docker...

That's very unusual, I would expect Singularity and Docker to be the same.

Might have to accept whatever testing is possible here (process success and file exists), plus any easy file contents checking that makes sense.

Yes, I just swapped to file existance.

Copy link
Contributor

@adamrtalbot adamrtalbot left a comment

Choose a reason for hiding this comment

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

It all looks good, but there's something up with the indentation and perhaps a few styling choices, but the code itself is fine.

Comment on lines +17 to +23
process {
"""
input[0] = Channel.from([
[[id: "sarscov2"], file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)],
[[id: "human"] , file(params.test_data['homo_sapiens']['genome']['genome_21_fasta'], checkIfExists: true)]
])
"""
Copy link
Contributor

Choose a reason for hiding this comment

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

The indentation seems a bit weird here?

Copy link
Contributor

Choose a reason for hiding this comment

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

To be honest, I don't know how we are supposed to ident things like this

Comment on lines +70 to +72
input[0] = [[ id:'test', single_end:true ],
[file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true) ]
]
Copy link
Contributor

Choose a reason for hiding this comment

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

Definitely something funky with the indentation.

modules/nf-core/fastqscreen/fastqscreen/tests/main.nf.test Outdated Show resolved Hide resolved
SPPearce and others added 2 commits May 2, 2024 09:52
Co-authored-by: Adam Talbot <12817534+adamrtalbot@users.noreply.github.com>
Co-authored-by: Adam Talbot <12817534+adamrtalbot@users.noreply.github.com>
@SPPearce SPPearce added this pull request to the merge queue May 3, 2024
Merged via the queue into nf-core:master with commit e1316cd May 3, 2024
27 checks passed
@SPPearce SPPearce mentioned this pull request Jul 31, 2024
17 tasks
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.

new module: FastQ-Screen new module: FastQ-Screen