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

Update modules to use absolute path data #249

Merged
merged 8 commits into from
Jan 14, 2024

Conversation

adamrtalbot
Copy link
Contributor

@adamrtalbot adamrtalbot commented Jan 12, 2024

Changes:

  • Modules updated
  • Now use absolute paths for test data
  • All modules tests should work within the this repository

To do:

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 you've added a new tool - have you followed the pipeline conventions in the contribution docs
  • If necessary, also make a PR on the nf-core/fetchngs branch on the nf-core/test-datasets repository.
  • Make sure your code lints (nf-core lint).
  • Ensure the test suite passes (nextflow run . -profile test,docker --outdir <OUTDIR>).
  • Usage Documentation in docs/usage.md is updated.
  • Output Documentation in docs/output.md is updated.
  • CHANGELOG.md is updated.
  • README.md is updated (including new tool citations and authors/contributors).

Changes:
 - Modules updated
 - Now use absolute paths for test data
 - All modules tests should work within the this repository
@adamrtalbot adamrtalbot marked this pull request as draft January 12, 2024 09:51
Copy link

github-actions bot commented Jan 12, 2024

nf-core lint overall result: Passed ✅ ⚠️

Posted for pipeline commit 30031c0

+| ✅ 136 tests passed       |+
#| ❔  12 tests were ignored |#
!| ❗   6 tests had warnings |!

❗ Test warnings:

  • files_exist - File not found: assets/multiqc_config.yml
  • files_exist - File not found: conf/igenomes.config
  • files_exist - File not found: .github/workflows/awstest.yml
  • files_exist - File not found: .github/workflows/awsfulltest.yml
  • files_exist - File not found: lib/WorkflowFetchngs.groovy
  • pipeline_todos - TODO string in methods_description_template.yml: #Update the HTML below to your preferred methods description, e.g. add publication citation for this pipeline

❔ Tests ignored:

  • files_exist - File is ignored: conf/modules.config
  • files_exist - File is ignored: lib/NfcoreTemplate.groovy
  • files_exist - File is ignored: lib/Utils.groovy
  • files_exist - File is ignored: lib/WorkflowMain.groovy
  • files_exist - File is ignored: lib/nfcore_external_java_deps.jar
  • files_unchanged - File ignored due to lint config: assets/sendmail_template.txt
  • files_unchanged - File does not exist: lib/nfcore_external_java_deps.jar
  • files_unchanged - File does not exist: lib/NfcoreTemplate.groovy
  • files_unchanged - File ignored due to lint config: .gitignore or .prettierignore or pyproject.toml
  • actions_ci - actions_ci
  • actions_awstest - 'awstest.yml' workflow not found: /home/runner/work/fetchngs/fetchngs/.github/workflows/awstest.yml
  • multiqc_config - 'assets/multiqc_config.yml' not found

✅ Tests passed:

Run details

  • nf-core/tools version 2.11.1
  • Run at 2024-01-12 17:40:23

@adamrtalbot
Copy link
Contributor Author

First draft looks good - we might want to wait for nf-core/modules#4723 and change base path for consistency. TBC.

@adamrtalbot
Copy link
Contributor Author

I can't seem to run this locally so can't see what's wrong. Will have to spin up a VM and try there.

@adamrtalbot adamrtalbot marked this pull request as ready for review January 12, 2024 17:30
Copy link
Member

@maxulysse maxulysse left a comment

Choose a reason for hiding this comment

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

Lgtm

@drpatelh
Copy link
Member

You deleted all of the nextflow.log files!! Need to restore them.

@drpatelh
Copy link
Member

You were basically stung by this nf-core/tools#2658

@@ -3,5 +3,3 @@ includeConfig "../../modules/local/sra_fastq_ftp/nextflow.config"
includeConfig "../../modules/local/sra_ids_to_runinfo/nextflow.config"
includeConfig "../../modules/local/sra_runinfo_to_ftp/nextflow.config"
includeConfig "../../modules/local/sra_to_samplesheet/nextflow.config"
includeConfig "../../modules/nf-core/sratools/prefetch/nextflow.config"
includeConfig "../../subworkflows/nf-core/fastq_download_prefetch_fasterqdump_sratools/nextflow.config"
Copy link
Member

@drpatelh drpatelh Jan 12, 2024

Choose a reason for hiding this comment

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

Don't we need this line here? Why was it deleted?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The config files were deleted, looks like by nf-core tools. Will add them all back in.

{ assert new File("$outputDir/fastq/DRX026011_DRR028935_1.fastq.gz").exists() },
{ assert new File("$outputDir/fastq/DRX026011_DRR028935_2.fastq.gz").exists() },
{ assert new File("$outputDir/fastq/ERX1234253_ERR1160846.fastq.gz").exists() },
{ assert new File("$outputDir/fastq/SRX10940790_SRR14593545_1.fastq.gz").exists() },
Copy link
Member

Choose a reason for hiding this comment

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

Why did we change this test file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorted it properly.

Copy link
Member

@drpatelh drpatelh left a comment

Choose a reason for hiding this comment

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

Thank you! Will fix adding configs back in a follow up PR.

@drpatelh drpatelh merged commit 8a55a59 into nf-core:dev Jan 14, 2024
21 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