Skip to content

Commit 510c3e7

Browse files
famosabnf-core-botmaxulysse
authored
Template update to 3.4.1 (#37)
* Template update for nf-core/tools version 3.4.1 * Template update for nf-core/tools version 3.4.1 * move params * changelog * Drocrate * snap * contriv * Apply suggestion from @maxulysse Co-authored-by: Maxime U Garcia <[email protected]> * Apply suggestion from @maxulysse Co-authored-by: Maxime U Garcia <[email protected]> * disable tower * skip fastqc * skip fastqc * snap --------- Co-authored-by: nf-core-bot <[email protected]> Co-authored-by: Maxime U Garcia <[email protected]>
1 parent eeb2e3a commit 510c3e7

File tree

40 files changed

+390
-185
lines changed

40 files changed

+390
-185
lines changed

.devcontainer/devcontainer.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
22
"name": "nfcore",
3-
"image": "nfcore/gitpod:latest",
4-
"remoteUser": "gitpod",
5-
"runArgs": ["--privileged"],
3+
"image": "nfcore/devcontainer:latest",
64

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-
},
5+
"remoteUser": "root",
6+
"privileged": true,
157

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-
}
8+
"remoteEnv": {
9+
// Workspace path on the host for mounting with docker-outside-of-docker
10+
"LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}"
11+
},
12+
13+
"onCreateCommand": "./.devcontainer/setup.sh",
14+
15+
"hostRequirements": {
16+
"cpus": 4,
17+
"memory": "16gb",
18+
"storage": "32gb"
1919
}
2020
}

.devcontainer/setup.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env bash
2+
3+
# Customise the terminal command prompt
4+
echo "export PROMPT_DIRTRIM=2" >> $HOME/.bashrc
5+
echo "export PS1='\[\e[3;36m\]\w ->\[\e[0m\\] '" >> $HOME/.bashrc
6+
export PROMPT_DIRTRIM=2
7+
export PS1='\[\e[3;36m\]\w ->\[\e[0m\\] '
8+
9+
# Update Nextflow
10+
nextflow self-update
11+
12+
# Update welcome message
13+
echo "Welcome to the nf-core/variantprioritization devcontainer!" > /usr/local/etc/vscode-dev-containers/first-run-notice.txt

.github/actions/nf-test/action.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ runs:
2525
version: "${{ env.NXF_VERSION }}"
2626

2727
- name: Set up Python
28-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
28+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
2929
with:
30-
python-version: "3.13"
30+
python-version: "3.14"
3131

3232
- name: Install nf-test
3333
uses: nf-core/setup-nf-test@v1
@@ -52,6 +52,8 @@ runs:
5252
with:
5353
auto-update-conda: true
5454
conda-solver: libmamba
55+
channels: conda-forge
56+
channel-priority: strict
5557
conda-remove-defaults: true
5658

5759
- name: Run nf-test

.github/workflows/awsfulltest.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,21 @@ jobs:
2828
# Add full size test data (but still relatively small datasets for few samples)
2929
# on the `test_full.config` test runs with only one set of parameters
3030
with:
31-
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
31+
workspace_id: ${{ vars.TOWER_WORKSPACE_ID }}
3232
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
33-
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
33+
compute_env: ${{ vars.TOWER_COMPUTE_ENV }}
3434
revision: ${{ steps.revision.outputs.revision }}
35-
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/variantprioritization/work-${{ steps.revision.outputs.revision }}
35+
workdir: s3://${{ vars.AWS_S3_BUCKET }}/work/variantprioritization/work-${{ steps.revision.outputs.revision }}
3636
parameters: |
3737
{
3838
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
39-
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/variantprioritization/results-${{ steps.revision.outputs.revision }}"
39+
"outdir": "s3://${{ vars.AWS_S3_BUCKET }}/variantprioritization/results-${{ steps.revision.outputs.revision }}"
4040
}
4141
profiles: test_full
4242

4343
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
4444
with:
4545
name: Seqera Platform debug log file
4646
path: |
47-
seqera_platform_action_*.log
48-
seqera_platform_action_*.json
47+
tower_action_*.log
48+
tower_action_*.json

.github/workflows/awstest.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ jobs:
1414
- name: Launch workflow via Seqera Platform
1515
uses: seqeralabs/action-tower-launch@v2
1616
with:
17-
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
17+
workspace_id: ${{ vars.TOWER_WORKSPACE_ID }}
1818
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
19-
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
19+
compute_env: ${{ vars.TOWER_COMPUTE_ENV }}
2020
revision: ${{ github.sha }}
21-
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/variantprioritization/work-${{ github.sha }}
21+
workdir: s3://${{ vars.AWS_S3_BUCKET }}/work/variantprioritization/work-${{ github.sha }}
2222
parameters: |
2323
{
24-
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/variantprioritization/results-test-${{ github.sha }}"
24+
"outdir": "s3://${{ vars.AWS_S3_BUCKET }}/variantprioritization/results-test-${{ github.sha }}"
2525
}
2626
profiles: test
2727

