Skip to content

Commit

Permalink
Merge pull request #86 from KevinMenden/dev
Browse files Browse the repository at this point in the history
cleaned up parameters
  • Loading branch information
KevinMenden authored May 12, 2021
2 parents 0b54f7b + b308737 commit f7c91d2
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 13 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ This release contains several major (potentially breaking) changes:
* Add `--mirtrace_protocol` parameter to allow for more flexible selection of this parameter
* Added `--trim_galore_max_length` option [[#77](https://github.com/nf-core/smrnaseq/issues/77)]
* Solved memory usage issue for mirtrace in the main process and in the `get_software_versions` process [[#68](https://github.com/nf-core/smrnaseq/issues/68)]
* Removed logging of `single_end` parameter and added missing parameters to schema and config files

### Packaged software updates

Expand Down
16 changes: 8 additions & 8 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ dependencies:
- conda-forge::python=3.7.3
- conda-forge::markdown=3.1.1
- conda-forge::pymdown-extensions=6.0
- conda-forge::pygments=2.6.1
- conda-forge::pigz=2.3.4
- conda-forge::pygments=2.9.0
- conda-forge::pigz=2.6

# bioconda packages
- bioconda::fastqc=0.11.9
- bioconda::trim-galore=0.6.5
- bioconda::samtools=1.9
- bioconda::bowtie=1.2.3
- bioconda::multiqc=1.9
- bioconda::trim-galore=0.6.6
- bioconda::samtools=1.12
- bioconda::bowtie=1.3.0
- bioconda::multiqc=1.10.1
- bioconda::mirtop=0.4.23
- bioconda::seqcluster=1.2.7
- bioconda::htseq=0.11.3
- bioconda::htseq=0.13.5
- bioconda::fastx_toolkit=0.0.14
- bioconda::seqkit=0.12.0
- bioconda::seqkit=0.16.0
- bioconda::mirtrace=1.0.1
- bioconda::bioconductor-edger=3.26.5
- bioconda::bioconductor-limma=3.40.2
Expand Down
1 change: 0 additions & 1 deletion main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ summary['Current path'] = "$PWD"
summary['Script dir'] = workflow.projectDir
summary['Config Profile'] = (workflow.profile == 'standard' ? 'UPPMAX' : workflow.profile)
summary['Fasta Ref'] = params.fasta
summary['Data Type'] = params.single_end ? 'Single-End' : 'Paired-End'
summary['Max Resources'] = "$params.max_memory memory, $params.max_cpus cpus, $params.max_time time per job"
if (workflow.containerEngine) summary['Container'] = "$workflow.containerEngine - $workflow.container"
summary['Output dir'] = params.outdir
Expand Down
10 changes: 6 additions & 4 deletions nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ params {
protocol = 'illumina'

// Reference genomes
genome = false
mirna_gtf = false
fasta = false
bt_index = false
genome = null
gtf = null
mirna_gtf = null
fasta = null
bt_index = null
bt_indices = null
mirtrace_species = false
mirtrace_protocol = false
references_parsed = false
Expand Down
9 changes: 9 additions & 0 deletions nextflow_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,15 @@
"fa_icon": "fas fa-ban",
"hidden": true,
"help_text": "Do not load `igenomes.config` when running the pipeline. You may choose this option if you observe clashes between custom parameters and those supplied in `igenomes.config`."
},
"gtf": {
"type": "string",
"description": "Path to reference genome GTF file",
"fa_icon": "fas fa-address-book"
},
"bt_indices": {
"type": "array",
"description": "List of bowtie index files"
}
}
},
Expand Down

0 comments on commit f7c91d2

Please sign in to comment.