Skip to content

Commit

Permalink
all tests work
Browse files Browse the repository at this point in the history
  • Loading branch information
priyanka-surana committed Sep 17, 2023
1 parent 24a9653 commit 1023126
Show file tree
Hide file tree
Showing 11 changed files with 66 additions and 156 deletions.
1 change: 1 addition & 0 deletions assets/test/mMelMel3.1.buscogenes.dmnd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"payload":{"allShortcutsEnabled":true,"fileTree":{"databases/uniprot":{"items":[{"name":"README.md","path":"databases/uniprot/README.md","contentType":"file"},{"name":"all.dmnd","path":"databases/uniprot/all.dmnd","contentType":"file"},{"name":"gfLaeSulp1.1.buscogenes.dmnd","path":"databases/uniprot/gfLaeSulp1.1.buscogenes.dmnd","contentType":"file"},{"name":"gfLaeSulp1.1.buscoregions.dmnd","path":"databases/uniprot/gfLaeSulp1.1.buscoregions.dmnd","contentType":"file"},{"name":"ilEraDefo1.1.buscogenes.dmnd","path":"databases/uniprot/ilEraDefo1.1.buscogenes.dmnd","contentType":"file"},{"name":"ilEraDefo1.1.buscoregions.dmnd","path":"databases/uniprot/ilEraDefo1.1.buscoregions.dmnd","contentType":"file"},{"name":"mCerEla1.1.buscogenes.dmnd","path":"databases/uniprot/mCerEla1.1.buscogenes.dmnd","contentType":"file"},{"name":"mCerEla1.1.buscoregions.dmnd","path":"databases/uniprot/mCerEla1.1.buscoregions.dmnd","contentType":"file"},{"name":"mMelMel3.1.buscogenes.dmnd","path":"databases/uniprot/mMelMel3.1.buscogenes.dmnd","contentType":"file"},{"name":"mMelMel3.1.buscoregions.dmnd","path":"databases/uniprot/mMelMel3.1.buscoregions.dmnd","contentType":"file"}],"totalCount":10},"databases":{"items":[{"name":"blast","path":"databases/blast","contentType":"directory"},{"name":"busco","path":"databases/busco","contentType":"directory"},{"name":"uniprot","path":"databases/uniprot","contentType":"directory"},{"name":"README.md","path":"databases/README.md","contentType":"file"}],"totalCount":4},"":{"items":[{"name":".github","path":".github","contentType":"directory"},{"name":"databases","path":"databases","contentType":"directory"},{"name":"examples","path":"examples","contentType":"directory"},{"name":"src","path":"src","contentType":"directory"},{"name":"tests","path":"tests","contentType":"directory"},{"name":".bumpversion.cfg","path":".bumpversion.cfg","contentType":"file"},{"name":".coveragerc","path":".coveragerc","contentType":"file"},{"name":".gitignore","path":".gitignore","contentType":"file"},{"name":".hostbumpversion.cfg","path":".hostbumpversion.cfg","contentType":"file"},{"name":".pipelinebumpversion.cfg","path":".pipelinebumpversion.cfg","contentType":"file"},{"name":".pre-commit-config.yaml","path":".pre-commit-config.yaml","contentType":"file"},{"name":".prebumpversion.cfg","path":".prebumpversion.cfg","contentType":"file"},{"name":".pylintrc","path":".pylintrc","contentType":"file"},{"name":".pylintrc_tests","path":".pylintrc_tests","contentType":"file"},{"name":".travis.yml","path":".travis.yml","contentType":"file"},{"name":"AUTHORS","path":"AUTHORS","contentType":"file"},{"name":"LICENSE","path":"LICENSE","contentType":"file"},{"name":"MANIFEST.in","path":"MANIFEST.in","contentType":"file"},{"name":"README.md","path":"README.md","contentType":"file"},{"name":"bump_full_version.sh","path":"bump_full_version.sh","contentType":"file"},{"name":"bump_npm_version.sh","path":"bump_npm_version.sh","contentType":"file"},{"name":"bump_versions.sh","path":"bump_versions.sh","contentType":"file"},{"name":"conftest.py","path":"conftest.py","contentType":"file"},{"name":"package-api.sh","path":"package-api.sh","contentType":"file"},{"name":"package-ui.sh","path":"package-ui.sh","contentType":"file"},{"name":"pip_install_latest.sh","path":"pip_install_latest.sh","contentType":"file"},{"name":"pre-commit.sh","path":"pre-commit.sh","contentType":"file"},{"name":"pyproject.toml","path":"pyproject.toml","contentType":"file"},{"name":"requirements.txt","path":"requirements.txt","contentType":"file"},{"name":"run_tests.sh","path":"run_tests.sh","contentType":"file"},{"name":"setup.cfg","path":"setup.cfg","contentType":"file"},{"name":"setup.py","path":"setup.py","contentType":"file"},{"name":"tox.ini","path":"tox.ini","contentType":"file"}],"totalCount":33}},"fileTreeProcessingTime":11.197347,"foldersToFetch":[],"reducedMotionEnabled":"system","repo":{"id":150091036,"defaultBranch":"main","name":"blobtoolkit","ownerLogin":"blobtoolkit","currentUserCanPush":false,"isFork":false,"isEmpty":false,"createdAt":"2018-09-24T12:14:37.000+01:00","ownerAvatar":"https://avatars.githubusercontent.com/u/29755752?v=4","public":true,"private":false,"isOrgOwned":true},"symbolsExpanded":true,"treeExpanded":true,"refInfo":{"name":"main","listCacheKey":"v0:1694702028.0","canEdit":true,"refType":"branch","currentOid":"4358be6e9c062a34248280e072bf7bb3067d3d76"},"path":"databases/uniprot/mMelMel3.1.buscogenes.dmnd","currentUser":{"id":86618929,"login":"priyanka-surana","userEmail":"[email protected]"},"blob":{"rawLines":[],"stylingDirectives":[],"csv":null,"csvError":null,"dependabotInfo":{"showConfigurationBanner":false,"configFilePath":null,"networkDependabotPath":"/blobtoolkit/blobtoolkit/network/updates","dismissConfigurationNoticePath":"/settings/dismiss-notice/dependabot_configuration_notice","configurationNoticeDismissed":false,"repoAlertsPath":"/blobtoolkit/blobtoolkit/security/dependabot","repoSecurityAndAnalysisPath":"/blobtoolkit/blobtoolkit/settings/security_analysis","repoOwnerIsOrg":true,"currentUserCanAdminRepo":false},"displayName":"mMelMel3.1.buscogenes.dmnd","displayUrl":"https://github.com/blobtoolkit/blobtoolkit/blob/main/databases/uniprot/mMelMel3.1.buscogenes.dmnd?raw=true","headerInfo":{"blobSize":"13.8 MB","deleteInfo":{"deleteTooltip":"Fork this repository and delete the file"},"editInfo":{"editTooltip":"Fork this repository and edit the file"},"ghDesktopPath":"x-github-client://openRepo/https://github.com/blobtoolkit/blobtoolkit?branch=main&filepath=databases%2Funiprot%2FmMelMel3.1.buscogenes.dmnd","gitLfsPath":null,"onBranch":true,"shortPath":"391345b","siteNavLoginPath":"/login?return_to=https%3A%2F%2Fgithub.com%2Fblobtoolkit%2Fblobtoolkit%2Fblob%2Fmain%2Fdatabases%2Funiprot%2FmMelMel3.1.buscogenes.dmnd","isCSV":false,"isRichtext":false,"toc":null,"lineInfo":{"truncatedLoc":null,"truncatedSloc":null},"mode":"file"},"image":false,"isCodeownersFile":null,"isPlain":false,"isValidLegacyIssueTemplate":false,"issueTemplateHelpUrl":"https://docs.github.com/articles/about-issue-and-pull-request-templates","issueTemplate":null,"discussionTemplate":null,"language":null,"languageID":null,"large":true,"loggedIn":true,"newDiscussionPath":"/blobtoolkit/blobtoolkit/discussions/new","newIssuePath":"/blobtoolkit/blobtoolkit/issues/new","planSupportInfo":{"repoIsFork":null,"repoOwnedByCurrentUser":null,"requestFullPath":"/blobtoolkit/blobtoolkit/blob/main/databases/uniprot/mMelMel3.1.buscogenes.dmnd","showFreeOrgGatedFeatureMessage":null,"showPlanSupportBanner":null,"upgradeDataAttributes":null,"upgradePath":null},"publishBannersInfo":{"dismissActionNoticePath":"/settings/dismiss-notice/publish_action_from_dockerfile","dismissStackNoticePath":"/settings/dismiss-notice/publish_stack_from_file","releasePath":"/blobtoolkit/blobtoolkit/releases/new?marketplace=true","showPublishActionBanner":false,"showPublishStackBanner":false},"renderImageOrRaw":true,"richText":null,"renderedFileInfo":null,"shortPath":null,"tabSize":8,"topBannersInfo":{"overridingGlobalFundingFile":false,"globalPreferredFundingPath":null,"repoOwner":"blobtoolkit","repoName":"blobtoolkit","showInvalidCitationWarning":false,"citationHelpUrl":"https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-citation-files","showDependabotConfigurationBanner":false,"actionsOnboardingTip":null},"truncated":true,"viewable":false,"workflowRedirectUrl":null,"symbols":{"timedOut":true,"notAnalyzed":true,"symbols":[],"error":{"code":"invalid_argument","msg":"content required","meta":{}}}},"copilotInfo":null,"csrf_tokens":{"/blobtoolkit/blobtoolkit/branches":{"post":"STXWe6zdi-htUJCnht4ZeaFRFmvPA0e3pcmsjeKVIesJLe7VG0zH88aT2wpTUyJGxbBa0glmb0EoP86-SgoITw"},"/repos/preferences":{"post":"44_BbrQaH1gWABjMUiFGJ4g3n2nVEC6B5DkFyy_H8wgUkMSDhhxFWPWOlSAqEMnyTDTvGCBS7SD_graJUHvo_A"}}},"title":"blobtoolkit/databases/uniprot/mMelMel3.1.buscogenes.dmnd at main · blobtoolkit/blobtoolkit"}
4 changes: 4 additions & 0 deletions assets/test/samplesheet_raw.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
sample,datatype,datafile
mMelMel1,illumina,/lustre/scratch123/tol/resources/nextflow/test-data/Meles_meles/genomic_data/mMelMel1/illumina/31231_3#1_subset.cram
mMelMel2,illumina,/lustre/scratch123/tol/resources/nextflow/test-data/Meles_meles/genomic_data/mMelMel2/illumina/31231_4#1_subset.cram
mMelMel3,hic,/lustre/scratch123/tol/resources/nextflow/test-data/Meles_meles/genomic_data/mMelMel3/hic-arima2/35528_2#1_subset.cram
36 changes: 36 additions & 0 deletions conf/test_raw.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Nextflow config file for running minimal tests
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Defines input files and everything required to run a fast and simple pipeline test.
Use as follows:
nextflow run sanger-tol/blobtoolkit -profile test_raw,<docker/singularity> --outdir <OUTDIR>
----------------------------------------------------------------------------------------
*/