2828
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
2929
with:
3030
name: Seqera Platform debug log file
3131
path: |
32-
seqera_platform_action_*.log
33-
seqera_platform_action_*.json
32+
tower_action_*.log
33+
tower_action_*.json

.github/workflows/clean-up.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
issues: write
1111
pull-requests: write
1212
steps:
13-
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9
13+
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10
1414
with:
1515
stale-issue-message: "This issue has been tagged as awaiting-changes or awaiting-feedback by an nf-core contributor. Remove stale label or add a comment otherwise this issue will be closed in 20 days."
1616
stale-pr-message: "This PR has been tagged as awaiting-changes or awaiting-feedback by an nf-core contributor. Remove stale label or add a comment if it is still useful."

.github/workflows/download_pipeline.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ jobs:
4444
- name: Disk space cleanup
4545
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
4646

47-
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
47+
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
4848
with:
49-
python-version: "3.13"
49+
python-version: "3.14"
5050
architecture: "x64"
5151

5252
- name: Setup Apptainer
@@ -57,7 +57,7 @@ jobs:
5757
- name: Install dependencies
5858
run: |
5959
python -m pip install --upgrade pip
60-
pip install git+https://github.com/nf-core/tools.git@dev
60+
pip install git+https://github.com/nf-core/tools.git
6161
6262
- name: Make a cache directory for the container images
6363
run: |

.github/workflows/fix_linting.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
# Use the @nf-core-bot token to check out so we can push later
16-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
16+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
1717
with:
1818
token: ${{ secrets.nf_core_bot_auth_token }}
1919

2020
# indication that the linting is being fixed
2121
- name: React on comment
22-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
22+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5
2323
with:
2424
comment-id: ${{ github.event.comment.id }}
2525
reactions: eyes
@@ -32,9 +32,9 @@ jobs:
3232
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}
3333

3434
# Install and run pre-commit
35-
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
35+
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
3636
with:
37-
python-version: "3.13"
37+
python-version: "3.14"
3838

3939
- name: Install pre-commit
4040
run: pip install pre-commit
@@ -47,7 +47,7 @@ jobs:
4747
# indication that the linting has finished
4848
- name: react if linting finished succesfully
4949
if: steps.pre-commit.outcome == 'success'
50-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
50+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5
5151
with:
5252
comment-id: ${{ github.event.comment.id }}
5353
reactions: "+1"
@@ -67,21 +67,21 @@ jobs:
6767
- name: react if linting errors were fixed
6868
id: react-if-fixed
6969
if: steps.commit-and-push.outcome == 'success'
70-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
70+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5
7171
with:
7272
comment-id: ${{ github.event.comment.id }}
7373
reactions: hooray
7474

7575
- name: react if linting errors were not fixed
7676
if: steps.commit-and-push.outcome == 'failure'
77-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
77+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5
7878
with:
7979
comment-id: ${{ github.event.comment.id }}
8080
reactions: confused
8181

8282
- name: react if linting errors were not fixed
8383
if: steps.commit-and-push.outcome == 'failure'
84-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
84+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5
8585
with:
8686
issue-number: ${{ github.event.issue.number }}
8787
body: |

.github/workflows/linting.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
pre-commit:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
14+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
1515

16-
- name: Set up Python 3.13
17-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
16+
- name: Set up Python 3.14
17+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
1818
with:
19-
python-version: "3.13"
19+
python-version: "3.14"
2020

2121
- name: Install pre-commit
2222
run: pip install pre-commit
@@ -28,14 +28,14 @@ jobs:
2828
runs-on: ubuntu-latest
2929
steps:
3030
- name: Check out pipeline code
31-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
31+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
3232

3333
- name: Install Nextflow
3434
uses: nf-core/setup-nextflow@v2
3535

36-
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
36+
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
3737
with:
38-
python-version: "3.13"
38+
python-version: "3.14"
3939
architecture: "x64"
4040

4141
- name: read .nf-core.yml

.github/workflows/linting_comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
run: echo "pr_number=$(cat linting-logs/PR_number.txt)" >> $GITHUB_OUTPUT
2222

2323
- name: Post PR comment
24-
uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728 # v2
24+
uses: marocchino/sticky-pull-request-comment@773744901bac0e8cbb5a0dc842800d45e9b2b405 # v2
2525
with:
2626
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2727
number: ${{ steps.pr_number.outputs.pr_number }}

0 commit comments

Comments
 (0)