Skip to content

Commit 6e1125d

Browse files
Merge pull request #230 from nf-core/dev
3.2.2 Release Candidiate
2 parents 2727de3 + f1b7994 commit 6e1125d

Some content is hidden

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

61 files changed

+480
-265
lines changed

.editorconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,11 @@ indent_size = unset
2222

2323
[/assets/email*]
2424
indent_size = unset
25+
26+
# ignore Readme
27+
[README.md]
28+
indent_style = unset
29+
30+
# ignore python
31+
[*.{py}]
32+
indent_style = unset

.github/CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ If you're not used to this workflow with git, you can start with some [docs from
2727

2828
## Tests
2929

30+
You can optionally test your changes by running the pipeline locally. Then it is recommended to use the `debug` profile to
31+
receive warnings about process selectors and other debug info. Example: `nextflow run . -profile debug,test,docker --outdir <OUTDIR>`.
32+
3033
When you create a pull request with changes, [GitHub Actions](https://github.com/features/actions) will run automatic tests.
3134
Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then.
3235

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/cuta
1919
- [ ] If necessary, also make a PR on the nf-core/cutandrun _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
2020
- [ ] Make sure your code lints (`nf-core lint`).
2121
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
22+
- [ ] Check for unexpected warnings in debug mode (`nextflow run . -profile debug,test,docker --outdir <OUTDIR>`).
2223
- [ ] Usage Documentation in `docs/usage.md` is updated.
2324
- [ ] Output Documentation in `docs/output.md` is updated.
2425
- [ ] `CHANGELOG.md` is updated.

.github/workflows/awsfulltest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
}
2929
profiles: test_full
3030

31-
- uses: actions/upload-artifact@v3
31+
- uses: actions/upload-artifact@v4
3232
with:
3333
name: Tower debug log file
3434
path: |

.github/workflows/awstest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
}
2626
profiles: test
2727

28-
- uses: actions/upload-artifact@v3
28+
- uses: actions/upload-artifact@v4
2929
with:
3030
name: Tower debug log file
3131
path: |

.github/workflows/branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
2020
- name: Post PR comment
2121
if: failure()
22-
uses: mshick/add-pr-comment@v1
22+
uses: mshick/add-pr-comment@v2
2323
with:
2424
message: |
2525
## This PR is against the `master` branch :x:

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
CAPSULE_LOG: none
111111
steps:
112112
- name: Check out pipeline code
113-
uses: actions/checkout@v3
113+
uses: actions/checkout@v4
114114

115115
- name: Install Nextflow
116116
uses: nf-core/setup-nextflow@v1

.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@v7
13+
- uses: actions/stale@v9
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."
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: Test successful pipeline download with 'nf-core download'
2+
3+
# Run the workflow when:
4+
# - dispatched manually
5+
# - when a PR is opened or reopened to master branch
6+
# - the head branch of the pull request is updated, i.e. if fixes for a release are pushed last minute to dev.
7+
on:
8+
workflow_dispatch:
9+
pull_request:
10+
types:
11+
- opened
12+
branches:
13+
- master
14+
pull_request_target:
15+
branches:
16+
- master
17+
18+
env:
19+
NXF_ANSI_LOG: false
20+
21+
jobs:
22+
download:
23+
runs-on: ubuntu-latest
24+
steps:
25+
- name: Install Nextflow
26+
uses: nf-core/setup-nextflow@v1
27+
28+
- uses: actions/setup-python@v5
29+
with:
30+
python-version: "3.11"
31+
architecture: "x64"
32+
- uses: eWaterCycle/setup-singularity@v7
33+
with:
34+
singularity-version: 3.8.3
35+
36+
- name: Install dependencies
37+
run: |
38+
python -m pip install --upgrade pip
39+
pip install git+https://github.com/nf-core/tools.git@dev
40+
41+
- name: Get the repository name and current branch set as environment variable
42+
run: |
43+
echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV}
44+
echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> ${GITHUB_ENV}
45+
echo "REPO_BRANCH=${GITHUB_REF#refs/heads/}" >> ${GITHUB_ENV}
46+
47+
- name: Download the pipeline
48+
env:
49+
NXF_SINGULARITY_CACHEDIR: ./
50+
run: |
51+
nf-core download ${{ env.REPO_LOWERCASE }} \
52+
--revision ${{ env.REPO_BRANCH }} \
53+
--outdir ./${{ env.REPOTITLE_LOWERCASE }} \
54+
--compress "none" \
55+
--container-system 'singularity' \
56+
--container-library "quay.io" -l "docker.io" -l "ghcr.io" \
57+
--container-cache-utilisation 'amend' \
58+
--download-configuration
59+
60+
- name: Inspect download
61+
run: tree ./${{ env.REPOTITLE_LOWERCASE }}
62+
63+
- name: Run the downloaded pipeline
64+
env:
65+
NXF_SINGULARITY_CACHEDIR: ./
66+
NXF_SINGULARITY_HOME_MOUNT: true
67+
run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results

