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

PROFILES: test -> test_cache + restore test #1026

Merged
merged 5 commits into from
May 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:

- name: Run pipeline with test data
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results --test_data_base ${{ github.workspace }}/test-datasets/
nextflow run ${GITHUB_WORKSPACE} -profile test_cache,docker --outdir ./results --test_data_base ${{ github.workspace }}/test-datasets/

star_salmon:
name: Test STAR Salmon with workflow parameters
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:

- name: Run pipeline with STAR and various parameters
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --aligner star_salmon ${{ matrix.parameters }} --outdir ./results --test_data_base ${{ github.workspace }}/test-datasets/
nextflow run ${GITHUB_WORKSPACE} -profile test_cache,docker --aligner star_salmon ${{ matrix.parameters }} --outdir ./results --test_data_base ${{ github.workspace }}/test-datasets/

star_rsem:
name: Test STAR RSEM with workflow parameters
Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:

- name: Run pipeline with RSEM STAR and various parameters
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --aligner star_rsem ${{ matrix.parameters }} --outdir ./results --test_data_base ${{ github.workspace }}/test-datasets/
nextflow run ${GITHUB_WORKSPACE} -profile test_cache,docker --aligner star_rsem ${{ matrix.parameters }} --outdir ./results --test_data_base ${{ github.workspace }}/test-datasets/

hisat2:
name: Test HISAT2 with workflow parameters
Expand Down Expand Up @@ -230,7 +230,7 @@ jobs:

- name: Run pipeline with HISAT2 and various parameters
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --aligner hisat2 ${{ matrix.parameters }} --outdir ./results --test_data_base ${{ github.workspace }}/test-datasets/
nextflow run ${GITHUB_WORKSPACE} -profile test_cache,docker --aligner hisat2 ${{ matrix.parameters }} --outdir ./results --test_data_base ${{ github.workspace }}/test-datasets/

salmon:
name: Test Salmon with workflow parameters
Expand Down Expand Up @@ -281,4 +281,4 @@ jobs:

- name: Run pipeline with Salmon and various parameters
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --pseudo_aligner salmon ${{ matrix.parameters }} --outdir ./results --test_data_base ${{ github.workspace }}/test-datasets/
nextflow run ${GITHUB_WORKSPACE} -profile test_cache,docker --pseudo_aligner salmon ${{ matrix.parameters }} --outdir ./results --test_data_base ${{ github.workspace }}/test-datasets/
23 changes: 11 additions & 12 deletions conf/test.config
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,19 @@ params {


// Input data
// params.test_data_base (default) = 'https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq3/'
input = "${params.test_data_base}/samplesheet/v3.10/samplesheet_test.csv"
input = "https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq/samplesheet/v3.10/samplesheet_test.csv"

// Genome references
fasta = "${params.test_data_base}/reference/genome.fasta"
gtf = "${params.test_data_base}/reference/genes.gtf.gz"
gff = "${params.test_data_base}/reference/genes.gff.gz"
transcript_fasta = "${params.test_data_base}/reference/transcriptome.fasta"
additional_fasta = "${params.test_data_base}/reference/gfp.fa.gz"

bbsplit_fasta_list = "${params.test_data_base}/reference/bbsplit_fasta_list.txt"
hisat2_index = "${params.test_data_base}/reference/hisat2.tar.gz"
salmon_index = "${params.test_data_base}/reference/salmon.tar.gz"
rsem_index = "${params.test_data_base}/reference/rsem.tar.gz"
fasta = "https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq3/reference/genome.fasta"
gtf = "https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq3/reference/genes.gtf.gz"
gff = "https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq3/reference/genes.gff.gz"
transcript_fasta = "https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq3/reference/transcriptome.fasta"
additional_fasta = "https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq3/reference/gfp.fa.gz"

bbsplit_fasta_list = "https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq3/reference/bbsplit_fasta_list.txt"
hisat2_index = "https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq3/reference/hisat2.tar.gz"
salmon_index = "https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq3/reference/salmon.tar.gz"
rsem_index = "https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq3/reference/rsem.tar.gz"

// Other parameters
skip_bbsplit = false
Expand Down
50 changes: 50 additions & 0 deletions conf/test_cache.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Nextflow config file for running minimal tests
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Nextflow config file for running minimal tests
Nextflow config file for running minimal tests using cached / offline test data

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Defines input files and everything required to run a fast and simple pipeline test.

Use as follows:
nextflow run nf-core/rnaseq -profile test,<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 data
// params.test_data_base (default) = 'https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq3/'
input = "${params.test_data_base}/samplesheet/v3.10/samplesheet_test.csv"

// Genome references
fasta = "${params.test_data_base}/reference/genome.fasta"
gtf = "${params.test_data_base}/reference/genes.gtf.gz"
gff = "${params.test_data_base}/reference/genes.gff.gz"
transcript_fasta = "${params.test_data_base}/reference/transcriptome.fasta"
additional_fasta = "${params.test_data_base}/reference/gfp.fa.gz"

bbsplit_fasta_list = "${params.test_data_base}/reference/bbsplit_fasta_list.txt"
hisat2_index = "${params.test_data_base}/reference/hisat2.tar.gz"
salmon_index = "${params.test_data_base}/reference/salmon.tar.gz"
rsem_index = "${params.test_data_base}/reference/rsem.tar.gz"

// Other parameters
skip_bbsplit = false
pseudo_aligner = 'salmon'
umitools_bc_pattern = 'NNNN'
}

// When using RSEM, remove warning from STAR whilst building tiny indices
process {
withName: 'RSEM_PREPAREREFERENCE_GENOME' {
ext.args2 = "--genomeSAindexNbases 7"
}
}
5 changes: 3 additions & 2 deletions nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,9 @@ profiles {
public_aws_ecr {
includeConfig 'conf/public_aws_ecr.config'
}
test { includeConfig 'conf/test.config' }
test_full { includeConfig 'conf/test_full.config' }
test { includeConfig 'conf/test.config' }
test_cache { includeConfig 'conf/test_cache.config' }
test_full { includeConfig 'conf/test_full.config' }
test_full_aws {
includeConfig 'conf/test_full.config'
}
Expand Down