Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
03af75b
feat: move out skip_tools markduplicates logic out of mapping
maxulysse Mar 3, 2022
bcdb1d7
Merge remote-tracking branch 'upstream/dev' into dev_refactor_harder_…
maxulysse Mar 3, 2022
ea8cc5e
fix: -profile skip_markduplicates
maxulysse Mar 3, 2022
cabccd4
feat: remove spark and markduplicates skipping logics from markduplic…
maxulysse Mar 3, 2022
a1c801c
fix: publishDir enabled
maxulysse Mar 3, 2022
aed6852
feat: code polishing tabs
maxulysse Mar 3, 2022
c9ee9ad
fix: restore skip_tools markduplicates functionnality
maxulysse Mar 3, 2022
791d6c0
feat: markduplicates SPARK is back
maxulysse Mar 4, 2022
1104150
fix: deepvariant tests
maxulysse Mar 4, 2022
ae6ea0d
fix: revert to old container versions with working spark
maxulysse Mar 7, 2022
fa52f29
fix: correct outputs
maxulysse Mar 7, 2022
0fd7726
fix: in does not work when more than one element, so switching to con…
maxulysse Mar 7, 2022
c0718dc
temp-fix: use tools@dev
maxulysse Mar 7, 2022
b5d2c6b
feat: add repository_type to .nf-core.yml
maxulysse Mar 7, 2022
ceb10fc
fix: nf-core lint --fix files_unchanged
maxulysse Mar 7, 2022
1768d1c
update linting.yml file
maxulysse Mar 7, 2022
3b2bb31
add: yamllint file
maxulysse Mar 7, 2022
14d8c89
code polishing
maxulysse Mar 7, 2022
0caaefc
fix yaml truthly warning
maxulysse Mar 7, 2022
d582742
fix indent
maxulysse Mar 7, 2022
d0152eb
fix: add files to unchanged list
maxulysse Mar 8, 2022
6042da5
node v17 for all
maxulysse Mar 8, 2022
4b9699a
feat: reorganize subworkflows
maxulysse Mar 8, 2022
a0fcbf8
feat: refactor QC for markduplicates
maxulysse Mar 9, 2022
b72e240
better name for channel
maxulysse Mar 9, 2022
8fa8b23
feat: add --get-aware
maxulysse Mar 9, 2022
766008d
feat: truthly disable in .yamllint.yml
maxulysse Mar 9, 2022
b95c973
fix: remove unncessary code
maxulysse Mar 10, 2022
26c7b0d
feat: strip out spark
maxulysse Mar 10, 2022
3d1ecec
fix: spark is back
maxulysse Mar 10, 2022
1524fdd
better comments
maxulysse Mar 10, 2022
63275c1
feat: split out spark from recalibrate
maxulysse Mar 10, 2022
b26a907
fix: indent
maxulysse Mar 10, 2022
4c38428
feat: code polish mapping
maxulysse Mar 10, 2022
f8b4e74
refactor bam conversion to fastq
maxulysse Mar 10, 2022
e8c442f
feat: refactor mapping and pre-mapping subworkflows and logic
maxulysse Mar 11, 2022
dc8e59c
code polishing
maxulysse Mar 11, 2022
e531043
fix: use correct output
maxulysse Mar 11, 2022
8be2e09
fix: update meta.id + comments
maxulysse Mar 11, 2022
8ff78d7
fix: reorganize meta.map after mapping
maxulysse Mar 11, 2022
d537baf
fix: channels for markduplicates
maxulysse Mar 11, 2022
0fdbca5
QC out of recalibrate
maxulysse Mar 11, 2022
1a18d2e
fix: proper channels name
maxulysse Mar 11, 2022
0b4cafb
code polishing
maxulysse Mar 11, 2022
5a3aa8a
code polishing
maxulysse Mar 11, 2022
2dfceea
feat: merge_index_cram out of recalibrate
maxulysse Mar 11, 2022
5b0ded8
feat: remove no_intervals logic, use num_intervals instead
maxulysse Mar 14, 2022
da74642
update local samtools modules
maxulysse Mar 15, 2022
69027b6
group QC
maxulysse Mar 15, 2022
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
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

name: Bug report
description: Report something that is broken or incorrect
labels: bug
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
# TODO nf-core: You can customise AWS full pipeline tests as required
# Add full size test data (but still relatively small datasets for few samples)
# on the `test_full.config` test runs with only one set of parameters

