Skip to content

Commit

Permalink
Merge branch 'dev' into samplsheet-for-taxprofiler
Browse files Browse the repository at this point in the history
  • Loading branch information
jfy133 authored Oct 27, 2024
2 parents 0163690 + 4ec184d commit 535747c
Show file tree
Hide file tree
Showing 11 changed files with 2,634 additions and 82 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: octokit/[email protected]
if: github.event_name != 'workflow_dispatch'
id: check_approvals
with:
route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews
route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews?per_page=100
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- id: test_variables
Expand Down
2 changes: 1 addition & 1 deletion .nf-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ template:
org: nf-core
outdir: .
skip_features: null
version: 3.1.1dev
version: 3.2.0
update: null
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 3.2.0 [2024-10-25]
## 3.2.0 [2024-10-27]

### `Added`

Expand Down
4 changes: 2 additions & 2 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -263,13 +263,13 @@ process {
}

withName: METASPADES {
ext.args = params.spades_options ?: '--meta'
ext.args = params.spades_options ? params.spades_options + ' --meta' : '--meta'
ext.prefix = { "SPAdes-${meta.id}" }
publishDir = [path: { "${params.outdir}/Assembly/SPAdes" }, mode: params.publish_dir_mode, pattern: "*.{fasta.gz,gfa.gz,fa.gz,log}"]
}

withName: METASPADESHYBRID {
ext.args = params.spades_options ?: '--meta'
ext.args = params.spades_options ? params.spades_options + ' --meta' : '--meta'
ext.prefix = { "SPAdesHybrid-${meta.id}" }
publishDir = [path: { "${params.outdir}/Assembly/SPAdesHybrid" }, mode: params.publish_dir_mode, pattern: "*.{fasta.gz,gfa.gz,fa.gz,log}"]
}
Expand Down
4 changes: 2 additions & 2 deletions conf/test_full.config
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ params {
skip_gtdbtk = true

// TODO TEMPORARY: deactivate SPAdes due to incompatibility of container with fusion file system
skip_spades = false
skip_spadeshybrid = false
skip_spades = true
skip_spadeshybrid = true

// reproducibility options for assembly
spades_fix_cpus = 10
Expand Down
Binary file modified docs/images/mag_workflow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions docs/images/mag_workflow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/mag_workflow_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 535747c

Please sign in to comment.