Skip to content

Commit 5db8166

Browse files
authored
Merge pull request #38 from MPUSP/dev
feat: update CI and config schema
2 parents 82f180e + 61dcc4e commit 5db8166

9 files changed

Lines changed: 63 additions & 152 deletions

File tree

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
name: Lint PR
1+
name: Conventional PRs
2+
23
on:
34
pull_request_target:
45
types:
@@ -11,10 +12,5 @@ permissions:
1112
pull-requests: read
1213

1314
jobs:
14-
main:
15-
name: Validate PR title
16-
runs-on: ubuntu-latest
17-
steps:
18-
- uses: amannn/action-semantic-pull-request@v5
19-
env:
20-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
conventional-prs:
16+
uses: MPUSP/mpusp-github-actions/.github/workflows/conventional-prs.yml@main
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Deploy Apptainer
2+
3+
on:
4+
workflow_run:
5+
workflows: ["Release Please"]
6+
types:
7+
- completed
8+
workflow_dispatch:
9+
10+
permissions:
11+
contents: read
12+
packages: write
13+
14+
jobs:
15+
deploy-apptainer:
16+
if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
17+
uses: MPUSP/mpusp-github-actions/.github/workflows/deploy-apptainer.yml@main

.github/workflows/deploy_apptainer.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.

.github/workflows/main.yml

Lines changed: 0 additions & 56 deletions
This file was deleted.
Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
1+
name: Release Please
2+
13
on:
24
push:
3-
branches:
4-
- main
5+
branches: [main]
56

67
permissions:
78
contents: write
89
pull-requests: write
910
issues: write
1011

11-
name: release-please
12-
1312
jobs:
1413
release-please:
15-
runs-on: ubuntu-latest
16-
steps:
17-
- uses: googleapis/release-please-action@v4
18-
with:
19-
token: ${{ secrets.GITHUB_TOKEN }}
20-
release-type: go # just keep a changelog, no version anywhere outside of git tags
14+
uses: MPUSP/mpusp-github-actions/.github/workflows/release-please.yml@main
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Snakemake Tests
2+
3+
on:
4+
pull_request:
5+
branches: [main]
6+
7+
jobs:
8+
snakemake-tests:
9+
uses: MPUSP/mpusp-github-actions/.github/workflows/snakemake-tests.yml@main
10+
with:
11+
cores: 2
12+
dryrun: true

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
# snakemake-ont-basecalling
22

