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

Template update v2.7.2 #224

Merged
merged 9 commits into from
Jan 27, 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
4 changes: 2 additions & 2 deletions .github/workflows/fix-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ jobs:
id: prettier_status
run: |
if prettier --check ${GITHUB_WORKSPACE}; then
echo "name=result::pass" >> $GITHUB_OUTPUT
echo "result=pass" >> $GITHUB_OUTPUT
else
echo "name=result::fail" >> $GITHUB_OUTPUT
echo "result=fail" >> $GITHUB_OUTPUT
fi

- name: Run 'prettier --write'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linting_comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- name: Get PR number
id: pr_number
run: echo "name=pr_number::$(cat linting-logs/PR_number.txt)" >> $GITHUB_OUTPUT
run: echo "pr_number=$(cat linting-logs/PR_number.txt)" >> $GITHUB_OUTPUT

- name: Post PR comment
uses: marocchino/sticky-pull-request-comment@v2
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,28 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Added pipeline overview diagram and metro map.
- Added full logs to `enchantr report filesize` process.
- Template update to nf-core tools v2.7.1
- Template update to nf-core tools v2.7.2

### `Fixed`

- Fixed bug arising when not providing `--index_file FALSE` for some input options not requiring index files.

### `Dependencies`

| Dependency | Old version | New version |
| ---------- | ----------- | ----------- |
| multiqc | 1.13 | 1.14 |
| pandas | 1.1.5 | 1.5.3 |
| presto | 0.7.0 | 0.7.1 |
| changeo | 1.2.0 | 1.3.0 |
| igblast | 1.17.1 | 1.19.0 |
| r-enchantr | | 0.0.6 |
| r-plotly | | 4.10.1 |

### `Deprecated`

- Deprecated param `enable_conda`

## [2.4.0] 2022-12-05 "Aparecium"

### `Added`
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) Gisela Gabernet, Simon Heumos, Alexander Peltzer
Copyright (c) Gisela Gabernet, Susanna Marquez, Alexander Peltzer, Simon Heumos

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion lib/WorkflowMain.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class WorkflowMain {
NfcoreTemplate.checkConfigProvided(workflow, log)

// Check that conda channels are set-up correctly
if (params.enable_conda) {
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
Utils.checkCondaChannels(log)
}

Expand Down
6 changes: 3 additions & 3 deletions modules/local/fetch_databases.nf
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ process FETCH_DATABASES {
label 'process_low'
label 'immcantation'

conda "bioconda::changeo=1.2.0 bioconda::igblast=1.17.1 conda-forge::wget=1.20.1"
conda "bioconda::changeo=1.3.0 bioconda::igblast=1.19.0 conda-forge::wget=1.20.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/mulled-v2-7d8e418eb73acc6a80daea8e111c94cf19a4ecfd:e7f88c6f7da46a5407f261ca406c050d5bd12dea-0' :
'quay.io/biocontainers/mulled-v2-7d8e418eb73acc6a80daea8e111c94cf19a4ecfd:e7f88c6f7da46a5407f261ca406c050d5bd12dea-0' }"
'https://depot.galaxyproject.org/singularity/mulled-v2-7d8e418eb73acc6a80daea8e111c94cf19a4ecfd:00534555924705cdf2f7ac48b4b8b4083527ca58-1' :
'quay.io/biocontainers/mulled-v2-7d8e418eb73acc6a80daea8e111c94cf19a4ecfd:00534555924705cdf2f7ac48b4b8b4083527ca58-1' }"

output:
path("igblast_base"), emit: igblast
Expand Down
2 changes: 1 addition & 1 deletion modules/local/samplesheet_check.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ process SAMPLESHEET_CHECK {
tag "$samplesheet"
label 'process_single'

conda "conda-forge::pandas=1.1.5"
conda "conda-forge::pandas=1.5.3"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/pandas:1.1.5' :
'quay.io/biocontainers/pandas:1.1.5' }"
Expand Down
18 changes: 0 additions & 18 deletions nextflow_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -407,21 +407,6 @@
},
"fa_icon": "far fa-file-code"
},
"software_packaging_options": {
"title": "Software packaging options",
"type": "object",
"description": "Options for software packaging",
"default": "",
"properties": {
"enable_conda": {
"type": "boolean",
"fa_icon": "fas fa-box",
"description": "Enable conda to run pipeline with conda environment."
}
},
"help_text": "Software packaging options",
"fa_icon": "fas fa-angle-double-right"
},
"reference_genome_options": {
"title": "Reference genome options",
"type": "object",
Expand Down Expand Up @@ -670,9 +655,6 @@
{
"$ref": "#/definitions/report_options"
},
{
"$ref": "#/definitions/software_packaging_options"
},
{
"$ref": "#/definitions/reference_genome_options"
},
Expand Down