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

Dev -> Master 2.7.1 #449

Merged
merged 16 commits into from
Oct 27, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

env:
NXF_ANSI_LOG: false
NFT_VER: "0.9.0"
NFT_VER: "0.9.1"
NFT_WORKDIR: "~"
NFT_DIFF: "pdiff"
NFT_DIFF_ARGS: "--line-numbers --width 120 --expand-tabs=2"
Expand Down
9 changes: 4 additions & 5 deletions .nf-core.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
bump_version: null
lint:
actions_ci: false
files_exist:
- lib/nfcore_external_java_deps.jar
- conf/modules.config
modules_config: false
nf_core_version: 3.0.2
org_path: null
org_path:
repository_type: pipeline
template:
author: Phil Ewels, Sateesh Peri
Expand All @@ -17,6 +16,6 @@ template:
name: methylseq
org: nf-core
outdir: .
skip_features: null
version: 2.7.0
update: null
skip_features:
version: 2.7.1
update:
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# nf-core/methylseq

## [v2.7.1](https://github.com/nf-core/methylseq/releases/tag/2.7.1) - [2024-10-27]

### Bug fixes & refactoring

- 🐛 fix fasta symlink in bismark & bwameth align modules [#448](https://github.com/nf-core/methylseq/pull/448)

### Pipeline Updates

## [v2.7.0](https://github.com/nf-core/methylseq/releases/tag/2.7.0) - [2024-10-25]

### Bug fixes & refactoring
Expand Down
7 changes: 4 additions & 3 deletions assets/multiqc_config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
report_comment: >
This report has been generated by the <a href="https://github.com/nf-core/methylseq/releases/tag/2.7.0" target="_blank">nf-core/methylseq</a>
analysis pipeline. For information about how to interpret these results, please see the
<a href="https://nf-co.re/methylseq/2.7.0/docs/output" target="_blank">documentation</a>.
This report has been generated by the <a href="https://github.com/nf-core/methylseq/releases/tag/2.7.1"
target="_blank">nf-core/methylseq</a> analysis pipeline. For information about how
to interpret these results, please see the <a href="https://nf-co.re/methylseq/2.7.1/docs/output"
target="_blank">documentation</a>.
report_section_order:
"nf-core-methylseq-methods-description":
order: -1000
Expand Down
8 changes: 4 additions & 4 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"nf-core": {
"bismark/align": {
"branch": "master",
"git_sha": "9c4438173b1fcbf3f9004080e3af74af19d5f56e",
"git_sha": "dfd89399e3c6e2422c4cdcf0aaa8cf2393dc51c9",
"installed_by": ["modules"]
},
"bismark/coverage2cytosine": {
Expand Down Expand Up @@ -37,12 +37,12 @@
},
"bismark/summary": {
"branch": "master",
"git_sha": "0755c617637d21b2c290b26d225debe3070aa109",
"git_sha": "dfd89399e3c6e2422c4cdcf0aaa8cf2393dc51c9",
"installed_by": ["modules"]
},
"bwameth/align": {
"branch": "master",
"git_sha": "9c4438173b1fcbf3f9004080e3af74af19d5f56e",
"git_sha": "dfd89399e3c6e2422c4cdcf0aaa8cf2393dc51c9",
"installed_by": ["modules"]
},
"bwameth/index": {
Expand Down Expand Up @@ -127,7 +127,7 @@
},
"trimgalore": {
"branch": "master",
"git_sha": "49f4e50534fe4b64101e62ea41d5dc43b1324358",
"git_sha": "8c5eeedd45e295fc9a4f164631da6a8b37e6b9c6",
"installed_by": ["modules"]
},
"untar": {
Expand Down
4 changes: 1 addition & 3 deletions modules/nf-core/bismark/align/main.nf

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

25 changes: 20 additions & 5 deletions modules/nf-core/bismark/align/tests/main.nf.test

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

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

8 changes: 0 additions & 8 deletions modules/nf-core/bismark/align/tests/nextflow_hisat2.config

This file was deleted.

This file was deleted.

12 changes: 7 additions & 5 deletions modules/nf-core/bismark/coverage2cytosine/nextflow.config

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

2 changes: 1 addition & 1 deletion modules/nf-core/bismark/summary/main.nf

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

4 changes: 1 addition & 3 deletions modules/nf-core/bwameth/align/main.nf

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

2 changes: 1 addition & 1 deletion modules/nf-core/trimgalore/environment.yml

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

4 changes: 2 additions & 2 deletions modules/nf-core/trimgalore/main.nf

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

20 changes: 10 additions & 10 deletions modules/nf-core/trimgalore/tests/main.nf.test.snap

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

2 changes: 1 addition & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ manifest {
description = """Methylation (Bisulfite-Sequencing) Best Practice analysis pipeline, part of the nf-core community."""
mainScript = 'main.nf'
nextflowVersion = '!>=24.04.2'
version = '2.7.0'
version = '2.7.1'
doi = '10.5281/zenodo.1343417'
}

Expand Down
2 changes: 1 addition & 1 deletion subworkflows/local/bwameth/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ workflow BWAMETH {
PICARD_MARKDUPLICATES (
SAMTOOLS_SORT.out.bam,
fasta,
fasta_index.map{ fasta_index -> [[:], fasta_index]},
fasta_index.map{ index -> [[:], index]},
)
PICARD_MARKDUPLICATES.out.bam.dump(tag: 'BWAMETH/PICARD_MARKDUPLICATES: bam')
/*
Expand Down
Loading
Loading