Skip to content

Commit 7fb3047

Browse files
author
Simon Heumos
authored
Merge pull request #186 from nf-core/dev
1.1.1 - LATÜRNICH
2 parents 9740ffc + 5daf69e commit 7fb3047

File tree

28 files changed

+132
-88
lines changed

28 files changed

+132
-88
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,7 @@
1010
"vscode": {
1111
// Set *default* container specific settings.json values on container create.
1212
"settings": {
13-
"python.defaultInterpreterPath": "/opt/conda/bin/python",
14-
"python.linting.enabled": true,
15-
"python.linting.pylintEnabled": true,
16-
"python.formatting.autopep8Path": "/opt/conda/bin/autopep8",
17-
"python.formatting.yapfPath": "/opt/conda/bin/yapf",
18-
"python.linting.flake8Path": "/opt/conda/bin/flake8",
19-
"python.linting.pycodestylePath": "/opt/conda/bin/pycodestyle",
20-
"python.linting.pydocstylePath": "/opt/conda/bin/pydocstyle",
21-
"python.linting.pylintPath": "/opt/conda/bin/pylint"
13+
"python.defaultInterpreterPath": "/opt/conda/bin/python"
2214
},
2315

2416
// Add the IDs of extensions you want installed when the container is created.

.github/CONTRIBUTING.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ 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-
:::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-
:::
12+
> [!NOTE]
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)).
1514
1615
## Contribution workflow
1716

@@ -27,8 +26,11 @@ If you're not used to this workflow with git, you can start with some [docs from
2726

2827
## Tests
2928

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>`.
29+
You have the option to test your changes locally by running the pipeline. For receiving warnings about process selectors and other `debug` information, it is recommended to use the debug profile. Execute all the tests with the following command:
30+
31+
```bash
32+
nf-test test --profile debug,test,docker --verbose
33+
```
3234

3335
When you create a pull request with changes, [GitHub Actions](https://github.com/features/actions) will run automatic tests.
3436
Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then.
@@ -90,7 +92,7 @@ Once there, use `nf-core schema build` to add to `nextflow_schema.json`.
9092

9193
Sensible defaults for process resource requirements (CPUs / memory / time) for a process should be defined in `conf/base.config`. These should generally be specified generic with `withLabel:` selectors so they can be shared across multiple processes/steps of the pipeline. A nf-core standard set of labels that should be followed where possible can be seen in the [nf-core pipeline template](https://github.com/nf-core/tools/blob/master/nf_core/pipeline-template/conf/base.config), which has the default process as a single core-process, and then different levels of multi-core configurations for increasingly large memory requirements defined with standardised labels.
9294

93-
The process resources can be passed on to the tool dynamically within the process with the `${task.cpu}` and `${task.memory}` variables in the `script:` block.
95+
The process resources can be passed on to the tool dynamically within the process with the `${task.cpus}` and `${task.memory}` variables in the `script:` block.
9496

9597
### Naming schemes
9698

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/pang
1818
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/pangenome/tree/master/.github/CONTRIBUTING.md)
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`).
21-
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
21+
- [ ] Ensure the test suite passes (`nf-test test main.nf.test -profile test,docker`).
2222
- [ ] Check for unexpected warnings in debug mode (`nextflow run . -profile debug,test,docker --outdir <OUTDIR>`).
2323
- [ ] Usage Documentation in `docs/usage.md` is updated.
2424
- [ ] Output Documentation in `docs/output.md` is updated.

.github/workflows/awsfulltest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Launch workflow via tower
17-
uses: seqeralabs/action-tower-launch@922e5c8d5ac4e918107ec311d2ebbd65e5982b3d # v2
17+
uses: seqeralabs/action-tower-launch@v2
1818
with:
1919
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
2020
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
2828
}
2929
profiles: test_full
3030

31-
- uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
31+
- uses: actions/upload-artifact@v4
3232
with:
3333
name: Tower debug log file
3434
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@922e5c8d5ac4e918107ec311d2ebbd65e5982b3d # v2
15+
uses: seqeralabs/action-tower-launch@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@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
28+
- uses: actions/upload-artifact@v4
2929
with:
3030
name: Tower debug log file
3131
path: |

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
3232

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

@@ -50,7 +50,7 @@ jobs:
5050
strategy:
5151
matrix:
5252
parameters:
53-
- '--vcf_spec "gi|568815561:#,gi|568815567:#"'
53+
- '--vcf_spec "gi|568815561:5,gi|568815567:25"'
5454
steps:
5555
- name: Check out pipeline code
5656
uses: actions/checkout@v3
@@ -164,7 +164,7 @@ jobs:
164164
parameters:
165165
- "--communities"
166166
- "--communities --wfmash_chunks 2"
167-
- '--communities --vcf_spec "gi|568815561:#,gi|568815567:#"'
167+
- '--communities --vcf_spec "gi|568815561:5,gi|568815567:25"'
168168
steps:
169169
- name: Check out pipeline code
170170
uses: actions/checkout@v3

.github/workflows/download_pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-latest
2929
steps:
3030
- name: Install Nextflow
31-
uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1
31+
uses: nf-core/setup-nextflow@v2
3232

3333
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
3434
with:

.github/workflows/linting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
3636

3737
- name: Install Nextflow
38-
uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1
38+
uses: nf-core/setup-nextflow@v1
3939

4040
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
4141
with:

.github/workflows/release-announcements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: get topics and convert to hashtags
1313
id: get_topics
1414
run: |
15-
curl -s https://nf-co.re/pipelines.json | jq -r '.remote_workflows[] | select(.name == "${{ github.repository }}") | .topics[]' | awk '{print "#"$0}' | tr '\n' ' ' > $GITHUB_OUTPUT
15+
curl -s https://nf-co.re/pipelines.json | jq -r '.remote_workflows[] | select(.full_name == "${{ github.repository }}") | .topics[]' | awk '{print "#"$0}' | tr '\n' ' ' >> $GITHUB_OUTPUT
1616
1717
- uses: rzr/fediverse-action@master
1818
with:

.gitpod.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@ tasks:
1010
1111
vscode:
1212
extensions: # based on nf-core.nf-core-extensionpack
13-
- codezombiech.gitignore # Language support for .gitignore files
14-
# - cssho.vscode-svgviewer # SVG viewer
1513
- esbenp.prettier-vscode # Markdown/CommonMark linting and style checking for Visual Studio Code
16-
- eamodio.gitlens # Quickly glimpse into whom, why, and when a line or code block was changed
1714
- EditorConfig.EditorConfig # override user/workspace settings with settings found in .editorconfig files
1815
- Gruntfuggly.todo-tree # Display TODO and FIXME in a tree view in the activity bar
1916
- mechatroner.rainbow-csv # Highlight columns in csv files in different colors
20-
# - nextflow.nextflow # Nextflow syntax highlighting
17+
# - nextflow.nextflow # Nextflow syntax highlighting
2118
- oderwat.indent-rainbow # Highlight indentation level
2219
- streetsidesoftware.code-spell-checker # Spelling checker for source code
20+
- charliermarsh.ruff # Code linter Ruff

0 commit comments

Comments
 (0)