.github/workflows/fix-linting.yml

Lines changed: 53 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
types: [created]
55

66
jobs:
7-
deploy:
7+
fix-linting:
88
# Only run if comment is on a PR with the main repo, and if it contains the magic keywords
99
if: >
1010
contains(github.event.comment.html_url, '/pull/') &&
@@ -13,43 +13,77 @@ 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@v3
16+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
1717
with:
1818
token: ${{ secrets.nf_core_bot_auth_token }}
1919

20+
# indication that the linting is being fixed
21+
- name: React on comment
22+
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
23+
with:
24+
comment-id: ${{ github.event.comment.id }}
25+
reactions: eyes
26+
2027
# Action runs on the issue comment, so we don't get the PR by default
2128
# Use the gh cli to check out the PR
2229
- name: Checkout Pull Request
2330
run: gh pr checkout ${{ github.event.issue.number }}
2431
env:
2532
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}
2633

27-
- uses: actions/setup-node@v3
34+
# Install and run pre-commit
35+
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
36+
with:
37+
python-version: 3.11
2838

29-
- name: Install Prettier
30-
run: npm install -g prettier @prettier/plugin-php
39+
- name: Install pre-commit
40+
run: pip install pre-commit
3141

32-
# Check that we actually need to fix something
33-
- name: Run 'prettier --check'
34-
id: prettier_status
35-
run: |
36-
if prettier --check ${GITHUB_WORKSPACE}; then
37-
echo "result=pass" >> $GITHUB_OUTPUT
38-
else
39-
echo "result=fail" >> $GITHUB_OUTPUT
40-
fi
42+
- name: Run pre-commit
43+
id: pre-commit
44+
run: pre-commit run --all-files
45+
continue-on-error: true
4146

42-
- name: Run 'prettier --write'
43-
if: steps.prettier_status.outputs.result == 'fail'
44-
run: prettier --write ${GITHUB_WORKSPACE}
47+
# indication that the linting has finished
48+
- name: react if linting finished succesfully
49+
if: steps.pre-commit.outcome == 'success'
50+
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
51+
with:
52+
comment-id: ${{ github.event.comment.id }}
53+
reactions: "+1"
4554

4655
- name: Commit & push changes
47-
if: steps.prettier_status.outputs.result == 'fail'
56+
id: commit-and-push
57+
if: steps.pre-commit.outcome == 'failure'
4858
run: |
4959
git config user.email "core@nf-co.re"
5060
git config user.name "nf-core-bot"
5161
git config push.default upstream
5262
git add .
5363
git status
54-
git commit -m "[automated] Fix linting with Prettier"
64+
git commit -m "[automated] Fix code linting"
5565
git push
66+
67+
- name: react if linting errors were fixed
68+
id: react-if-fixed
69+
if: steps.commit-and-push.outcome == 'success'
70+
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
71+
with:
72+
comment-id: ${{ github.event.comment.id }}
73+
reactions: hooray
74+
75+
- name: react if linting errors were not fixed
76+
if: steps.commit-and-push.outcome == 'failure'
77+
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
78+
with:
79+
comment-id: ${{ github.event.comment.id }}
80+
reactions: confused
81+
82+
- name: react if linting errors were not fixed
83+
if: steps.commit-and-push.outcome == 'failure'
84+
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
85+
with:
86+
issue-number: ${{ github.event.issue.number }}
87+
body: |
88+
@${{ github.actor }} I tried to fix the linting errors, but it didn't work. Please fix them manually.
89+
See [CI log](https://github.com/nf-core/cutandrun/actions/runs/${{ github.run_id }}) for more details.

0 commit comments

Comments
 (0)