params {
config_profile_name = 'Test profile'
config_profile_description = 'Minimal test dataset to check pipeline function'

// Limit resources so that this can run on GitHub Actions
max_cpus = 2
max_memory = '6.GB'
max_time = '6.h'

// Input test data
// Specify the paths to your test data
// Give any required params for the test so that command line flags are not needed
input = "${projectDir}/assets/test/samplesheet_raw.csv"

// Fasta references
fasta = "/lustre/scratch123/tol/resources/nextflow/test-data/Meles_meles/assembly/release/mMelMel3.1_paternal_haplotype/GCA_922984935.2.subset.fasta.gz"
accession = "GCA_922984935.2"
taxon = "Meles meles"

// Databases
taxdump = "/lustre/scratch123/tol/teams/grit/geval_pipeline/btk_databases/taxdump"
busco = "/lustre/scratch123/tol/resources/nextflow/busco_2021_06_reduced/"
uniprot = "${projectDir}/assets/test/mCerEla1.1.buscogenes.dmnd"
}
57 changes: 13 additions & 44 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,94 +8,63 @@
"busco": {
"branch": "master",
"git_sha": "6d6552cb582f56b6101c452e16ee7c23073f91de",
"installed_by": [
"modules"
],
"installed_by": ["modules"],
"patch": "modules/nf-core/busco/busco.diff"
},
"custom/dumpsoftwareversions": {
"branch": "master",
"git_sha": "05c280924b6c768d484c7c443dad5e605c4ff4b4",
"installed_by": [
"modules"
]
"installed_by": ["modules"]
},
"diamond/blastp": {
"branch": "master",
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
"installed_by": [
"modules"
]
"installed_by": ["modules"]
},
"fastawindows": {
"branch": "master",
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
"installed_by": [
"modules"
]
"installed_by": ["modules"]
},
"goat/taxonsearch": {
"branch": "master",
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
"installed_by": [
"modules"
]
"installed_by": ["modules"]
},
"gunzip": {
"branch": "master",
"git_sha": "e06548bfa36ee31869b81041879dd6b3a83b1d57",
"installed_by": [
"modules"
]
"installed_by": ["modules"]
},
"minimap2/align": {
"branch": "master",
"git_sha": "603ecbd9f45300c9788f197d2a15a005685b4220",
"installed_by": [
"modules"
]
"installed_by": ["modules"]
},
"mosdepth": {
"branch": "master",
"git_sha": "ebb27711cd5f4de921244bfa81c676504072d31c",
"installed_by": [
"modules"
]
"installed_by": ["modules"]
},
"multiqc": {
"branch": "master",
"git_sha": "a6e11ac655e744f7ebc724be669dd568ffdc0e80",
"installed_by": [
"modules"
]
"installed_by": ["modules"]
},
"samtools/fasta": {
"branch": "master",
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
"installed_by": [
"modules"
]
"installed_by": ["modules"]
},
"samtools/index": {
"branch": "master",
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
"installed_by": [
"modules"
]
},
"samtools/sort": {
"branch": "master",
"git_sha": "a0f7be95788366c1923171e358da7d049eb440f9",
"installed_by": [
"modules"
]
"installed_by": ["modules"]
},
"samtools/view": {
"branch": "master",
"git_sha": "3ffae3598260a99e8db3207dead9f73f87f90d1f",
"installed_by": [
"modules"
]
"installed_by": ["modules"]
}
}
},
Expand All @@ -104,4 +73,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion modules/nf-core/busco/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 0 additions & 49 deletions modules/nf-core/samtools/sort/main.nf

