Skip to content

Commit 0aa9cf5

Browse files
HomoPolyethylenSusiJomapo9Niclas Grote
authored
release 1.0.0 (#16)
* update description * test verified commit * test signed commit * adjust samplesheet * include bcftools for pass filtering * added bcftools_split Signed-off-by: SusiJo <susanne.jodoin@gmx.de> * first draft of querynator module * querynator module built and tested * started to incorporate querynator in pipeline * first draft of incorporated querynator/query_cgi * cgi query running * cancer type fixed * made unzipping possible for cgi * cgi + first draft civic * all done, first draft * Update nextflow.config Co-authored-by: SusiJo <43847534+SusiJo@users.noreply.github.com> * Update bin/check_samplesheet.py Co-authored-by: SusiJo <43847534+SusiJo@users.noreply.github.com> * next try * Update bin/check_samplesheet.py Co-authored-by: SusiJo <43847534+SusiJo@users.noreply.github.com> * Update bin/check_samplesheet.py Co-authored-by: SusiJo <43847534+SusiJo@users.noreply.github.com> * Update modules/local/querynator/cgiapi.nf Co-authored-by: SusiJo <43847534+SusiJo@users.noreply.github.com> * Update workflows/variantmtb.nf Co-authored-by: SusiJo <43847534+SusiJo@users.noreply.github.com> * Modules * some changes * querynator update * querynator updated * docs added * docs added * remove fastqc * changelog * beautify code * remove all multiqc * minor changes * minimal test included * cancer types * add paths * description * disable tabix * Update README.md Co-authored-by: SusiJo <43847534+SusiJo@users.noreply.github.com> * Update docs/usage.md Co-authored-by: SusiJo <43847534+SusiJo@users.noreply.github.com> * moved CGI credentials to nf secrets * prettier * added log files in general * removed CGI credentials from params * ECLint * Revert "removed CGI credentials from params" This reverts commit fafeff7. keep info in schema * updated nf-core/bcftools to v1.18 * removed CGI credentials from input channel * Revert "removed CGI credentials from input channel" This reverts commit e086a16. * added meta2 argument, as required since bcftools1.18 * fixed broken link * added reference genome meta info to bcftools input channel * potential fix #4 * Revert "potential fix #4" This reverts commit bac4cbe. * another potential fix #4 * yet another potential fix #4 * removed fasta default value, so it can be reassigned by script and genome flag * added qbicpipelines header and logo * Template update for nf-core/tools version 2.13.1 * added qbic logo and minor fixes * nf-core lint * prettier * lint * prettier * try ignoring utils_nfcore_pipeline * removed obsolete cgi options and grouped other options * Revert "try ignoring utils_nfcore_pipeline" This reverts commit 5402ddf. * cleanup & description of cgi credentials * removed some todos * lint * cleanup * minor nf-test fix * undo qbicpipelines logo to pass linting * undo qbicpipelines logo * fixed typo * fix linting issue by ignoring images * minor fix * added/updated tests * minor fix * added citations * moved fasta channel init to main workflow * added link to list of cancer types at querynator repo * added BGZF compressed vcf to full test * refactored * prettier * added enum to genome * fixed igenomes and linting * update querynator to 0.4.2 * added name to contributors * removed unused script * minor adjustments * Revert "minor adjustments" This reverts commit 4b4c3eb. * r1.0.0 (#15) * feat!: specify cancer type for cgi & civic in samplesheet (#5) * refactored meta info parsing * bumped querynator to 0.5.1 moved cancer type from params to samplesheet * updated usage * updated usage * lint * update bcftools/norm to 1.18 * update bcftools/view to 1.18 * updated gunzip module * updated custom/dumpsoftwareversions module * updated utils_nfcore_pipeline subworkflow * lint * added cancer type defaults * updated module gunzip * updated module tabix/tabix * updated module tabix/bgziptabix * bump querynator to 0.5.4 * docs: update CHANGELOG * fix: disable parallelization for QUERYCGI CGI blocks multiple parallel requests to their API fixes #10 * build: bump version to 1.0.0 * test: run multiple samples for the full test * Bump querynator 0.5.5 * chore: remove obsolete TODOs * chore: update nf-core modules * chore: update nf-core subworkflows * chore(querynator): update to 0.5.5 * fix(docs): fix github actions badges * feat: add civic evidence filters * chore: bump querynator to 0.6.0 * chore: update nf-core modules * chore: update nf-core subworkflows * docs: update changelog * docs: add actionability profile --------- Signed-off-by: SusiJo <susanne.jodoin@gmx.de> Co-authored-by: SusiJo <susanne.jodoin@gmx.de> Co-authored-by: mapo9 <mark.polster@uni-tuebingen.de> Co-authored-by: Mark Polster <58596435+mapo9@users.noreply.github.com> Co-authored-by: SusiJo <43847534+SusiJo@users.noreply.github.com> Co-authored-by: Niclas Grote <zxmgc83@thanos.am10.uni-tubingen.de>
1 parent 0e50f0c commit 0aa9cf5

File tree

160 files changed

+7466
-2170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+7466
-2170
lines changed

.devcontainer/devcontainer.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "nfcore",
3+
"image": "nfcore/gitpod:latest",
4+
"remoteUser": "gitpod",
5+
"runArgs": ["--privileged"],
6+
7+
// Configure tool-specific properties.
8+
"customizations": {
9+
// Configure properties specific to VS Code.
10+
"vscode": {
11+
// Set *default* container specific settings.json values on container create.
12+
"settings": {
13+
"python.defaultInterpreterPath": "/opt/conda/bin/python"
14+
},
15+
16+
// Add the IDs of extensions you want installed when the container is created.
17+
"extensions": ["ms-python.python", "ms-python.vscode-pylance", "nf-core.nf-core-extensionpack"]
18+
}
19+
}
20+
}