3-
[![Snakemake](https://img.shields.io/badge/snakemake-≥8.24.1-brightgreen.svg)](https://snakemake.github.io)
4-
[![GitHub actions status](https://github.com/MPUSP/snakemake-ont-basecalling/actions/workflows/main.yml/badge.svg)](https://github.com/MPUSP/snakemake-ont-basecalling/actions/workflows/main.yml)
3+
[![Snakemake](https://img.shields.io/badge/snakemake-≥9.0.0-brightgreen.svg)](https://snakemake.github.io)
4+
[![GitHub Actions](https://github.com/MPUSP/snakemake-ont-basecalling/actions/workflows/snakemake-tests.yml/badge.svg)](https://github.com/MPUSP/snakemake-ont-basecalling/actions/workflows/snakemake-tests.yml)
55
[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)
66
[![run with apptainer](https://img.shields.io/badge/run%20with-apptainer-1D355C.svg?labelColor=000000)](https://apptainer.org/)
7-
[![workflow catalog](https://img.shields.io/badge/Snakemake%20workflow%20catalog-darkgreen)](https://snakemake.github.io/snakemake-workflow-catalog)
7+
[![workflow catalog](https://img.shields.io/badge/Snakemake%20workflow%20catalog-darkgreen)](https://snakemake.github.io/snakemake-workflow-catalog/docs/workflows/MPUSP/snakemake-ont-basecalling)
88

99
A Snakemake workflow to perform basecalling and demultiplexing of Oxford Nanopore ONT data using Dorado.
1010

1111
## Usage
1212

1313
The usage of this workflow is described in the [Snakemake Workflow Catalog](https://snakemake.github.io/snakemake-workflow-catalog/docs/workflows/MPUSP/snakemake-ont-basecalling).
1414

15-
If you use this workflow in a paper, don't forget to give credits to the authors by citing the URL of this repository.
15+
Detailed information about input data and workflow configuration can also be found in the [`config/README.md`](config/README.md).
16+
17+
If you use this workflow in a paper, don't forget to give credits to the authors by citing the URL of this repository or its DOI.
1618

1719
## Workflow overview
1820

config/README.md

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,3 @@ snakemake --cores 3 --sdm conda --workflow-profile workflow/profiles/slurm/ --di
4949

5050
**Note:**
5151
It is recommended to start the snakemake pipeline on the cluster using a session multiplexer like [screen](https://www.gnu.org/software/screen/manual/screen.html) or [tmux](https://www.redhat.com/en/blog/introduction-tmux-linux).
52-
53-
### Parameters
54-
55-
This table lists all parameters that can be used to run the workflow.
56-
57-
| Parameter | Type | Details | Default |
58-
| ---------------- | ------ | ----------------------------------------- | ------------------------ |
59-
| **input** | | | |
60-
| runs | string | table with sequencing runs | `config/runs.csv` |
61-
| file_extension | string | extension for input files | `pod5` |
62-
| file_regex | string | pattern to match input files | `[A-Z]{3}[0-9]{5}...` |
63-
| barcodes | string | used barcodes for demultiplexing | `1-24` |
64-
| **dorado** | | | |
65-
| path | string | path to the Dorado executable | |
66-
| simplex / cuda | string | CUDA device: `auto`, `cuda:0`, `cuda:all` | `cuda:all` |
67-
| simplex / trim | string | `all` or `none` | `none` |
68-
| simiplex / extra | string | params passed to dorado basecaller | `""` |
69-
| demultiplexing | bool | whether to perform demultiplexing | `True` |
70-
| **report** | | | |
71-
| tools | array | list of tools to include in the report | `["pycoQC", "NanoPlot"]` |

config/schemas/config.schema.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,20 @@ properties:
77
properties:
88
runs:
99
type: string
10+
description: "table with sequencing runs"
11+
default: config/runs.csv
1012
file_extension:
1113
type: string
14+
description: "file extension for input files"
15+
default: ".pod5"
1216
file_regex:
1317
type: string
18+
description: "regular expression to match input files"
19+
default: "[A-Z]{3}[0-9]{5}..."
1420
barcodes:
1521
type: string
22+
description: "range of barcodes to process"
23+
default: "1-24"
1624
required:
1725
- runs
1826
- file_extension
@@ -23,20 +31,30 @@ properties:
2331
properties:
2432
path:
2533
type: string
34+
description: "path to the Dorado executable"
35+
default: "none"
2636
simplex:
2737
type: object
2838
properties:
2939
cuda:
3040
type: string
41+
description: "CUDA device, one of: 'auto', 'cuda:0', 'cuda:all'"
42+
default: "cuda:all"
3143
trim:
3244
type: string
45+
description: "trimming option for Dorado, 'all' or 'none'"
46+
default: "none"
3347
extra:
3448
type: string
49+
description: "extra options for Dorado"
50+
default: ""
3551
required:
3652
- cuda
3753
- trim
3854
demultiplexing:
3955
type: boolean
56+
description: "whether to perform demultiplexing"
57+
default: true
4058
required:
4159
- path
4260
- simplex
@@ -47,6 +65,8 @@ properties:
4765
type: array
4866
items:
4967
type: string
68+
description: "list of tools to include in the report"
69+
default: ["pycoQC", "NanoPlot"]
5070
required:
5171
- tools
5272
required:

0 commit comments

Comments
 (0)