Skip to content

Commit adce7ce

Browse files
authored
Merge pull request #914 from nf-core/dev
Dev -> Master for v3.10 release
2 parents e049f51 + 4f29256 commit adce7ce

File tree

165 files changed

+4235
-2112
lines changed

Some content is hidden

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

165 files changed

+4235
-2112
lines changed

.devcontainer/devcontainer.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"name": "nfcore",
3+
"image": "nfcore/gitpod:latest",
4+
"remoteUser": "gitpod",
5+
6+
// Configure tool-specific properties.
7+
"customizations": {
8+
// Configure properties specific to VS Code.
9+
"vscode": {
10+
// Set *default* container specific settings.json values on container create.
11+
"settings": {
12+
"python.defaultInterpreterPath": "/opt/conda/bin/python",
13+
"python.linting.enabled": true,
14+
"python.linting.pylintEnabled": true,
15+
"python.formatting.autopep8Path": "/opt/conda/bin/autopep8",
16+
"python.formatting.yapfPath": "/opt/conda/bin/yapf",
17+
"python.linting.flake8Path": "/opt/conda/bin/flake8",
18+
"python.linting.pycodestylePath": "/opt/conda/bin/pycodestyle",
19+
"python.linting.pydocstylePath": "/opt/conda/bin/pydocstyle",
20+
"python.linting.pylintPath": "/opt/conda/bin/pylint"
21+
},
22+
23+
// Add the IDs of extensions you want installed when the container is created.
24+
"extensions": ["ms-python.python", "ms-python.vscode-pylance", "nf-core.nf-core-extensionpack"]
25+
}
26+
}
27+
}

.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: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,19 @@ If you are using a new feature from core Nextflow, you may bump the minimum requ
101101
### Images and figures
102102

103103
For overview images and other documents we follow the nf-core [style guidelines and examples](https://nf-co.re/developers/design_guidelines).
104+
105+
## GitHub Codespaces
106+
107+
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.
108+
109+
To get started:
110+
111+
- Open the repo in [Codespaces](https://github.com/nf-core/rnaseq/codespaces)
112+
- Tools installed
113+
- nf-core
114+
- Nextflow
115+
116+
Devcontainer specs:
117+
118+
- [DevContainer config](.devcontainer/devcontainer.json)
119+
- [Dockerfile](.devcontainer/Dockerfile)

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ body:
4242
attributes:
4343
label: System information
4444
description: |
45-
* Nextflow version _(eg. 21.10.3)_
45+
* Nextflow version _(eg. 22.10.1)_
4646
* Hardware _(eg. HPC, Desktop, Cloud)_
4747
* Executor _(eg. slurm, local, awsbatch)_
4848
* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter or Charliecloud)_

.github/workflows/awsfulltest.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,7 @@ jobs:
3030
"aligner": "${{ matrix.aligner }}"
3131
}
3232
profiles: test_full,aws_tower
33+
- uses: actions/upload-artifact@v3
34+
with:
35+
name: Tower debug log file
36+
path: tower_action_*.log

.github/workflows/awstest.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ jobs:
2323
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/rnaseq/results-test-${{ github.sha }}"
2424
}
2525
profiles: test,aws_tower
26+
- uses: actions/upload-artifact@v3
27+
with:
28+
name: Tower debug log file
29+
path: tower_action_*.log

.github/workflows/ci.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ on:
1111
env:
1212
NXF_ANSI_LOG: false
1313

14+
concurrency:
15+
group: "${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}"
16+
cancel-in-progress: true
17+
1418
jobs:
1519
test:
1620
name: Run pipeline with test data
@@ -20,11 +24,11 @@ jobs:
2024
strategy:
2125
matrix:
2226
NXF_VER:
23-
- "21.10.3"
27+
- "22.10.1"
2428
- "latest-everything"
2529
steps:
2630
- name: Check out pipeline code
27-
uses: actions/checkout@v2
31+
uses: actions/checkout@v3
2832

2933
- name: Install Nextflow
3034
uses: nf-core/setup-nextflow@v1

.github/workflows/fix-linting.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
env:
2525
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}
2626

27-
- uses: actions/setup-node@v2
27+
- uses: actions/setup-node@v3
2828

2929
- name: Install Prettier
3030
run: npm install -g prettier @prettier/plugin-php
@@ -34,9 +34,9 @@ jobs:
3434
id: prettier_status
3535
run: |
3636
if prettier --check ${GITHUB_WORKSPACE}; then
37-
echo "::set-output name=result::pass"
37+
echo "result=pass" >> $GITHUB_OUTPUT
3838
else
39-
echo "::set-output name=result::fail"
39+
echo "result=fail" >> $GITHUB_OUTPUT
4040
fi
4141
4242
- name: Run 'prettier --write'

.github/workflows/linting.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ name: nf-core linting
44
# that the code meets the nf-core guidelines.
55
on:
66
push:
7+
branches:
8+
- dev
79
pull_request:
810
release:
911
types: [published]
@@ -12,9 +14,9 @@ jobs:
1214
EditorConfig:
1315
runs-on: ubuntu-latest
1416
steps:
15-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1618

17-
- uses: actions/setup-node@v2
19+
- uses: actions/setup-node@v3
1820

1921
- name: Install editorconfig-checker
2022
run: npm install -g editorconfig-checker
@@ -25,9 +27,9 @@ jobs:
2527
Prettier:
2628
runs-on: ubuntu-latest
2729
steps:
28-
- uses: actions/checkout@v2
30+
- uses: actions/checkout@v3
2931

30-
- uses: actions/setup-node@v2
32+
- uses: actions/setup-node@v3
3133

3234
- name: Install Prettier
3335
run: npm install -g prettier
@@ -38,7 +40,7 @@ jobs:
3840
PythonBlack:
3941
runs-on: ubuntu-latest
4042
steps:
41-
- uses: actions/checkout@v2
43+
- uses: actions/checkout@v3
4244

4345
- name: Check code lints with Black
4446
uses: psf/black@stable
@@ -69,12 +71,12 @@ jobs:
6971
runs-on: ubuntu-latest
7072
steps:
7173
- name: Check out pipeline code
72-
uses: actions/checkout@v2
74+
uses: actions/checkout@v3
7375

7476
- name: Install Nextflow
7577
uses: nf-core/setup-nextflow@v1
7678

77-
- uses: actions/setup-python@v3
79+
- uses: actions/setup-python@v4
7880
with:
7981
python-version: "3.7"
8082
architecture: "x64"
@@ -97,7 +99,7 @@ jobs:
9799

98100
- name: Upload linting log file artifact
99101
if: ${{ always() }}
100-
uses: actions/upload-artifact@v2
102+
uses: actions/upload-artifact@v3
101103
with:
102104
name: linting-logs
103105
path: |

.github/workflows/linting_comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
- name: Get PR number
2020
id: pr_number
21-
run: echo "::set-output name=pr_number::$(cat linting-logs/PR_number.txt)"
21+
run: echo "pr_number=$(cat linting-logs/PR_number.txt)" >> $GITHUB_OUTPUT
2222

2323
- name: Post PR comment
2424
uses: marocchino/sticky-pull-request-comment@v2

0 commit comments

Comments
 (0)