Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
360 commits
Select commit Hold shift + click to select a range
2388c20
clean
luisas Dec 13, 2024
eaa4fca
fix merge
luisas Dec 13, 2024
7068030
fix lint
luisas Dec 13, 2024
9f23064
fix linting
luisas Dec 13, 2024
7edf523
fix linting
luisas Dec 13, 2024
978237a
fix linting
luisas Dec 13, 2024
16c4854
fix linting
luisas Dec 13, 2024
43a286e
up
luisas Dec 13, 2024
6ac01ff
Update docs/usage.md
luisas Dec 13, 2024
8249493
Update docs/usage.md
luisas Dec 13, 2024
ea46b39
upd
luisas Dec 13, 2024
fbb9657
fix
luisas Dec 13, 2024
655bde6
fix conf
luisas Dec 13, 2024
194166c
up
luisas Dec 13, 2024
bd1847e
Merge pull request #180 from nf-core/nf-core-template-merge-3.1.0
luisas Dec 13, 2024
5f3872e
groovy
luisas Dec 17, 2024
7bb63f1
groovy functional
luisas Dec 17, 2024
84e53ba
Add groovy in main code
luisas Dec 17, 2024
ccbf29b
fix lint
luisas Dec 17, 2024
17b74b4
fix lintint
luisas Dec 17, 2024
9702af4
fix lint
luisas Dec 17, 2024
5e588f7
up
luisas Dec 17, 2024
5f32360
upp
luisas Dec 18, 2024
26062dd
upd
luisas Dec 18, 2024
3264f4f
fix lint
luisas Dec 18, 2024
2d04752
update modules
luisas Dec 18, 2024
ecdd23c
a
luisas Dec 18, 2024
5e9e9df
Update modules/local/custom_pdbtofasta.nf
luisas Dec 19, 2024
ed958be
Update modules/local/custom_pdbtofasta.nf
luisas Dec 19, 2024
f4b4060
Update subworkflows/local/align.nf
luisas Dec 19, 2024
0d0a1f2
Update subworkflows/local/utils_nfcore_multiplesequencealign_pipeline…
luisas Dec 19, 2024
6e1e0d0
Update subworkflows/local/align.nf
luisas Dec 19, 2024
4747bb8
Update subworkflows/local/utils_nfcore_multiplesequencealign_pipeline…
luisas Dec 19, 2024
b28eee8
Update subworkflows/local/utils_nfcore_multiplesequencealign_pipeline…
luisas Dec 19, 2024
defc259
Update subworkflows/local/utils_nfcore_multiplesequencealign_pipeline…
luisas Dec 19, 2024
0357b28
Update subworkflows/local/utils_nfcore_multiplesequencealign_pipeline…
luisas Dec 19, 2024
c24a3e6
Update subworkflows/local/utils_nfcore_multiplesequencealign_pipeline…
luisas Dec 19, 2024
8f47237
Update subworkflows/local/align.nf
luisas Dec 19, 2024
bc0f0b4
Update subworkflows/local/align.nf
luisas Dec 19, 2024
e5816e1
Update subworkflows/local/align.nf
luisas Dec 19, 2024
8e3c979
Update subworkflows/local/compute_trees.nf
luisas Dec 19, 2024
6aa2a49
Update subworkflows/local/compute_trees.nf
luisas Dec 19, 2024
7c0f9d5
Update subworkflows/local/compute_trees.nf
luisas Dec 19, 2024
645de79
Update subworkflows/local/compute_trees.nf
luisas Dec 19, 2024
934eb3f
Update subworkflows/local/visualization.nf
luisas Dec 19, 2024
c75a758
Update subworkflows/local/visualization.nf
luisas Dec 19, 2024
d8f773c
Update subworkflows/local/visualization.nf
luisas Dec 19, 2024
1f5ded0
Update subworkflows/local/visualization.nf
luisas Dec 19, 2024
b9abba7
Update subworkflows/local/visualization.nf
luisas Dec 19, 2024
a427130
Update subworkflows/local/visualization.nf
luisas Dec 19, 2024
46af01e
Update subworkflows/local/visualization.nf
luisas Dec 19, 2024
adc2c40
Apply suggestions from code review
luisas Dec 19, 2024
1bb56cf
Update subworkflows/local/utils_nfcore_multiplesequencealign_pipeline…
luisas Dec 19, 2024
d15dc85
Update subworkflows/local/utils_nfcore_multiplesequencealign_pipeline…
luisas Dec 19, 2024
8fcf20b
Update changelog
luisas Dec 19, 2024
82dc93a
Update comment
luisas Dec 19, 2024
5323ff5
up
luisas Dec 19, 2024
015b602
Merge pull request #179 from luisas/add_GT_foldmason
luisas Dec 19, 2024
19ba58a
Template update for nf-core/tools version 3.1.2
nf-core-bot Jan 20, 2025
fb37b22
Merge branch 'dev' into nf-core-template-merge-3.1.2
luisas Jan 23, 2025
a676e64
fix linting
luisas Jan 23, 2025
9494eaf
merge dev
luisas Jan 24, 2025
e748343
Update docs
luisas Jan 24, 2025
9356e7a
Update PULL_REQUEST_TEMPLATE
luisas Jan 24, 2025
c8c2171
Update readme
luisas Jan 24, 2025
68cf8ed
fix for tests
luisas Jan 27, 2025
e169385
Fix learnmsa
luisas Jan 27, 2025
eb49d98
fix for tests
luisas Jan 27, 2025
94bea8d
Merge pull request #182 from nf-core/nf-core-template-merge-3.1.2
luisas Jan 27, 2025
c88510a
Upd
luisas Jan 27, 2025
63f1e23
up
luisas Jan 27, 2025
9a7ac88
up
luisas Jan 27, 2025
7507eb5
up
luisas Jan 27, 2025
5815320
Template update for nf-core/tools version 3.2.0
nf-core-bot Jan 27, 2025
bf71052
update input flags
luisas Jan 27, 2025
3e5bea6
up
luisas Jan 27, 2025
f7355d1
Add version to final report sheet
luisas Jan 28, 2025
5955174
add
luisas Jan 28, 2025
6fe35d5
fast add
luisas Jan 28, 2025
7655848
fast add
luisas Jan 28, 2025
6d923e2
fast add
luisas Jan 28, 2025
e6d6d52
fast add
luisas Jan 28, 2025
acf6a3f
fast add
luisas Jan 28, 2025
91c77e1
fast add
luisas Jan 28, 2025
19c2872
fast add
luisas Jan 28, 2025
6ad0d1d
fast add
luisas Jan 28, 2025
1ad22c2
fast add
luisas Jan 28, 2025
79383cf
fast add
luisas Jan 28, 2025
c63dfc5
fast add
luisas Jan 28, 2025
dce216f
Merge branch 'dev' into nf-core-template-merge-3.2.0
luisas Jan 28, 2025
9f56289
fix prettier
luisas Jan 28, 2025
9abeae6
fast add
luisas Jan 28, 2025
efbe5e5
fast add
luisas Jan 29, 2025
5bd85ae
fast add
luisas Jan 29, 2025
1ddd92d
fast add
luisas Jan 29, 2025
e75e5a8
Merge pull request #187 from nf-core/nf-core-template-merge-3.2.0
luisas Jan 29, 2025
9eecaf5
fast add
luisas Jan 29, 2025
efb3c67
fast add
luisas Jan 29, 2025
e88e9b6
fast add
luisas Jan 29, 2025
1d3cf54
fast add
luisas Jan 29, 2025
564b70e
fast add
luisas Jan 29, 2025
033ef3e
fast add
luisas Jan 30, 2025
019f885
fast add
luisas Jan 30, 2025
f409db1
fast add
luisas Jan 30, 2025
8ab146d
fast add
luisas Jan 30, 2025
acb6370
fast add
luisas Jan 30, 2025
16e837f
fast add
luisas Jan 30, 2025
028c76e
fast add
luisas Jan 30, 2025
9b28aeb
fast add
luisas Jan 30, 2025
c2bf60e
fast add
luisas Jan 30, 2025
c0964f1
fast add
luisas Jan 31, 2025
341f0fb
fast add
luisas Jan 31, 2025
373274c
fast add
luisas Jan 31, 2025
dc2ad36
fast add
luisas Jan 31, 2025
4150fb5
fast add
luisas Jan 31, 2025
016e91b
fast add
luisas Jan 31, 2025
f39a21b
fast add
luisas Jan 31, 2025
191f03d
fast add
luisas Jan 31, 2025
98b95e6
fast add
luisas Jan 31, 2025
d09e9c4
fast add
luisas Jan 31, 2025
04d69bb
fast add
luisas Jan 31, 2025
89a23d6
fast add
luisas Jan 31, 2025
685c2a6
fast add
luisas Jan 31, 2025
1b6dedb
fast add
luisas Jan 31, 2025
7ebe760
fast add
luisas Jan 31, 2025
ef549d9
Update fixes
luisas Jan 31, 2025
4ebd846
update
luisas Jan 31, 2025
f6e17ec
fast add
luisas Jan 31, 2025
53acd6b
Fix lint
luisas Feb 3, 2025
4332fc0
Changelog
luisas Feb 3, 2025
a7e2a55
Merge branch 'dev' into add_gpu_suppor
luisas Feb 3, 2025
1501efb
Changelog
luisas Feb 3, 2025
acead5f
Merge branch 'add_gpu_suppor' of github.com:luisas/multiplesequenceal…
luisas Feb 3, 2025
4e4f636
Fix lint
luisas Feb 3, 2025
21d1980
Fix lint
luisas Feb 3, 2025
17b7013
Fix lint
luisas Feb 3, 2025
615a239
fast add
luisas Feb 3, 2025
4a5c98f
fast add
luisas Feb 3, 2025
d13a100
Update README.md
luisas Feb 3, 2025
fb3fb65
Update README.md
luisas Feb 3, 2025
47b0352
Update README.md
luisas Feb 3, 2025
952be09
Update README.md
luisas Feb 3, 2025
c4a6514
Update README.md
luisas Feb 3, 2025
7e70095
Update docs/usage/FAQs.md
luisas Feb 3, 2025
a00d4f1
Update subworkflows/local/utils_nfcore_multiplesequencealign_pipeline…
luisas Feb 3, 2025
730dab7
Update subworkflows/local/utils_nfcore_multiplesequencealign_pipeline…
luisas Feb 3, 2025
89c668d
Commit Julia's comments
luisas Feb 3, 2025
4c3de2d
Merge branch 'add_gpu_suppor' of https://github.com/luisas/multiplese…
luisas Feb 3, 2025
52aefe4
Merge pull request #189 from luisas/add_gpu_suppor
luisas Feb 3, 2025
e6b35a4
merging fixed
luisas Feb 4, 2025
257b19a
fix merging
luisas Feb 4, 2025
c19d618
Fix merging bug
luisas Feb 6, 2025
ec64d75
Update outdocs
luisas Feb 7, 2025
45b0016
Up docs
luisas Feb 7, 2025
5079438
fast add
luisas Feb 7, 2025
5c35ed3
Update
luisas Feb 7, 2025
8170ad2
Fix link
luisas Feb 7, 2025
3ef01f3
Merge branch 'dev' into docs
luisas Feb 7, 2025
3815ad3
fast add
luisas Feb 7, 2025
b63ced4
fast add
luisas Feb 7, 2025
63f9035
fast add
luisas Feb 7, 2025
93c99ca
Fix comments
luisas Feb 7, 2025
a3fe986
fix link
luisas Feb 7, 2025
d3c4a3c
Merge pull request #192 from luisas/docs
luisas Feb 7, 2025
334227c
fast add
luisas Feb 7, 2025
97b1ea3
fast add
luisas Feb 7, 2025
e852dc7
fast add
luisas Feb 7, 2025
027985d
fast add
luisas Feb 7, 2025
6b3819d
fast add
luisas Feb 7, 2025
b0ee828
fast add
luisas Feb 7, 2025
6fe00c9
fast add
luisas Feb 7, 2025
0d95b59
fast add
luisas Feb 7, 2025
cc87178
fast add
luisas Feb 7, 2025
d5d3011
Move fasta conversion in main
luisas Feb 7, 2025
e7ad515
fast add
luisas Feb 7, 2025
7bceab8
fast add
luisas Feb 7, 2025
e698ee9
fast add
luisas Feb 7, 2025
5e3ffde
fast add
luisas Feb 7, 2025
b769f29
fast add
luisas Feb 7, 2025
3a57ff1
add poster
luisas Feb 11, 2025
3ccd89b
fast add
luisas Feb 11, 2025
7cd120f
fast add
luisas Feb 11, 2025
6dcb086
fast add
luisas Feb 11, 2025
24f0b8d
fast add
luisas Feb 11, 2025
8fb543a
fast add
luisas Feb 11, 2025
4e64289
fast add
luisas Feb 11, 2025
e58f072
Fix lint
luisas Feb 11, 2025
c84e5fd
Add tiny config
luisas Feb 11, 2025
ed796f0
fast add
luisas Feb 11, 2025
3870b02
fix lint
luisas Feb 11, 2025
7dd8a3c
Update modules.json
luisas Feb 12, 2025
e774c13
Update conf/test_tiny.config
luisas Feb 12, 2025
f187953
Merge pull request #195 from luisas/bug_fix
luisas Feb 12, 2025
5685f7b
fix changelog
luisas Feb 12, 2025
f061b1e
fix modules
luisas Feb 12, 2025
0704df4
update
luisas Feb 12, 2025
93b19e3
Merge pull request #196 from luisas/pre_release
luisas Feb 12, 2025
2cbceb0
tiny fixes
luisas Feb 14, 2025
72ddf91
fix links in readme
luisas Feb 14, 2025
8309766
fix links
luisas Feb 14, 2025
7e2db70
update test_full config
luisas Feb 14, 2025
e0e83d4
update modules
luisas Feb 14, 2025
97900fb
modules update
luisas Feb 15, 2025
5cfb00e
Merge pull request #198 from luisas/test
luisas Feb 15, 2025
bc8cd36
test conda
luisas Feb 16, 2025
86aaa9c
up nf versio
luisas Feb 16, 2025
335a3cc
Update
luisas Feb 16, 2025
7b62cd5
Update readme
luisas Feb 16, 2025
ef7b9c1
update modules
luisas Feb 17, 2025
f7a6db0
fix conda
luisas Feb 17, 2025
19658a1
Update conf/test_conda.config
luisas Feb 17, 2025
719046c
fix lint
luisas Feb 17, 2025
2d7877e
Merge pull request #199 from luisas/conda_fix
luisas Feb 17, 2025
fee2174
push ci
luisas Feb 17, 2025
a91ac65
update
luisas Feb 17, 2025
5eb9a4f
fix out
luisas Feb 17, 2025
75d129f
Merge pull request #200 from luisas/fix_ci.yml
luisas Feb 17, 2025
2c9aa9c
Add gpu test tag
luisas Feb 17, 2025
0304375
update ci-yml
luisas Feb 17, 2025
e8d1514
update ci-yml
luisas Feb 17, 2025
ee02132
update ci-yml
luisas Feb 17, 2025
79d4775
Merge pull request #201 from luisas/fix_download_test
luisas Feb 17, 2025
e3a4ec2
update download ci
luisas Feb 17, 2025
15c0430
update download ci
luisas Feb 17, 2025
47076bf
Merge pull request #202 from luisas/update_ci
luisas Feb 17, 2025
7a5e565
split cis
luisas Feb 18, 2025
68fbee7
fix lint
luisas Feb 18, 2025
2a3f037
fix lint
luisas Feb 18, 2025
90ae4c0
apply pr suggestions
luisas Feb 18, 2025
5127f2c
fix lint
luisas Feb 18, 2025
0271b95
Merge pull request #203 from luisas/split-cidev-cimaster
luisas Feb 18, 2025
c83f813
up nf version test
luisas Feb 18, 2025
d440bc3
Merge pull request #204 from luisas/fix_testversion
luisas Feb 18, 2025
56a3ffd
up shiny
luisas Feb 18, 2025
6eb4a35
test
luisas Feb 19, 2025
8e6d860
up
luisas Feb 19, 2025
a811643
fix
luisas Feb 19, 2025
276f593
fix
luisas Feb 19, 2025
60cafb5
Update subworkflows/local/utils_nfcore_multiplesequencealign_pipeline…
luisas Feb 19, 2025
25928bc
Merge pull request #205 from luisas/shiny_patch
luisas Feb 19, 2025
172c83c
Add Jose's comments
luisas Feb 20, 2025
347f818
fix PR templates
luisas Feb 20, 2025
bee6bdd
Fix output
luisas Feb 20, 2025
4645450
revert pull request template
luisas Feb 20, 2025
95c0384
Merge pull request #206 from nf-core/Realease_Review_Jose_Fixes
JoseEspinosa Feb 20, 2025
c8472cd
Fix test no sheet
luisas Feb 21, 2025
367df34
Merge pull request #207 from luisas/fix_test
JoseEspinosa Feb 21, 2025
5bd29fa
fix singularity config
luisas Feb 21, 2025
439a33c
fix lint
luisas Feb 21, 2025
c6b8b35
Merge pull request #208 from luisas/fix_again_pr
luisas Feb 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,7 @@ indent_size = unset
# ignore python and markdown
[*.{py,md}]
indent_style = unset

