Merge pull request #280 from ewels/master

Changelog version number. Tidy up template summary logs

CHANGELOG.md

@@ -1,6 +1,6 @@
 # nf-core/tools: Changelog
 
-## v1.5dev
+## [v1.5](https://github.com/nf-core/tools/releases/tag/1.5) - 2019-03-13 Iron Shark
 
 #### Template pipeline
 * Dropped Singularity file

nf_core/pipeline-template/{{cookiecutter.name_noslash}}/main.nf

@@ -124,36 +124,28 @@ if(params.readPaths){
 // Header log info
 log.info nfcoreHeader()
 def summary = [:]
-summary['Pipeline Name']    = '{{ cookiecutter.name }}'
-summary['Pipeline Version'] = workflow.manifest.version
 summary['Run Name']         = custom_runName ?: workflow.runName
 // TODO nf-core: Report custom parameters here
 summary['Reads']            = params.reads
 summary['Fasta Ref']        = params.fasta
 summary['Data Type']        = params.singleEnd ? 'Single-End' : 'Paired-End'
-summary['Max Memory']       = params.max_memory
-summary['Max CPUs']         = params.max_cpus
-summary['Max Time']         = params.max_time
-summary['Output Dir']       = params.outdir
-summary['Working Dir']      = workflow.workDir
-summary['Container Engine'] = workflow.containerEngine
-if(workflow.containerEngine) summary['Container'] = workflow.container
-summary['Current Home']     = "$HOME"
-summary['Current User']     = "$USER"
-summary['Current Path']     = "$PWD"
-summary['Working Dir']      = workflow.workDir
-summary['Output Dir']       = params.outdir
-summary['Script Dir']       = workflow.projectDir
-summary['Config']   = workflow.profile
+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
+summary['Launch dir']       = workflow.launchDir
+summary['Working dir']      = workflow.workDir
+summary['Script dir']       = workflow.projectDir
+summary['User']             = workflow.userName
+if(workflow.profile == 'awsbatch'){
+   summary['AWS Region']    = params.awsregion
+   summary['AWS Queue']     = params.awsqueue
+}
+summary['Config Profile'] = workflow.profile
 if(params.config_profile_description) summary['Config Description'] = params.config_profile_description
 if(params.config_profile_contact)     summary['Config Contact']     = params.config_profile_contact
 if(params.config_profile_url)         summary['Config URL']         = params.config_profile_url
-if(workflow.profile == 'awsbatch'){
-   summary['AWS Region'] = params.awsregion
-   summary['AWS Queue']  = params.awsqueue
-}
 if(params.email) {
-  summary['E-mail Address'] = params.email
+  summary['E-mail Address']  = params.email
   summary['MultiQC maxsize'] = params.maxMultiqcEmailFileSize
 }
 log.info summary.collect { k,v -> "${k.padRight(18)}: $v" }.join("\n")
@@ -162,7 +154,6 @@ log.info "\033[2m----------------------------------------------------\033[0m"
 // Check the hostnames against configured profiles
 checkHostname()
 
-
 def create_workflow_summary(summary) {
     def yaml_file = workDir.resolve('workflow_summary_mqc.yaml')
     yaml_file.text  = """