with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/awstest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jobs:
steps:
- name: Launch workflow via tower
uses: nf-core/tower-action@v2

with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
run: python -m pip install --upgrade pip pytest-workflow

- name: Run pipeline with tests settings
run: pytest --tag ${{ matrix.test }} --kwdof
run: pytest --tag ${{ matrix.test }} --kwdof --git-aware

- name: Output log on failure
if: failure()
Expand Down
19 changes: 9 additions & 10 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: '10'
node-version: '17'
- name: Install markdownlint
run: npm install -g markdownlint-cli
- name: Run Markdownlint
Expand Down Expand Up @@ -51,9 +51,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: '10'
node-version: '17'

- name: Install editorconfig-checker
run: npm install -g editorconfig-checker
Expand All @@ -65,13 +65,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: '10'
node-version: '17'
- name: Install yaml-lint
run: npm install -g yaml-lint
- name: Run yaml-lint
run: yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml" -o -name "*.yaml")
run: yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml" -o -name "*.yaml") -c ${GITHUB_WORKSPACE}/.yamllint.yml

# If the above check failed, post a comment on the PR explaining the failure
- name: Post PR comment
Expand All @@ -87,7 +87,7 @@ jobs:
* Install `yaml-lint`
* [Install `npm`](https://www.npmjs.com/get-npm) then [install `yaml-lint`](https://www.npmjs.com/package/yaml-lint) (`npm install -g yaml-lint`)
* Fix the markdown errors
* Run the test locally: `yamllint $(find . -type f -name "*.yml" -o -name "*.yaml")`
* Run the test locally: `yamllint $(find . -type f -name "*.yml" -o -name "*.yaml") -c ./.yamllint.yml`
* Fix any reported errors in your YAML files

Once you push these changes the test should pass, and you can hide this comment :+1:
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install nf-core
pip install git+https://github.com/nf-core/tools.git@dev

- name: Run nf-core lint
env:
Expand All @@ -142,4 +142,3 @@ jobs:
lint_log.txt
lint_results.md
PR_number.txt

1 change: 0 additions & 1 deletion .github/workflows/linting_comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
name: nf-core linting comment
# This workflow is triggered after the linting action is complete
# It posts an automated comment to the PR, even if the PR is coming from a fork

on:
workflow_run:
workflows: ["nf-core linting"]
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/local_modules.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: Local Modules pytest-workflow
on: [push, pull_request]

jobs:
changes:
name: Check for changes
Expand Down
3 changes: 3 additions & 0 deletions .nf-core.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
repository_type: pipeline
lint:
files_unchanged:
- .github/workflows/branch.yml
- .github/workflows/linting.yml
- .github/workflows/linting_comment.yml
- assets/multiqc_config.yaml
- assets/nf-core-sarek_logo_light.png
- docs/images/nf-core-sarek_logo_dark.png
Expand Down
6 changes: 6 additions & 0 deletions .yamllint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
extends: default

rules:
document-start: disable
line-length: disable
truthy: disable
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) Maxime Garcia, Szilveszter Juhos
Copyright (c) Maxime Garcia, Szilveszter Juhos, Friederike Hanssen

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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ For further information or help, don't hesitate to get in touch on the [Slack `#
## Citations

If you use `nf-core/sarek` for your analysis, please cite the `Sarek` article as follows:
> Garcia M, Juhos S, Larsson M et al. **Sarek: A portable workflow for whole-genome sequencing analysis of germline and somatic variants [version 2; peer review: 2 approved]** *F1000Research* 2020, 9:63 [doi: 10.12688/f1000research.16665.2](http://dx.doi.org/10.12688/f1000research.16665.2).
> Garcia M, Juhos S, Larsson M et al. **Sarek: A portable workflow for whole-genome sequencing analysis of germline and somatic variants [version 2; peer review: 2 approved]** _F1000Research_ 2020, 9:63 [doi: 10.12688/f1000research.16665.2](http://dx.doi.org/10.12688/f1000research.16665.2).

You can cite the sarek zenodo record for a specific version using the following [doi: 10.5281/zenodo.3476426](https://zenodo.org/badge/latestdoi/184289291)

Expand Down
Loading