Skip to content

Commit 9e83630

Browse files
authored
Merge pull request #158 from nf-core/dev
First release
2 parents 0da370a + 0df116a commit 9e83630

287 files changed

Lines changed: 13541 additions & 2388 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: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,15 @@
22
"name": "nfcore",
33
"image": "nfcore/gitpod:latest",
44
"remoteUser": "gitpod",
5+
"runArgs": ["--privileged"],
56

67
// Configure tool-specific properties.
78
"customizations": {
89
// Configure properties specific to VS Code.
910
"vscode": {
1011
// Set *default* container specific settings.json values on container create.
1112
"settings": {
12-
"python.defaultInterpreterPath": "/opt/conda/bin/python",
13-
"python.linting.enabled": true,
14-
"python.linting.pylintEnabled": true,
15-
"python.formatting.autopep8Path": "/opt/conda/bin/autopep8",
16-
"python.formatting.yapfPath": "/opt/conda/bin/yapf",
17-
"python.linting.flake8Path": "/opt/conda/bin/flake8",
18-
"python.linting.pycodestylePath": "/opt/conda/bin/pycodestyle",
19-
"python.linting.pydocstylePath": "/opt/conda/bin/pydocstyle",
20-
"python.linting.pylintPath": "/opt/conda/bin/pylint"
13+
"python.defaultInterpreterPath": "/opt/conda/bin/python"
2114
},
2215

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

.editorconfig

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,16 @@ 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 python and markdown
32+
[*.{py,md}]
33+
indent_style = unset

.github/CONTRIBUTING.md

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,41 @@
1-
# nf-core/msa: Contributing Guidelines
1+
# nf-core/multiplesequencealign: Contributing Guidelines
22

33
Hi there!
4-
Many thanks for taking an interest in improving nf-core/msa.
4+
Many thanks for taking an interest in improving nf-core/multiplesequencealign.
55

6-
We try to manage the required tasks for nf-core/msa using GitHub issues, you probably came to this page when creating one.
6+
We try to manage the required tasks for nf-core/multiplesequencealign using GitHub issues, you probably came to this page when creating one.
77
Please use the pre-filled template to save time.
88

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/msa then the best place to ask is on the nf-core Slack [#msa](https://nfcore.slack.com/channels/msa) channel ([join our Slack here](https://nf-co.re/join/slack)).
12+
> [!NOTE]
13+
> If you need help using or modifying nf-core/multiplesequencealign then the best place to ask is on the nf-core Slack [#multiplesequencealign](https://nfcore.slack.com/channels/multiplesequencealign) channel ([join our Slack here](https://nf-co.re/join/slack)).
1314
1415
## Contribution workflow
1516

16-
If you'd like to write some code for nf-core/msa, the standard workflow is as follows:
17+
If you'd like to write some code for nf-core/multiplesequencealign, the standard workflow is as follows:
1718

18-
1. Check that there isn't already an issue about your idea in the [nf-core/msa issues](https://github.com/nf-core/msa/issues) to avoid duplicating work. If there isn't one already, please create one so that others know you're working on this
19-
2. [Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [nf-core/msa repository](https://github.com/nf-core/msa) to your GitHub account
19+
1. Check that there isn't already an issue about your idea in the [nf-core/multiplesequencealign issues](https://github.com/nf-core/multiplesequencealign/issues) to avoid duplicating work. If there isn't one already, please create one so that others know you're working on this
20+
2. [Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [nf-core/multiplesequencealign repository](https://github.com/nf-core/multiplesequencealign) to your GitHub account
2021
3. Make the necessary changes / additions within your forked repository following [Pipeline conventions](#pipeline-contribution-conventions)
2122
4. Use `nf-core schema build` and add any new parameters to the pipeline JSON schema (requires [nf-core tools](https://github.com/nf-core/tools) >= 1.10).
2223
5. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged
2324

2425
If you're not used to this workflow with git, you can start with some [docs from GitHub](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests) or even their [excellent `git` resources](https://try.github.io/).
2526

27+
:::note
28+
! There is an extended documentation for adding specific module types into this pipeline at [extending](../docs/extending.md).
29+
:::
30+
2631
## Tests
2732

33+
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:
34+
35+
```bash
36+
nf-test test --profile debug,test,docker --verbose
37+
```
38+
2839
When you create a pull request with changes, [GitHub Actions](https://github.com/features/actions) will run automatic tests.
2940
Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then.
3041

@@ -54,11 +65,11 @@ These tests are run both with the latest available version of `Nextflow` and als
5465

5566
## Getting help
5667

57-
For further information/help, please consult the [nf-core/msa documentation](https://nf-co.re/msa/usage) and don't hesitate to get in touch on the nf-core Slack [#msa](https://nfcore.slack.com/channels/msa) channel ([join our Slack here](https://nf-co.re/join/slack)).
68+
For further information/help, please consult the [nf-core/multiplesequencealign documentation](https://nf-co.re/multiplesequencealign/usage) and don't hesitate to get in touch on the nf-core Slack [#multiplesequencealign](https://nfcore.slack.com/channels/multiplesequencealign) channel ([join our Slack here](https://nf-co.re/join/slack)).
5869

5970
## Pipeline contribution conventions
6071

61-
To make the nf-core/msa code and processing logic more understandable for new contributors and to ensure quality, we semi-standardise the way the code and other contributions are written.
72+
To make the nf-core/multiplesequencealign code and processing logic more understandable for new contributors and to ensure quality, we semi-standardise the way the code and other contributions are written.
6273

6374
### Adding a new step
6475

@@ -85,7 +96,7 @@ Once there, use `nf-core schema build` to add to `nextflow_schema.json`.
8596

8697
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.
8798

88-
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.
99+
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.
89100

90101
### Naming schemes
91102

@@ -108,7 +119,7 @@ This repo includes a devcontainer configuration which will create a GitHub Codes
108119

109120
To get started:
110121

111-
- Open the repo in [Codespaces](https://github.com/nf-core/msa/codespaces)
122+
- Open the repo in [Codespaces](https://github.com/nf-core/multiplesequencealign/codespaces)
112123
- Tools installed
113124
- nf-core
114125
- Nextflow

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ body:
88
Before you post this issue, please check the documentation:
99
1010
- [nf-core website: troubleshooting](https://nf-co.re/usage/troubleshooting)
11-
- [nf-core/msa pipeline documentation](https://nf-co.re/msa/usage)
11+
- [nf-core/multiplesequencealign pipeline documentation](https://nf-co.re/multiplesequencealign/usage)
1212
1313
- type: textarea
1414
id: description
@@ -47,4 +47,4 @@ body:
4747
* Executor _(eg. slurm, local, awsbatch)_
4848
* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter, Charliecloud, or Apptainer)_
4949
* OS _(eg. CentOS Linux, macOS, Linux Mint)_
50-
* Version of nf-core/msa _(eg. 1.1, 1.5, 1.8.2)_
50+
* Version of nf-core/multiplesequencealign _(eg. 1.1, 1.5, 1.8.2)_

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ contact_links:
22
- name: Join nf-core
33
url: https://nf-co.re/join
44
about: Please join the nf-core community here
5-
- name: "Slack #msa channel"
6-
url: https://nfcore.slack.com/channels/msa
7-
about: Discussion about the nf-core/msa pipeline
5+
- name: "Slack #multiplesequencealign channel"
6+
url: https://nfcore.slack.com/channels/multiplesequencealign
7+
about: Discussion about the nf-core/multiplesequencealign pipeline

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Feature request
2-
description: Suggest an idea for the nf-core/msa pipeline
2+
description: Suggest an idea for the nf-core/multiplesequencealign pipeline
33
labels: enhancement
44
body:
55
- type: textarea

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
<!--
2-
# nf-core/msa pull request
2+
# nf-core/multiplesequencealign pull request
33
4-
Many thanks for contributing to nf-core/msa!
4+
Many thanks for contributing to nf-core/multiplesequencealign!
55
66
Please fill in the appropriate checklist below (delete whatever is not relevant).
77
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/msa/tree/master/.github/CONTRIBUTING.md)
11+
Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/multiplesequencealign/tree/master/.github/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/msa/tree/master/.github/CONTRIBUTING.md)
19-
- [ ] If necessary, also make a PR on the nf-core/msa _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
18+
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/multiplesequencealign/tree/master/.github/CONTRIBUTING.md)
19+
- [ ] If necessary, also make a PR on the nf-core/multiplesequencealign _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: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,29 @@ on:
88
types: [published]
99
workflow_dispatch:
1010
jobs:
11-
run-tower:
11+
run-platform:
1212
name: Run AWS full tests
13-
if: github.repository == 'nf-core/msa'
13+
if: github.repository == 'nf-core/multiplesequencealign'
1414
runs-on: ubuntu-latest
1515
steps:
16-
- name: Launch workflow via tower
16+
- name: Launch workflow via Seqera Platform
1717
uses: seqeralabs/action-tower-launch@v2
18-
# TODO nf-core: You can customise AWS full pipeline tests as required
19-
# Add full size test data (but still relatively small datasets for few samples)
20-
# on the `test_full.config` test runs with only one set of parameters
2118
with:
2219
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
2320
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
2421
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
2522
revision: ${{ github.sha }}
26-
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/msa/work-${{ github.sha }}
23+
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/multiplesequencealign/work-${{ github.sha }}
2724
parameters: |
2825
{
2926
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
30-
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/msa/results-${{ github.sha }}"
27+
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/multiplesequencealign/results-${{ github.sha }}"
3128
}
3229
profiles: test_full
3330

34-
- uses: actions/upload-artifact@v3
31+
- uses: actions/upload-artifact@v4
3532
with:
36-
name: Tower debug log file
33+
name: Seqera Platform debug log file
3734
path: |
38-
tower_action_*.log
39-
tower_action_*.json
35+
seqera_platform_action_*.log
36+
seqera_platform_action_*.json

.github/workflows/awstest.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@ name: nf-core AWS test
55
on:
66
workflow_dispatch:
77
jobs:
8-
run-tower:
8+
run-platform:
99
name: Run AWS tests
10-
if: github.repository == 'nf-core/msa'
10+
if: github.repository == 'nf-core/multiplesequencealign'
1111
runs-on: ubuntu-latest
1212
steps:
13-
# Launch workflow using Tower CLI tool action
14-
- name: Launch workflow via tower
13+
# Launch workflow using Seqera Platform CLI tool action
14+
- name: Launch workflow via Seqera Platform
1515
uses: seqeralabs/action-tower-launch@v2
1616
with:
1717
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
1818
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
1919
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
2020
revision: ${{ github.sha }}
21-
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/msa/work-${{ github.sha }}
21+
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/multiplesequencealign/work-${{ github.sha }}
2222
parameters: |
2323
{
24-
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/msa/results-test-${{ github.sha }}"
24+
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/multiplesequencealign/results-test-${{ github.sha }}"
2525
}
2626
profiles: test
2727

28-
- uses: actions/upload-artifact@v3
28+
- uses: actions/upload-artifact@v4
2929
with:
30-
name: Tower debug log file
30+
name: Seqera Platform debug log file
3131
path: |
32-
tower_action_*.log
33-
tower_action_*.json
32+
seqera_platform_action_*.log
33+
seqera_platform_action_*.json

.github/workflows/branch.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ jobs:
1111
steps:
1212
# PRs to the nf-core repo master branch are only ok if coming from the nf-core repo `dev` or any `patch` branches
1313
- name: Check PRs
14-
if: github.repository == 'nf-core/msa'
14+
if: github.repository == 'nf-core/multiplesequencealign'
1515
run: |
16-
{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/msa ]] && [[ $GITHUB_HEAD_REF == "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]
16+
{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/multiplesequencealign ]] && [[ $GITHUB_HEAD_REF == "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]
1717
1818
# If the above check failed, post a comment on the PR explaining the failure
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:

0 commit comments

Comments
 (0)