.editorconfig

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,20 @@ end_of_line = unset
1818
insert_final_newline = unset
1919
trim_trailing_whitespace = unset
2020
indent_style = unset
21-
indent_size = unset
21+
[/subworkflows/nf-core/**]
22+
charset = unset
23+
end_of_line = unset
24+
insert_final_newline = unset
25+
trim_trailing_whitespace = unset
26+
indent_style = unset
2227

2328
[/assets/email*]
2429
indent_size = unset
30+
31+
# ignore Readme
32+
[README.md]
33+
indent_style = unset
34+
35+
# ignore python
36+
[*.{py,md}]
37+
indent_style = unset

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
*.config linguist-language=nextflow
2+
*.nf.test linguist-language=nextflow
23
modules/nf-core/** linguist-generated
34
subworkflows/nf-core/** linguist-generated

.github/CONTRIBUTING.md

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Please use the pre-filled template to save time.
99
However, don't be put off by this template - other more general issues and suggestions are welcome!
1010
Contributions to the code are even more welcome ;)
1111

12+
> [!NOTE]
1213
> If you need help using or modifying nf-core/variantmtb then the best place to ask is on the nf-core Slack [#variantmtb](https://nfcore.slack.com/channels/variantmtb) channel ([join our Slack here](https://nf-co.re/join/slack)).
1314
1415
## Contribution workflow
@@ -25,6 +26,12 @@ If you're not used to this workflow with git, you can start with some [docs from
2526

2627
## Tests
2728

29+
You have the option to test your changes locally by running the pipeline. For receiving warnings about process selectors and other `debug` information, it is recommended to use the debug profile. Execute all the tests with the following command:
30+
31+
```bash
32+
nf-test test --profile debug,test,docker --verbose
33+
```
34+
2835
When you create a pull request with changes, [GitHub Actions](https://github.com/features/actions) will run automatic tests.
2936
Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then.
3037

@@ -85,7 +92,7 @@ Once there, use `nf-core schema build` to add to `nextflow_schema.json`.
8592

8693
Sensible defaults for process resource requirements (CPUs / memory / time) for a process should be defined in `conf/base.config`. These should generally be specified generic with `withLabel:` selectors so they can be shared across multiple processes/steps of the pipeline. A nf-core standard set of labels that should be followed where possible can be seen in the [nf-core pipeline template](https://github.com/nf-core/tools/blob/master/nf_core/pipeline-template/conf/base.config), which has the default process as a single core-process, and then different levels of multi-core configurations for increasingly large memory requirements defined with standardised labels.
8794

88-
The process resources can be passed on to the tool dynamically within the process with the `${task.cpu}` and `${task.memory}` variables in the `script:` block.
95+
The process resources can be passed on to the tool dynamically within the process with the `${task.cpus}` and `${task.memory}` variables in the `script:` block.
8996

9097
### Naming schemes
9198

@@ -101,3 +108,18 @@ If you are using a new feature from core Nextflow, you may bump the minimum requ
101108
### Images and figures
102109

103110
For overview images and other documents we follow the nf-core [style guidelines and examples](https://nf-co.re/developers/design_guidelines).
111+
112+
## GitHub Codespaces
113+
114+
This repo includes a devcontainer configuration which will create a GitHub Codespaces for Nextflow development! This is an online developer environment that runs in your browser, complete with VSCode and a terminal.
115+
116+
To get started:
117+
118+
- Open the repo in [Codespaces](https://github.com/nf-core/variantmtb/codespaces)
119+
- Tools installed
120+
- nf-core
121+
- Nextflow
122+
123+
Devcontainer specs:
124+
125+
- [DevContainer config](.devcontainer/devcontainer.json)

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ body:
4242
attributes:
4343
label: System information
4444
description: |
45-
* Nextflow version _(eg. 21.10.3)_
45+
* Nextflow version _(eg. 23.04.0)_
4646
* Hardware _(eg. HPC, Desktop, Cloud)_
4747
* Executor _(eg. slurm, local, awsbatch)_
48-
* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter or Charliecloud)_
48+
* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter, Charliecloud, or Apptainer)_
4949
* OS _(eg. CentOS Linux, macOS, Linux Mint)_
5050
* Version of nf-core/variantmtb _(eg. 1.1, 1.5, 1.8.2)_

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/vari
1515

1616
- [ ] This comment contains a description of changes (with reason).
1717
- [ ] If you've fixed a bug or added code that should be tested, add tests!
18-
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/variantmtb/tree/master/.github/CONTRIBUTING.md)
19-
- [ ] If necessary, also make a PR on the nf-core/variantmtb _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
18+
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/variantmtb/tree/master/.github/CONTRIBUTING.md)
19+
- [ ] If necessary, also make a PR on the nf-core/variantmtb _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
2020
- [ ] Make sure your code lints (`nf-core lint`).
2121
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
22+
- [ ] Check for unexpected warnings in debug mode (`nextflow run . -profile debug,test,docker --outdir <OUTDIR>`).
2223
- [ ] Usage Documentation in `docs/usage.md` is updated.
2324
- [ ] Output Documentation in `docs/output.md` is updated.
2425
- [ ] `CHANGELOG.md` is updated.

.github/workflows/awsfulltest.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,26 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Launch workflow via tower
17-
uses: nf-core/tower-action@v3
18-
# TODO nf-core: You can customise AWS full pipeline tests as required
17+
uses: seqeralabs/action-tower-launch@v2
18+
# nf-core: You can customise AWS full pipeline tests as required
1919
# Add full size test data (but still relatively small datasets for few samples)
2020
# on the `test_full.config` test runs with only one set of parameters
2121
with:
2222
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
2323
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
2424
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
25+
revision: ${{ github.sha }}
2526
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/variantmtb/work-${{ github.sha }}
2627
parameters: |
2728
{
29+
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
2830
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/variantmtb/results-${{ github.sha }}"
2931
}
30-
profiles: test_full,aws_tower
32+
profiles: test_full
33+
34+
- uses: actions/upload-artifact@v4
35+
with:
36+
name: Tower debug log file
37+
path: |
38+
tower_action_*.log
39+
tower_action_*.json

.github/workflows/awstest.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,22 @@ jobs:
1212
steps:
1313
# Launch workflow using Tower CLI tool action
1414
- name: Launch workflow via tower
15-
uses: nf-core/tower-action@v3
15+
uses: seqeralabs/action-tower-launch@v2
1616
with:
1717
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
1818
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
1919
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
20+
revision: ${{ github.sha }}
2021
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/variantmtb/work-${{ github.sha }}
2122
parameters: |
2223
{
2324
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/variantmtb/results-test-${{ github.sha }}"
2425
}
25-
profiles: test,aws_tower
26+
profiles: test
27+
28+
- uses: actions/upload-artifact@v4
29+
with:
30+
name: Tower debug log file
31+
path: |
32+
tower_action_*.log
33+
tower_action_*.json

.github/workflows/branch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
- name: Check PRs
1414
if: github.repository == 'nf-core/variantmtb'
1515
run: |
16-
{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/variantmtb ]] && [[ $GITHUB_HEAD_REF = "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]
16+
{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/variantmtb ]] && [[ $GITHUB_HEAD_REF == "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]
1717
1818
# If the above check failed, post a comment on the PR explaining the failure
1919
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
2020
- name: Post PR comment
2121
if: failure()
22-
uses: mshick/add-pr-comment@v1
22+
uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2
2323
with:
2424
message: |
2525
## This PR is against the `master` branch :x:

.github/workflows/ci.yml

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ on:
1010

1111
env:
1212
NXF_ANSI_LOG: false
13-
CAPSULE_LOG: none
13+
14+
concurrency:
15+
group: "${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}"
16+
cancel-in-progress: true
1417

1518
jobs:
1619
test:
@@ -20,30 +23,23 @@ jobs:
2023
runs-on: ubuntu-latest
2124
strategy:
2225
matrix:
23-
# Nextflow versions
24-
include:
25-
# Test pipeline minimum Nextflow version
26-
- NXF_VER: "21.10.3"
27-
NXF_EDGE: ""
28-
# Test latest edge release of Nextflow
29-
- NXF_VER: ""
30-
NXF_EDGE: "1"
26+
NXF_VER:
27+
- "23.04.0"
28+
- "latest-everything"
3129
steps:
3230
- name: Check out pipeline code
33-
uses: actions/checkout@v2
31+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
3432

3533
- name: Install Nextflow
36-
env:
37-
NXF_VER: ${{ matrix.NXF_VER }}
38-
# Uncomment only if the edge release is more recent than the latest stable release
39-
# See https://github.com/nextflow-io/nextflow/issues/2467
40-
# NXF_EDGE: ${{ matrix.NXF_EDGE }}
41-
run: |
42-
wget -qO- get.nextflow.io | bash
43-
sudo mv nextflow /usr/local/bin/
34+
uses: nf-core/setup-nextflow@v1
35+
with:
36+
version: "${{ matrix.NXF_VER }}"
37+
38+
- name: Disk space cleanup
39+
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
4440

4541
- name: Run pipeline with test data
46-
# TODO nf-core: You can customise CI pipeline run tests as required
42+
# nf-core: You can customise CI pipeline run tests as required
4743
# For example: adding multiple test runs with different parameters
4844
# Remember that you can parallelise this by using strategy.matrix
4945
run: |

0 commit comments

Comments
 (0)