Skip to content

Commit 495e05c

Browse files
committed
Template update for nf-core/tools version 3.0.1
1 parent cf0c6e1 commit 495e05c

File tree

15 files changed

+209
-194
lines changed

15 files changed

+209
-194
lines changed

.editorconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ indent_style = space
1111
[*.{md,yml,yaml,html,css,scss,js}]
1212
indent_size = 2
1313

14-
1514
# These files are edited and tested upstream in nf-core/modules
1615
[/modules/nf-core/**]
1716
charset = unset
@@ -26,12 +25,9 @@ insert_final_newline = unset
2625
trim_trailing_whitespace = unset
2726
indent_style = unset
2827

29-
30-
3128
[/assets/email*]
3229
indent_size = unset
3330

34-
3531
# ignore python and markdown
3632
[*.{py,md}]
3733
indent_style = unset

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Once there, use `nf-core pipelines schema build` to add to `nextflow_schema.json
9090

9191
### Default processes resource requirements
9292

93-
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.
93+
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/main/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.
9494

9595
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.
9696

.github/workflows/awsfulltest.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,18 @@ on:
1414
jobs:
1515
run-platform:
1616
name: Run AWS full tests
17-
if: github.repository == 'nf-core/chipseq' && github.event.review.state == 'approved'
17+
# run only if the PR is approved by at least 2 reviewers and against the master branch or manually triggered
18+
if: github.repository == 'nf-core/chipseq' && github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'master' || github.event_name == 'workflow_dispatch'
1819
runs-on: ubuntu-latest
1920
steps:
2021
- uses: octokit/[email protected]
2122
id: check_approvals
2223
with:
23-
route: GET /repos/${{ github.repository }}/pulls/${{ github.event.review.number }}/reviews
24+
route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews
2425
env:
2526
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2627
- id: test_variables
28+
if: github.event_name != 'workflow_dispatch'
2729
run: |
2830
JSON_RESPONSE='${{ steps.check_approvals.outputs.data }}'
2931
CURRENT_APPROVALS_COUNT=$(echo $JSON_RESPONSE | jq -c '[.[] | select(.state | contains("APPROVED")) ] | length')

.github/workflows/linting.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ jobs:
4242
architecture: "x64"
4343

4444
- name: read .nf-core.yml
45-
uses: pietrobolcato/action-read-yaml@1.0.0
45+
uses: pietrobolcato/action-read-yaml@1.1.0
4646
id: read_yml
4747
with:
48-
config: ${{ github.workspace }}/.nf-core.yaml
48+
config: ${{ github.workspace }}/.nf-core.yml
4949

5050
- name: Install dependencies
5151
run: |

.nf-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ lint:
44
- config_defaults:
55
- params.bamtools_filter_se_config
66
- params.bamtools_filter_pe_config
7-
nf_core_version: 3.0.0
7+
nf_core_version: 3.0.1
88
org_path: null
99
repository_type: pipeline
1010
template:

.prettierignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
email_template.html
32
adaptivecard.json
43
slackreport.json

docs/output.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ The pipeline is built using [Nextflow](https://www.nextflow.io/) and processes d
1414

1515
- [FastQC](#fastqc) - Raw read QC
1616
- [MultiQC](#multiqc) - Aggregate report describing results and QC from the whole pipeline
17-
1817
- [Pipeline information](#pipeline-information) - Report metrics generated during the workflow execution
1918

2019
### FastQC

modules.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"multiqc": {
1414
"branch": "master",
15-
"git_sha": "666652151335353eef2fcd58880bcef5bc2928e1",
15+
"git_sha": "b8d36829fa84b6e404364abff787e8b07f6d058c",
1616
"installed_by": ["modules"]
1717
}
1818
}
@@ -21,12 +21,12 @@
2121
"nf-core": {
2222
"utils_nextflow_pipeline": {
2323
"branch": "master",
24-
"git_sha": "d20fb2a9cc3e2835e9d067d1046a63252eb17352",
24+
"git_sha": "9d05360da397692321d377b6102d2fb22507c6ef",
2525
"installed_by": ["subworkflows"]
2626
},
2727
"utils_nfcore_pipeline": {
2828
"branch": "master",
29-
"git_sha": "2fdce49d30c0254f76bc0f13c55c17455c1251ab",
29+
"git_sha": "772684d9d66f37b650c8ba5146ac1ee3ecba2acb",
3030
"installed_by": ["subworkflows"]
3131
},
3232
"utils_nfschema_plugin": {

modules/nf-core/multiqc/environment.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/nf-core/multiqc/main.nf

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)