Skip to content

Commit 487128b

Browse files
authored
Merge pull request #443 from JoseEspinosa/merging-template-4.0.2
Merging template 4.0.2
2 parents 800e634 + 07dfdce commit 487128b

71 files changed

Lines changed: 6955 additions & 668 deletions

File tree

Some content is hidden

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

.devcontainer/devcontainer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.schema.json",
23
"name": "nfcore",
34
"image": "nfcore/devcontainer:latest",
45

.github/CONTRIBUTING.md

Lines changed: 0 additions & 125 deletions
This file was deleted.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ These are the most common things requested on pull requests (PRs).
88
99
Remember that PRs should be made against the dev branch, unless you're preparing a pipeline release.
1010
11-
Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/atacseq/tree/master/.github/CONTRIBUTING.md)
11+
Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/atacseq/tree/master/docs/CONTRIBUTING.md)
1212
-->
1313

1414
## PR checklist
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/atacseq/tree/master/.github/CONTRIBUTING.md)
18+
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/atacseq/tree/master/docs/CONTRIBUTING.md)
1919
- [ ] If necessary, also make a PR on the nf-core/atacseq _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
2020
- [ ] Make sure your code lints (`nf-core pipelines lint`).
2121
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).

.github/actions/get-shards/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ runs:
2121
using: "composite"
2222
steps:
2323
- name: Install nf-test
24-
uses: nf-core/setup-nf-test@v1
24+
uses: nf-core/setup-nf-test@4069fbbaabe94c08faba4ad261bfa88225ba133f # v2
2525
with:
2626
version: ${{ env.NFT_VER }}
2727
- name: Get number of shards

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@ runs:
2020
using: "composite"
2121
steps:
2222
- name: Setup Nextflow
23-
uses: nf-core/setup-nextflow@v2
23+
uses: nf-core/setup-nextflow@b4ec1bc7c16a94435159de94a05253542fddf6ef # v3
2424
with:
2525
version: "${{ env.NXF_VERSION }}"
2626

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

3232
- name: Install nf-test
33-
uses: nf-core/setup-nf-test@v1
33+
uses: nf-core/setup-nf-test@4069fbbaabe94c08faba4ad261bfa88225ba133f # v2
3434
with:
3535
version: "${{ env.NFT_VER }}"
3636
install-pdiff: true
3737

3838
- name: Setup apptainer
3939
if: contains(inputs.profile, 'singularity')
40-
uses: eWaterCycle/setup-apptainer@main
40+
uses: eWaterCycle/setup-apptainer@3f706d898c9db585b1d741b4692e66755f3a1b40 # v2
4141

4242
- name: Set up Singularity
4343
if: contains(inputs.profile, 'singularity')
@@ -48,10 +48,12 @@ runs:
4848
4949
- name: Conda setup
5050
if: contains(inputs.profile, 'conda')
51-
uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3
51+
uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4
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: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,40 @@ jobs:
2626
echo "revision=${{ (github.event_name == 'workflow_dispatch' || github.event_name == 'release') && github.sha || 'dev' }}" >> "$GITHUB_OUTPUT"
2727
2828
- name: Launch workflow via Seqera Platform
29-
uses: seqeralabs/action-tower-launch@v2
29+
uses: seqeralabs/action-tower-launch@51565b514bff1827cf34620de25d0055759f1fc9 # v2
3030
with:
3131
workspace_id: ${{ vars.TOWER_WORKSPACE_ID }}
3232
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
3333
compute_env: ${{ vars.TOWER_COMPUTE_ENV }}
3434
revision: ${{ steps.revision.outputs.revision }}
3535
workdir: s3://${{ vars.AWS_S3_BUCKET }}/work/atacseq/work-${{ steps.revision.outputs.revision }}
36+
nextflow_config: |
37+
plugins {
38+
id 'nf-slack@0.5.0'
39+
}
40+
slack {
41+
enabled = true
42+
bot {
43+
token = '${{ secrets.NFSLACK_BOT_TOKEN }}'
44+
channel = 'atacseq'
45+
}
46+
onStart {
47+
enabled = false
48+
}
49+
onComplete {
50+
message = ':white_check_mark: *atacseq/test_full* completed successfully! :tada:'
51+
}
52+
onError {
53+
message = ':x: *atacseq/test_full* failed :crying_cat_face:'
54+
}
55+
}
3656
parameters: |
3757
{
38-
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
3958
"outdir": "s3://${{ vars.AWS_S3_BUCKET }}/atacseq/results-${{ steps.revision.outputs.revision }}"
4059
}
4160
profiles: test_full
4261

43-
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
62+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
4463
with:
4564
name: Seqera Platform debug log file
4665
path: |

.github/workflows/awstest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
# Launch workflow using Seqera Platform CLI tool action
1414
- name: Launch workflow via Seqera Platform
15-
uses: seqeralabs/action-tower-launch@v2
15+
uses: seqeralabs/action-tower-launch@51565b514bff1827cf34620de25d0055759f1fc9 # v2
1616
with:
1717
workspace_id: ${{ vars.TOWER_WORKSPACE_ID }}
1818
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
@@ -25,7 +25,7 @@ jobs:
2525
}
2626
profiles: test
2727

28-
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
28+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
2929
with:
3030
name: Seqera Platform debug log file
3131
path: |

.github/workflows/branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
2222
- name: Post PR comment
2323
if: failure()
24-
uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2
24+
uses: mshick/add-pr-comment@8e4927817251f1ff60c001f04568532b38e0b4a0 # v3
2525
with:
2626
message: |
2727
## This PR is against the `${{github.event.pull_request.base.ref}}` branch :x:

.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@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10
13+
- uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # 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: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,16 @@ jobs:
3838
runs-on: ubuntu-latest
3939
needs: configure
4040
steps:
41+
- name: Check out pipeline code
42+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
43+
4144
- name: Install Nextflow
42-
uses: nf-core/setup-nextflow@v2
45+
uses: nf-core/setup-nextflow@b4ec1bc7c16a94435159de94a05253542fddf6ef # v3
4346

4447
- name: Disk space cleanup
4548
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
4649

47-
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
50+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
4851
with:
4952
python-version: "3.14"
5053
architecture: "x64"
@@ -54,10 +57,15 @@ jobs:
5457
with:
5558
apptainer-version: 1.3.4
5659

60+
- name: Read .nf-core.yml
61+
id: read_yml
62+
run: |
63+
echo "nf_core_version=$(yq '.nf_core_version' ${{ github.workspace }}/.nf-core.yml)" >> "$GITHUB_OUTPUT"
64+
5765
- name: Install dependencies
5866
run: |
5967
python -m pip install --upgrade pip
60-
pip install git+https://github.com/nf-core/tools.git
68+
pip install nf-core==${{ steps.read_yml.outputs['nf_core_version'] }}
6169
6270
- name: Make a cache directory for the container images
6371
run: |
@@ -127,7 +135,7 @@ jobs:
127135
fi
128136
129137
- name: Upload Nextflow logfile for debugging purposes
130-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
138+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
131139
with:
132140
name: nextflow_logfile.txt
133141
path: .nextflow.log*

0 commit comments

Comments
 (0)