# ignore ro-crate metadata files
[**/ro-crate-metadata.json]
insert_final_newline = unset
24 changes: 12 additions & 12 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# nf-core/multiplesequencealign: Contributing Guidelines
# `nf-core/multiplesequencealign`: Contributing Guidelines

Hi there!
Many thanks for taking an interest in improving nf-core/multiplesequencealign.
Expand All @@ -19,7 +19,7 @@ If you'd like to write some code for nf-core/multiplesequencealign, the standard
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
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
3. Make the necessary changes / additions within your forked repository following [Pipeline conventions](#pipeline-contribution-conventions)
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).
4. Use `nf-core pipelines schema build` and add any new parameters to the pipeline JSON schema (requires [nf-core tools](https://github.com/nf-core/tools) >= 1.10).
5. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged

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/).
Expand All @@ -44,7 +44,7 @@ There are typically two types of tests that run:
### Lint tests

`nf-core` has a [set of guidelines](https://nf-co.re/developers/guidelines) which all pipelines must adhere to.
To enforce these and ensure that all pipelines stay in sync, we have developed a helper tool which runs checks on the pipeline code. This is in the [nf-core/tools repository](https://github.com/nf-core/tools) and once installed can be run locally with the `nf-core lint <pipeline-directory>` command.
To enforce these and ensure that all pipelines stay in sync, we have developed a helper tool which runs checks on the pipeline code. This is in the [nf-core/tools repository](https://github.com/nf-core/tools) and once installed can be run locally with the `nf-core pipelines lint <pipeline-directory>` command.

If any failures or warnings are encountered, please follow the listed URL for more documentation.

Expand All @@ -59,27 +59,27 @@ These tests are run both with the latest available version of `Nextflow` and als

:warning: Only in the unlikely and regretful event of a release happening with a bug.

- On your own fork, make a new branch `patch` based on `upstream/master`.
- On your own fork, make a new branch `patch` based on `upstream/main` or `upstream/master`.
- Fix the bug, and bump version (X.Y.Z+1).
- A PR should be made on `master` from patch to directly this particular bug.
- Open a pull-request from `patch` to `main`/`master` with the changes.

## Getting help

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)).

## Pipeline contribution conventions

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

### Adding a new step

If you wish to contribute a new step, please use the following coding standards:

1. Define the corresponding input channel into your new process from the expected previous process channel
1. Define the corresponding input channel into your new process from the expected previous process channel.
2. Write the process block (see below).
3. Define the output channel if needed (see below).
4. Add any new parameters to `nextflow.config` with a default (see below).
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core schema build` tool).
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core pipelines schema build` tool).
6. Add sanity checks and validation for all relevant parameters.
7. Perform local tests to validate that the new code works as expected.
8. If applicable, add a new test command in `.github/workflow/ci.yml`.
Expand All @@ -88,13 +88,13 @@ If you wish to contribute a new step, please use the following coding standards:

### Default values

Parameters should be initialised / defined with default values in `nextflow.config` under the `params` scope.
Parameters should be initialised / defined with default values within the `params` scope in `nextflow.config`.

Once there, use `nf-core schema build` to add to `nextflow_schema.json`.
Once there, use `nf-core pipelines schema build` to add to `nextflow_schema.json`.

### Default processes resource requirements

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.
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/main/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.

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.

Expand All @@ -107,7 +107,7 @@ Please use the following naming schemes, to make it easy to understand what is g

### Nextflow version bumping

If you are using a new feature from core Nextflow, you may bump the minimum required version of nextflow in the pipeline with: `nf-core bump-version --nextflow . [min-nf-version]`
If you are using a new feature from core Nextflow, you may bump the minimum required version of nextflow in the pipeline with: `nf-core pipelines bump-version --nextflow . [min-nf-version]`

### Images and figures

Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ body:

- [nf-core website: troubleshooting](https://nf-co.re/usage/troubleshooting)
- [nf-core/multiplesequencealign pipeline documentation](https://nf-co.re/multiplesequencealign/usage)

- type: textarea
id: description
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/mult
- [ ] If you've fixed a bug or added code that should be tested, add tests!
- [ ] 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)
- [ ] 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.
- [ ] Make sure your code lints (`nf-core lint`).
- [ ] Make sure your code lints (`nf-core pipelines lint`).
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
- [ ] Check for unexpected warnings in debug mode (`nextflow run . -profile debug,test,docker --outdir <OUTDIR>`).
- [ ] Usage Documentation in `docs/usage.md` is updated.
Expand Down
38 changes: 34 additions & 4 deletions .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,48 @@
name: nf-core AWS full size tests
# This workflow is triggered on published releases.
# This workflow is triggered on PRs opened against the main/master branch.
# It can be additionally triggered manually with GitHub actions workflow dispatch button.
# It runs the -profile 'test_full' on AWS batch

on:
release:
types: [published]
pull_request:
branches:
- main
- master
workflow_dispatch:
pull_request_review:
types: [submitted]

jobs:
run-platform:
name: Run AWS full tests
if: github.repository == 'nf-core/multiplesequencealign'
# run only if the PR is approved by at least 2 reviewers and against the master branch or manually triggered
if: github.repository == 'nf-core/multiplesequencealign' && github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'master' || github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
steps:
- name: Get PR reviews
uses: octokit/[email protected]
if: github.event_name != 'workflow_dispatch'
id: check_approvals
continue-on-error: true
with:
route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews?per_page=100
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Check for approvals
if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
run: |
echo "No review approvals found. At least 2 approvals are required to run this action automatically."
exit 1

- name: Check for enough approvals (>=2)
id: test_variables
if: github.event_name != 'workflow_dispatch'
run: |
JSON_RESPONSE='${{ steps.check_approvals.outputs.data }}'
CURRENT_APPROVALS_COUNT=$(echo $JSON_RESPONSE | jq -c '[.[] | select(.state | contains("APPROVED")) ] | length')
test $CURRENT_APPROVALS_COUNT -ge 2 || exit 1 # At least 2 approvals are required

- name: Launch workflow via Seqera Platform
uses: seqeralabs/action-tower-launch@v2
with:
Expand Down
18 changes: 10 additions & 8 deletions .github/workflows/branch.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
name: nf-core branch protection
# This workflow is triggered on PRs to master branch on the repository
# It fails when someone tries to make a PR against the nf-core `master` branch instead of `dev`
# This workflow is triggered on PRs to `main`/`master` branch on the repository
# It fails when someone tries to make a PR against the nf-core `main`/`master` branch instead of `dev`
on:
pull_request_target:
branches: [master]
branches:
- main
- master

jobs:
test:
runs-on: ubuntu-latest
steps:
# PRs to the nf-core repo master branch are only ok if coming from the nf-core repo `dev` or any `patch` branches
# PRs to the nf-core repo main/master branch are only ok if coming from the nf-core repo `dev` or any `patch` branches
- name: Check PRs
if: github.repository == 'nf-core/multiplesequencealign'
run: |
Expand All @@ -22,7 +24,7 @@ jobs:
uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2
with:
message: |
## This PR is against the `master` branch :x:
## This PR is against the `${{github.event.pull_request.base.ref}}` branch :x:

* Do not close this PR
* Click _Edit_ and change the `base` to `dev`
Expand All @@ -32,9 +34,9 @@ jobs:

Hi @${{ github.event.pull_request.user.login }},

It looks like this pull-request is has been made against the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `master` branch.
The `master` branch on nf-core repositories should always contain code from the latest release.
Because of this, PRs to `master` are only allowed if they come from the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `dev` branch.
It looks like this pull-request is has been made against the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) ${{github.event.pull_request.base.ref}} branch.
The ${{github.event.pull_request.base.ref}} branch on nf-core repositories should always contain code from the latest release.
Because of this, PRs to ${{github.event.pull_request.base.ref}} are only allowed if they come from the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `dev` branch.

You do not need to close this PR, you can change the target branch to `dev` by clicking the _"Edit"_ button at the top of this page.
Note that even after this, the test will continue to show as failing until you push a new commit.
Expand Down
64 changes: 34 additions & 30 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,75 +1,79 @@
name: nf-core CI
# This workflow runs the pipeline with the minimal test dataset to check that it completes without any syntax errors
name: nf-core CI dev
# This workflow runs the pipeline with the minimal test dataset to check that it completes without any syntax errors upon dev PR
on:
push:
pull_request:
branches:
- dev
pull_request:
release:
types: [published]
workflow_dispatch:

env:
NXF_ANSI_LOG: false
NXF_SINGULARITY_CACHEDIR: ${{ github.workspace }}/.singularity
NXF_SINGULARITY_LIBRARYDIR: ${{ github.workspace }}/.singularity

concurrency:
group: "${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}"
cancel-in-progress: true

jobs:
test:
name: Run pipeline with test data
# Only run on push if this is the nf-core dev branch (merged PRs)
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/multiplesequencealign') }}"
name: "Run pipeline with test data (${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }})"
runs-on: ubuntu-latest
strategy:
matrix:
NXF_VER:
- "24.04.1"
- "24.10.4"
- "latest-everything"
ANALYSIS:
profile:
- "docker"
test_name:
- "test"
- "test_pdb"
- "test_parameters"
- "test_no_sheet"
steps:
- name: Check out pipeline code
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- name: Install Nextflow
- name: Set up Nextflow
uses: nf-core/setup-nextflow@v2
with:
version: "${{ matrix.NXF_VER }}"

- name: Disk space cleanup
- name: Clean up Disk space
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1

- name: Run pipeline with test data
- name: "Run pipeline with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
run: |
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.ANALYSIS }},docker --outdir ./results
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.test_name }},${{ matrix.profile }} --outdir ./results

