Skip to content

Commit 9740ffc

Browse files
author
Simon Heumos
authored
Merge pull request #179 from nf-core/dev
release 1.1.0 - Schmuddlweddr
2 parents fc6afeb + d51fa7a commit 9740ffc

File tree

153 files changed

+4021
-1310
lines changed

Some content is hidden

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

153 files changed

+4021
-1310
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "nfcore",
33
"image": "nfcore/gitpod:latest",
44
"remoteUser": "gitpod",
5+
"runArgs": ["--privileged"],
56

67
// Configure tool-specific properties.
78
"customizations": {

.editorconfig

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,20 @@ end_of_line = unset
1818
insert_final_newline = unset
1919
trim_trailing_whitespace = unset
2020
indent_style = unset
21-
indent_size = unset
21+
[/subworkflows/nf-core/**]
22+
charset = unset
23+
end_of_line = unset
24+
insert_final_newline = unset
25+
trim_trailing_whitespace = unset
26+
indent_style = unset
2227

2328
[/assets/email*]
2429
indent_size = unset
30+
31+
# ignore Readme
32+
[README.md]
33+
indent_style = unset
34+
35+
# ignore python
36+
[*.{py,md}]
37+
indent_style = unset

.github/CONTRIBUTING.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ Please use the pre-filled template to save time.
99
However, don't be put off by this template - other more general issues and suggestions are welcome!
1010
Contributions to the code are even more welcome ;)
1111

12-
> If you need help using or modifying nf-core/pangenome then the best place to ask is on the nf-core Slack [#pangenome](https://nfcore.slack.com/channels/pangenome) channel ([join our Slack here](https://nf-co.re/join/slack)).
12+
:::info
13+
If you need help using or modifying nf-core/pangenome then the best place to ask is on the nf-core Slack [#pangenome](https://nfcore.slack.com/channels/pangenome) channel ([join our Slack here](https://nf-co.re/join/slack)).
14+
:::
1315

1416
## Contribution workflow
1517

@@ -25,6 +27,9 @@ If you're not used to this workflow with git, you can start with some [docs from
2527

2628
## Tests
2729

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+
2833
When you create a pull request with changes, [GitHub Actions](https://github.com/features/actions) will run automatic tests.
2934
Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then.
3035

.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/pang
1919
- [ ] If necessary, also make a PR on the nf-core/pangenome _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: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Launch workflow via tower
17-
uses: seqeralabs/action-tower-launch@v2
18-
# Add full size test data (but still relatively small datasets for few samples)
19-
# on the `test_full.config` test runs with only one set of parameters
17+
uses: seqeralabs/action-tower-launch@922e5c8d5ac4e918107ec311d2ebbd65e5982b3d # v2
2018
with:
2119
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
2220
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
@@ -30,7 +28,7 @@ jobs:
3028
}
3129
profiles: test_full
3230

33-
- uses: actions/upload-artifact@v3
31+
- uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
3432
with:
3533
name: Tower debug log file
3634
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 Tower CLI tool action
1414
- name: Launch workflow via tower
15-
uses: seqeralabs/action-tower-launch@v2
15+
uses: seqeralabs/action-tower-launch@922e5c8d5ac4e918107ec311d2ebbd65e5982b3d # v2
1616
with:
1717
workspace_id: ${{ secrets.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@v3
28+
- uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # 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@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2
2323
with:
2424
message: |
2525
## This PR is against the `master` branch :x:

.github/workflows/ci.yml

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,16 @@ jobs:
2828
- "latest-everything"
2929
steps:
3030
- name: Check out pipeline code
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
3232

3333
- name: Install Nextflow
34-
uses: nf-core/setup-nextflow@v1
34+
uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1
3535
with:
3636
version: "${{ matrix.NXF_VER }}"
3737

38+
- name: Disk space cleanup
39+
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
40+
3841
- name: Run pipeline with test data
3942
run: |
4043
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results
@@ -128,6 +131,29 @@ jobs:
128131
run: |
129132
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results ${{ matrix.parameters }}
130133
134+
wfmash_sparse_map:
135+
name: Run pipeline with wfmash_sparse_map parameters
136+
# Only run on push if this is the nf-core dev branch (merged PRs)
137+
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/pangenome') }}"
138+
runs-on: ubuntu-latest
139+
strategy:
140+
matrix:
141+
parameters:
142+
- "--wfmash_sparse_map auto"
143+
- "--wfmash_sparse_map 0.5"
144+
steps:
145+
- name: Check out pipeline code
146+
uses: actions/checkout@v3
147+
148+
- name: Install Nextflow
149+
uses: nf-core/setup-nextflow@v1
150+
with:
151+
version: "23.04.0"
152+
153+
- name: Run pipeline with test data and wfmash_only parameters
154+
run: |
155+
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results ${{ matrix.parameters }}
156+
131157
communities:
132158
name: Run pipeline with community parameters
133159
# Only run on push if this is the nf-core dev branch (merged PRs)
@@ -151,3 +177,25 @@ jobs:
151177
- name: Run pipeline with test data and wfmash_only parameters
152178
run: |
153179
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results ${{ matrix.parameters }}
180+
181+
metric_parameter_suffixes:
182+
name: Run pipeline with metric parameter suffixes
183+
# Only run on push if this is the nf-core dev branch (merged PRs)
184+
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/pangenome') }}"
185+
runs-on: ubuntu-latest
186+
strategy:
187+
matrix:
188+
parameters:
189+
- "--wfmash_sequence_length 8k --wfmash_block_length 38K --seqwish_transclose_batch 9M"
190+
steps:
191+
- name: Check out pipeline code
192+
uses: actions/checkout@v3
193+
194+
- name: Install Nextflow
195+
uses: nf-core/setup-nextflow@v1
196+
with:
197+
version: "23.04.0"
198+
199+
- name: Run pipeline with test data and wfmash_only parameters
200+
run: |
201+
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results ${{ matrix.parameters }}

.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@28ca1036281a5e5922ead5184a1bbf96e5fc984e # 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: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
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+
inputs:
10+
testbranch:
11+
description: "The specific branch you wish to utilize for the test execution of nf-core download."
12+
required: true
13+
default: "dev"
14+
pull_request:
15+
types:
16+
- opened
17+
branches:
18+
- master
19+
pull_request_target:
20+
branches:
21+
- master
22+
23+
env:
24+
NXF_ANSI_LOG: false
25+
26+
jobs:
27+
download:
28+
runs-on: ubuntu-latest
29+
steps:
30+
- name: Install Nextflow
31+
uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1
32+
33+
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
34+
with:
35+
python-version: "3.11"
36+
architecture: "x64"
37+
- uses: eWaterCycle/setup-singularity@931d4e31109e875b13309ae1d07c70ca8fbc8537 # v7
38+
with:
39+
singularity-version: 3.8.3
40+
41+
- name: Install dependencies
42+
run: |
43+
python -m pip install --upgrade pip
44+
pip install git+https://github.com/nf-core/tools.git@dev
45+
46+
- name: Get the repository name and current branch set as environment variable
47+
run: |
48+
echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV}
49+
echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> ${GITHUB_ENV}
50+
echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> ${GITHUB_ENV}
51+
52+
- name: Download the pipeline
53+
env:
54+
NXF_SINGULARITY_CACHEDIR: ./
55+
run: |
56+
nf-core download ${{ env.REPO_LOWERCASE }} \
57+
--revision ${{ env.REPO_BRANCH }} \
58+
--outdir ./${{ env.REPOTITLE_LOWERCASE }} \
59+
--compress "none" \
60+
--container-system 'singularity' \
61+
--container-library "quay.io" -l "docker.io" -l "ghcr.io" \
62+
--container-cache-utilisation 'amend' \
63+
--download-configuration
64+
65+
- name: Inspect download
66+
run: tree ./${{ env.REPOTITLE_LOWERCASE }}
67+
68+
- name: Run the downloaded pipeline
69+
env:
70+
NXF_SINGULARITY_CACHEDIR: ./
71+
NXF_SINGULARITY_HOME_MOUNT: true
72+
run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results

0 commit comments

Comments
 (0)