This file was deleted.

48 changes: 0 additions & 48 deletions modules/nf-core/samtools/sort/meta.yml

This file was deleted.

2 changes: 2 additions & 0 deletions nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ params {
// Input options
input = null
yaml = null
align = false

// Reference options
fasta = null
Expand Down Expand Up @@ -177,6 +178,7 @@ profiles {
}
cleanup { cleanup = true }
test { includeConfig 'conf/test.config' }
test_raw { includeConfig 'conf/test_raw.config }
test_full { includeConfig 'conf/test_full.config' }
}
Expand Down
6 changes: 1 addition & 5 deletions subworkflows/local/coverage_stats.nf
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ workflow COVERAGE_STATS {
| map { meta, cram -> [ meta, cram, [] ] }
| set { ch_cram_crai}

fasta
| map { meta, fasta -> fasta }
| set { ch_fasta }

SAMTOOLS_VIEW ( ch_cram_crai, ch_fasta, [] )
SAMTOOLS_VIEW ( ch_cram_crai, fasta, [] )
ch_versions = ch_versions.mix ( SAMTOOLS_VIEW.out.versions.first() )

SAMTOOLS_VIEW.out.bam
Expand Down
15 changes: 7 additions & 8 deletions subworkflows/local/minimap_alignment.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
// Optional alignment subworkflow using Minimap2
//

include { SAMTOOLS_FASTA } from '../../../modules/nf-core/samtools/fasta/main'
include { MINIMAP2_ALIGN as MINIMAP2_HIC } from '../../../modules/nf-core/minimap2/align/main'
include { MINIMAP2_ALIGN as MINIMAP2_ILMN } from '../../../modules/nf-core/minimap2/align/main'
include { MINIMAP2_ALIGN as MINIMAP2_CCS } from '../../../modules/nf-core/minimap2/align/main'
include { MINIMAP2_ALIGN as MINIMAP2_CLR } from '../../../modules/nf-core/minimap2/align/main'
include { MINIMAP2_ALIGN as MINIMAP2_ONT } from '../../../modules/nf-core/minimap2/align/main'
include { SAMTOOLS_SORT } from '../../../modules/nf-core/samtools/sort/main'
include { SAMTOOLS_INDEX } from '../../../modules/nf-core/samtools/index/main'
include { SAMTOOLS_FASTA } from '../../modules/nf-core/samtools/fasta/main'
include { MINIMAP2_ALIGN as MINIMAP2_HIC } from '../../modules/nf-core/minimap2/align/main'
include { MINIMAP2_ALIGN as MINIMAP2_ILMN } from '../../modules/nf-core/minimap2/align/main'
include { MINIMAP2_ALIGN as MINIMAP2_CCS } from '../../modules/nf-core/minimap2/align/main'
include { MINIMAP2_ALIGN as MINIMAP2_CLR } from '../../modules/nf-core/minimap2/align/main'
include { MINIMAP2_ALIGN as MINIMAP2_ONT } from '../../modules/nf-core/minimap2/align/main'
include { SAMTOOLS_INDEX } from '../../modules/nf-core/samtools/index/main'


workflow MINIMAP2_ALIGNMENT {
Expand Down
Loading

0 comments on commit 1023126

Please sign in to comment.