parameters_stub:
name: Test workflow parameters
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/multiplesequencealign') }}"
name: Stub run
runs-on: ubuntu-latest
strategy:
matrix:
NXF_VER:
- "24.04.1"
- "24.10.4"
- "latest-everything"
PARAMS:
- "--skip_stats"
- "--skip_eval"
- "--skip_compression"
- "--skip_shiny"

profile:
- "docker"
params:
- "--skip_stats --skip_eval --skip_visualisation --skip_validation --skip_preprocessing --skip_shiny --skip_multiqc"
test_name:
- "test_no_sheet"
steps:
- name: Check out pipeline code
uses: actions/checkout@v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
with:
fetch-depth: 0

- name: Install Nextflow
uses: nf-core/setup-nextflow@v1
- name: Set up Nextflow
uses: nf-core/setup-nextflow@v2
with:
version: "${{ matrix.NXF_VER }}"

- name: Test workflow parameters
- name: Clean up Disk space
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1

- name: "Run pipeline with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
run: |
nextflow run -stub-run ${GITHUB_WORKSPACE} -profile test,docker ${{ matrix.PARAMS }} --outdir ./results
nextflow run ${GITHUB_WORKSPACE} -profile test,${{ matrix.profile }} ${{ matrix.params }} --outdir ./results
Loading
Loading