Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
341 commits
Select commit Hold shift + click to select a range
2bac397
Switched parameters to be false by default
itrujnara May 2, 2024
a70c77b
Added copyright info to scripts
itrujnara May 2, 2024
1abec30
Missing copyright note
itrujnara May 2, 2024
f960b85
Removed a fulfilled TODO
itrujnara May 2, 2024
a1e8c38
Get rid of directory probably added by mistake
JoseEspinosa May 3, 2024
fbfbde6
Update bin/yml2csv.py
itrujnara May 6, 2024
cf3d0dd
Added FASTA example to the usage document
itrujnara May 6, 2024
f848a1f
Merge branch 'dev' of https://github.com/itrujnara/reportho into dev
itrujnara May 6, 2024
8fc2254
Refactored Orthoinspector parameter names
itrujnara May 6, 2024
61581ea
Merge pull request #13 from itrujnara/dev
JoseEspinosa May 6, 2024
2e2145e
Add missing containers to local modules
JoseEspinosa May 6, 2024
c85b7f4
Get rid of params inside module
JoseEspinosa May 6, 2024
e1f6d07
Add stubs to local modules
JoseEspinosa May 7, 2024
f59ba77
Linting fix - subworkflow versions
itrujnara May 7, 2024
45e46c2
Version bump to 1.0.0
itrujnara May 7, 2024
235a872
Removed dev note from readme
itrujnara May 7, 2024
44c8348
Bug fix - React version reporting
itrujnara May 7, 2024
8d0dc11
Updated changelog
itrujnara May 7, 2024
0bb2373
Merge branch 'dev' of https://github.com/itrujnara/reportho into dev
itrujnara May 7, 2024
eb7fe03
Fix typos
JoseEspinosa May 7, 2024
baff9b9
Only run when local FETCH_EGGNOG_GROUP_LOCAL
JoseEspinosa May 7, 2024
266ff2d
Add stub
JoseEspinosa May 7, 2024
8a6b709
Update test.config
JoseEspinosa May 7, 2024
e6dbdbc
Merge remote-tracking branch 'upstream/dev' into updates
JoseEspinosa May 7, 2024
f7d9e68
Make lint happy
JoseEspinosa May 7, 2024
dc14ae9
Fix parameters for REPORT
JoseEspinosa May 7, 2024
f5d3637
Fix nf-core lint
JoseEspinosa May 7, 2024
4cb7aaa
Add stub
JoseEspinosa May 7, 2024
9aae4de
Fix test
JoseEspinosa May 7, 2024
7a3d3ac
Force update of utils_nfcore_pipeline to make nf-core lint happy
JoseEspinosa May 7, 2024
76de607
Remove unused module from modules.config
JoseEspinosa May 7, 2024
9c8c170
Fix prettier
JoseEspinosa May 7, 2024
1e51849
Fix params to reportho
JoseEspinosa May 7, 2024
3cad588
Update with version template 2.13.1 to make nf-core lint happy
JoseEspinosa May 7, 2024
f1fe384
Reverting changes in get_orthologs
JoseEspinosa May 7, 2024
87d4d99
Make the lint happy
JoseEspinosa May 7, 2024
0d9ea01
Get rid of unused validateInputParameters function
JoseEspinosa May 7, 2024
bf893c4
Merge pull request #16 from JoseEspinosa/updates
itrujnara May 8, 2024
c0a90ba
Fixed sequence-based fetch key error
itrujnara May 8, 2024
fc8355a
Updated incorrect script name
itrujnara May 8, 2024
b8f53cc
Fixed typo
itrujnara May 8, 2024
dc39cfd
Merge branch 'nf-core:dev' into dev
itrujnara May 8, 2024
2d00157
Merge branch 'dev' of https://github.com/itrujnara/reportho into dev
itrujnara May 8, 2024
b889372
Revert "Version bump to 1.0.0"
itrujnara May 8, 2024
1d55566
Updated dump_params to use new parameter names
itrujnara May 8, 2024
128bf91
Template update for nf-core/tools version 2.14.0
nf-core-bot May 8, 2024
4aca65a
Add validation for fasta files
JoseEspinosa May 8, 2024
be8b290
Fix format
JoseEspinosa May 8, 2024
0536976
Add test_fasta profile
JoseEspinosa May 8, 2024
fe1ca80
Avoid error if dict key not set
JoseEspinosa May 8, 2024
38bd3ee
Get rid of parameter from module
JoseEspinosa May 8, 2024
a47e239
Merge remote-tracking branch 'upstream/dev' into updates
JoseEspinosa May 8, 2024
7c48293
Make lint happy
JoseEspinosa May 8, 2024
06f4d6f
Merge branch 'TEMPLATE' of https://github.com/nf-core/reportho into t…
JoseEspinosa May 9, 2024
59bedf0
Revert changes in versions collection
JoseEspinosa May 9, 2024
e446101
Get rid of dumpsoftwareversions
JoseEspinosa May 9, 2024
1b42a92
Format modules.json
JoseEspinosa May 9, 2024
9f207ed
Make nf-core lint happy
JoseEspinosa May 9, 2024
0491d3c
Update CHANGELOG.md
JoseEspinosa May 9, 2024
5c289ce
Update CHANGELOG.md
JoseEspinosa May 9, 2024
9d02b6f
Merge pull request #18 from itrujnara/bug_fixes
JoseEspinosa May 9, 2024
cf6688b
Merge branch 'dev' into updates
JoseEspinosa May 9, 2024
ca19068
Update bin/fetch_oma_by_sequence.py
JoseEspinosa May 9, 2024
2f2eaf0
Update bin/fetch_oma_by_sequence.py
JoseEspinosa May 9, 2024
868c7fb
Template update for nf-core/tools version 2.14.1
nf-core-bot May 9, 2024
698b02b
Merge branch 'TEMPLATE' of https://github.com/nf-core/reportho into t…
JoseEspinosa May 9, 2024
9326f69
Added MultiQC for version reporting
itrujnara May 9, 2024
33b2ccf
Merge pull request #21 from JoseEspinosa/template_v2.14.0
JoseEspinosa May 9, 2024
0f1ef99
Merge remote-tracking branch 'upstream/dev' into updates
JoseEspinosa May 9, 2024
36d3769
Merge branch 'updates' of https://github.com/JoseEspinosa/reportho in…
JoseEspinosa May 9, 2024
037871c
Added stats and hits tables to MultiQC
itrujnara May 10, 2024
2afcc63
output.md tweak to include MultiQC info
itrujnara May 10, 2024
fca7756
Merge branch 'nf-core:dev' into bug_fixes
itrujnara May 10, 2024
15aa8f6
Branch depending on whether uniprot_id or fasta provided
JoseEspinosa May 10, 2024
bb04c56
Update tests
JoseEspinosa May 10, 2024
a376ae3
Get rid of leftovers of the uniprot_query parameter
JoseEspinosa May 10, 2024
f1f25bd
Update docs
JoseEspinosa May 10, 2024
b899246
Do not use set for ch_versions
JoseEspinosa May 10, 2024
3f472ad
Add test_fasta to CI
JoseEspinosa May 10, 2024
72f80aa
Make nf-core lint happy
JoseEspinosa May 10, 2024
3490c4c
Make prettier happy
JoseEspinosa May 10, 2024
8fe4f82
Make nf-core lint happy (bug in tools until fixed)
JoseEspinosa May 10, 2024
b13725c
Revert changes in .nf-core.yml
JoseEspinosa May 10, 2024
278d34f
Merge pull request #25 from itrujnara/bug_fixes
JoseEspinosa May 10, 2024
320ec61
Merge remote-tracking branch 'upstream/dev' into updates
JoseEspinosa May 10, 2024
6d270ea
Assign ch_versions
JoseEspinosa May 10, 2024
b849f92
Fix tyop
JoseEspinosa May 13, 2024
195ab8d
Add samplesheet_fasta in assets
JoseEspinosa May 13, 2024
f276a8e
Rename samplesheet_fasta example
JoseEspinosa May 13, 2024
cc50269
Update docs/usage.md
itrujnara May 13, 2024
8ba2862
Merge pull request #20 from JoseEspinosa/updates
JoseEspinosa May 13, 2024
dd45f3c
Added proper error message to requests, added retries to modules with…
itrujnara May 13, 2024
ea2e738
Merge branch 'nf-core:dev' into bug_fixes
itrujnara May 13, 2024
a1a65eb
Fixed mistakes in modules.config
itrujnara May 13, 2024
78f2e1e
Fixed bug in fetch_sequences
itrujnara May 13, 2024
d8be57e
Update bin/fetch_afdb_structures.py
itrujnara May 13, 2024
a2b6b8f
Added retry conditional on exit code in network modules
itrujnara May 13, 2024
1bcc0a9
Special exit code for request error
itrujnara May 14, 2024
22f1f7d
Merge pull request #26 from itrujnara/bug_fixes
JoseEspinosa May 14, 2024
c604631
Added light mode plots
itrujnara May 14, 2024
310d5ed
Merge branch 'nf-core:dev' into bug_fixes
itrujnara May 14, 2024
20aee56
Update bin/plot_orthologs.R
itrujnara May 15, 2024
184893a
Update modules/local/plot_orthologs.nf
itrujnara May 15, 2024
ad2d0dc
Update modules/local/plot_tree.nf
itrujnara May 15, 2024
c0ea378
Update subworkflows/local/get_orthologs.nf
itrujnara May 15, 2024
e4db509
Update subworkflows/local/make_trees.nf
itrujnara May 15, 2024
36553b8
Update subworkflows/local/make_trees.nf
itrujnara May 15, 2024
5a60c26
Make prettier happy
itrujnara May 15, 2024
a1d3af7
Merge pull request #27 from itrujnara/bug_fixes
JoseEspinosa May 15, 2024
6647231
Added offline run flag and profile
itrujnara May 15, 2024
a3b5a69
Added info on offline runs to usage.md
itrujnara May 21, 2024
8f53b7d
Tweaks related to EggNOG
itrujnara May 21, 2024
6920dd3
Update subworkflows/local/get_orthologs.nf
itrujnara May 21, 2024
a27bbc6
Small fix in use_all warning
itrujnara May 21, 2024
cb3d768
Another tweak for doubled warning
itrujnara May 21, 2024
5d86656
Noticed something about the refseq ID map
itrujnara May 22, 2024
b10c128
Tweak for EggNOG ID map format
itrujnara May 22, 2024
96abdea
Update modules
JoseEspinosa May 22, 2024
c5b1e6c
Bug fixes
itrujnara May 22, 2024
2cf571b
Added offline test profile
itrujnara May 22, 2024
40d9cc4
Removed offline.config
itrujnara May 22, 2024
e8549fe
Fixed empty output issues in OMA local
itrujnara May 22, 2024
b44190b
More tweaks for empty output
itrujnara May 22, 2024
d2d747b
Reverted samplesheet in offline test
itrujnara May 22, 2024
a03639c
Added offline test to CI
itrujnara May 22, 2024
0b22de0
More "null safety" tweaks
itrujnara May 22, 2024
e68c8e9
Merge pull request #29 from itrujnara/bug_fixes
JoseEspinosa May 23, 2024
adbb1e2
Merge remote-tracking branch 'upstream/dev' into update_modules
JoseEspinosa May 23, 2024
1284f55
Some more modules tweaks
JoseEspinosa May 23, 2024
04fa974
Improved path parameter handling
itrujnara May 23, 2024
58c1b95
Merge pull request #30 from JoseEspinosa/update_modules
itrujnara May 23, 2024
991fd7a
Merge branch 'nf-core:dev' into bug_fixes
itrujnara May 23, 2024
3dae2cb
Fixed null path case
itrujnara May 23, 2024
f2d0a43
Merge pull request #31 from itrujnara/bug_fixes
JoseEspinosa May 24, 2024
add849c
Fixed Venn diagram bug
itrujnara May 24, 2024
199b282
Merge branch 'nf-core:dev' into bug_fixes
itrujnara May 24, 2024
f85f4f5
Merge pull request #32 from itrujnara/bug_fixes
itrujnara May 24, 2024
ededec7
Fixed breaking bug in local OMA
itrujnara May 24, 2024
3dfb5c4
Merge branch 'bug_fixes' of https://github.com/itrujnara/reportho int…
itrujnara May 24, 2024
f29a393
Merge pull request #33 from itrujnara/bug_fixes
itrujnara May 27, 2024
fefb110
Fixed hit merging config
itrujnara May 27, 2024
1d37397
Added hack to show zero-only columns in score table
itrujnara May 27, 2024
51460cd
Fixed zero division error
itrujnara May 27, 2024
d64b1ac
Removed some doubled container declarations
itrujnara May 27, 2024
39440e9
Merge branch 'nf-core:dev' into bug_fixes
itrujnara May 27, 2024
7832ce2
Fixed errors with empty data
itrujnara May 27, 2024
0115e19
Minor changes
luisas May 28, 2024
8b564b5
Merge pull request #34 from itrujnara/bug_fixes
JoseEspinosa May 28, 2024
57dee46
Revert to nf-validation, as nf-schema was not really used
JoseEspinosa May 28, 2024
cf6a8a5
Prettier
luisas May 28, 2024
e5f1e3a
Merge pull request #42 from JoseEspinosa/fixes
JoseEspinosa May 28, 2024
3949496
add missing versions, fix linting warning
luisas May 28, 2024
06fa862
update module
luisas May 28, 2024
6f59a94
Update modules/local/fetch_oma_group_local.nf
luisas May 28, 2024
4df33de
update module
luisas May 28, 2024
b78af31
Merge branch 'luisa_review' of github.com:nf-core/reportho into luisa…
luisas May 28, 2024
252b4e2
Replaced grep with ripgrep in expensive tasks
itrujnara May 28, 2024
7b6d654
Merge pull request #41 from nf-core/luisa_review
luisas May 28, 2024
8de588c
Merge branch 'bug_fixes' of https://github.com/itrujnara/reportho int…
itrujnara May 28, 2024
36aa9fe
Removed code duplication in get_orthologs
itrujnara May 28, 2024
2da7da1
Merge pull request #43 from itrujnara/bug_fixes
itrujnara May 28, 2024
4e496df
Removed superfluous channel prepopulation from report subworkflow
itrujnara May 28, 2024
56c86c9
Added tree channel pre-population
itrujnara May 28, 2024
7d6855e
Improved parameter validation
itrujnara May 28, 2024
6cbe19d
Get rid of custom images
JoseEspinosa May 28, 2024
a512e7a
Merge remote-tracking branch 'upstream/dev' into fixes
JoseEspinosa May 28, 2024
2117c6b
Added more info to usage.md
itrujnara May 28, 2024
e527f33
Disabled some outdir outputs, with params to re-enable them
itrujnara May 28, 2024
b445b66
Tweaks in output options
itrujnara May 28, 2024
43fa0b1
Fixed typos in config
itrujnara May 28, 2024
df4b8a6
Added timeout handling to Python requests
itrujnara May 28, 2024
3b82f75
Added retry for timeout
itrujnara May 28, 2024
8bb4dd0
Update docs/usage.md
itrujnara May 28, 2024
e61d529
Update nextflow_schema.json
itrujnara May 28, 2024
824403c
Added brief explanation of downstream
itrujnara May 28, 2024
cb220ff
Merge pull request #45 from itrujnara/bug_fixes
itrujnara May 29, 2024
9652dec
Fixed error if ID was not found in ID map
itrujnara May 29, 2024
b551ee1
Improved isoform handling in OMA API calls
itrujnara May 29, 2024
782d279
Added comments to more complex Bash scripts
itrujnara May 29, 2024
7c05bac
Added execute permission to run script
itrujnara May 29, 2024
bedcf5e
Fixed bugs in fetch scripts
itrujnara May 29, 2024
7888b23
Merge branch 'bug_fixes' of https://github.com/itrujnara/reportho int…
itrujnara May 29, 2024
3cedb37
Add singularity image of wave containers
JoseEspinosa May 29, 2024
32560be
Add singularity images
JoseEspinosa May 29, 2024
d15392a
Fix c/p error
JoseEspinosa May 29, 2024
e4b34c1
Fixed another null error in Eggnog
itrujnara May 29, 2024
8c5788a
Added some pre-emptive null safety
itrujnara May 29, 2024
57f575b
Fix typos
JoseEspinosa May 29, 2024
f5a0975
Fix more c/p typos
JoseEspinosa May 29, 2024
e967db0
Merge pull request #44 from JoseEspinosa/fixes
JoseEspinosa May 29, 2024
31c1dab
Update how image is set
JoseEspinosa May 30, 2024
8fb875e
Added total hits to hits table
itrujnara May 30, 2024
bef39df
Fixed Python version reporting in local database modules
itrujnara May 30, 2024
5b3fb85
Fixed error if taxid is not found in OMA
itrujnara May 30, 2024
f9c7651
Fixed stub in fetch_afdb_structures
itrujnara May 30, 2024
97a3008
Update modules/local/make_report.nf
JoseEspinosa May 30, 2024
b398c5d
Fixed more errors if taxid is not found
itrujnara May 30, 2024
6a40708
Merge pull request #47 from JoseEspinosa/fixes
JoseEspinosa May 30, 2024
8a74a29
Merge branch 'nf-core:dev' into bug_fixes
itrujnara May 30, 2024
38ca63a
Update bin/fetch_oma_group.py
itrujnara May 31, 2024
19da5de
Update modules/local/fetch_eggnog_group_local.nf
itrujnara May 31, 2024
ebff50f
Update modules/local/fetch_oma_group_local.nf
itrujnara May 31, 2024
403f616
Update modules/local/fetch_oma_group_local.nf
itrujnara May 31, 2024
ab04193
Update modules/local/fetch_panther_group_local.nf
itrujnara May 31, 2024
6b9d3d0
Update modules/local/fetch_panther_group_local.nf
itrujnara May 31, 2024
134da3f
Added warning if nothing is found in PANTHER
itrujnara May 31, 2024
d33db22
Merge pull request #46 from itrujnara/bug_fixes
itrujnara May 31, 2024
88c4536
Use testdata parameter in configs
JoseEspinosa Jun 5, 2024
7a26865
Remove fastqc (not used)
JoseEspinosa Jun 5, 2024
c2f572c
Add skip_multiqc option and group process skipping options
JoseEspinosa Jun 5, 2024
bfb32d8
Fix reference
JoseEspinosa Jun 5, 2024
92c35e3
Make lints happy
JoseEspinosa Jun 5, 2024
e31f60d
more lint
JoseEspinosa Jun 5, 2024
ed7632b
Update image for make_report
JoseEspinosa Jun 5, 2024
727c90f
Fix typo
JoseEspinosa Jun 5, 2024
7685667
Add mention to report image in readme
JoseEspinosa Jun 5, 2024
27ffd9c
Fix tyop
JoseEspinosa Jun 5, 2024
56baec0
Merge pull request #49 from JoseEspinosa/updates
JoseEspinosa Jun 5, 2024
0fb240b
Version bump to 1.0.0
itrujnara Jun 5, 2024
3e69630
Updated changelog
itrujnara Jun 5, 2024
4e995a6
Merge pull request #50 from itrujnara/dev
JoseEspinosa Jun 5, 2024
b78325b
Update conf/test_fasta.config
itrujnara Jun 7, 2024
24ee0a5
Removed extra sections from the changelog
itrujnara Jun 7, 2024
80f77cc
Removed outdated info from schema
itrujnara Jun 7, 2024
1f11650
Fixed test command
itrujnara Jun 7, 2024
d3c384b
Updated test config descriptions
itrujnara Jun 7, 2024
ec8fac9
Updated tube map
itrujnara Jun 7, 2024
de26195
Fixed alignment in some processes
itrujnara Jun 7, 2024
b88bf29
Removed unnecessary subworkflows
itrujnara Jun 7, 2024
e342a39
Removed useless line in get_orthologs
itrujnara Jun 7, 2024
4d9b759
Added conda in dump_params
itrujnara Jun 7, 2024
6047617
Moved input file channel declarations to main workflow
itrujnara Jun 7, 2024
cdc2181
Merge branch 'nf-core:dev' into dev
itrujnara Jun 7, 2024
83b57be
Revert "Fixed test command"
itrujnara Jun 7, 2024
2e71c81
Merge branch 'dev' of https://github.com/itrujnara/reportho into dev
itrujnara Jun 7, 2024
8ca0838
Fixed error in main subworkflow imports
itrujnara Jun 7, 2024
3d81db1
Fixed process name in main workflow
itrujnara Jun 7, 2024
6f82625
Fixed another error in variable name
itrujnara Jun 7, 2024
3f07f99
Merge pull request #52 from itrujnara/dev
itrujnara Jun 7, 2024
bf3260d
Chenged command in contributing file and disabled lint
itrujnara Jun 10, 2024
20b5704
Merge branch 'nf-core:dev' into dev
itrujnara Jun 10, 2024
33c8fb0
Merge pull request #53 from itrujnara/dev
itrujnara Jun 10, 2024
c0aa46b
Tweaked tube map
itrujnara Jun 10, 2024
9e5b981
Merge branch 'nf-core:dev' into dev
itrujnara Jun 10, 2024
109da77
Merge pull request #54 from itrujnara/dev
JoseEspinosa Jun 10, 2024
2329dba
Changed which plots are used in the report
itrujnara Jun 11, 2024
6404e91
Updated version date
itrujnara Jun 11, 2024
7e5b21d
Merge branch 'dev' of https://github.com/itrujnara/reportho into dev
itrujnara Jun 11, 2024
4ce1d30
Merge branch 'nf-core:dev' into dev
itrujnara Jun 11, 2024
f69b94d
Merge pull request #55 from itrujnara/dev
itrujnara Jun 11, 2024
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
10 changes: 1 addition & 9 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,7 @@
"vscode": {
// Set *default* container specific settings.json values on container create.
"settings": {
"python.defaultInterpreterPath": "/opt/conda/bin/python",
"python.linting.enabled": true,
"python.linting.pylintEnabled": true,
"python.formatting.autopep8Path": "/opt/conda/bin/autopep8",
"python.formatting.yapfPath": "/opt/conda/bin/yapf",
"python.linting.flake8Path": "/opt/conda/bin/flake8",
"python.linting.pycodestylePath": "/opt/conda/bin/pycodestyle",
"python.linting.pydocstylePath": "/opt/conda/bin/pydocstyle",
"python.linting.pylintPath": "/opt/conda/bin/pylint"
"python.defaultInterpreterPath": "/opt/conda/bin/python"
},

// Add the IDs of extensions you want installed when the container is created.
Expand Down
6 changes: 1 addition & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ indent_style = unset
[/assets/email*]
indent_size = unset

# ignore Readme
[README.md]
indent_style = unset

# ignore python
# ignore python and markdown
[*.{py,md}]
indent_style = unset
14 changes: 8 additions & 6 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ Please use the pre-filled template to save time.
However, don't be put off by this template - other more general issues and suggestions are welcome!
Contributions to the code are even more welcome ;)

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

## Contribution workflow

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

## Tests

You can optionally test your changes by running the pipeline locally. Then it is recommended to use the `debug` profile to
receive warnings about process selectors and other debug info. Example: `nextflow run . -profile debug,test,docker --outdir <OUTDIR>`.
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:

```bash
nextflow run . -profile debug,test,docker --outdir <OUTDIR>
```

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

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.

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

### Naming schemes

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ on:
types: [published]
workflow_dispatch:
jobs:
run-tower:
run-platform:
name: Run AWS full tests
if: github.repository == 'nf-core/reportho'
runs-on: ubuntu-latest
steps:
- name: Launch workflow via tower
uses: seqeralabs/action-tower-launch@922e5c8d5ac4e918107ec311d2ebbd65e5982b3d # v2
- name: Launch workflow via Seqera Platform
uses: seqeralabs/action-tower-launch@v2
# TODO nf-core: You can customise AWS full pipeline tests as required
# Add full size test data (but still relatively small datasets for few samples)
# on the `test_full.config` test runs with only one set of parameters
Expand All @@ -31,9 +31,9 @@ jobs:
}
profiles: test_full

- uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
- uses: actions/upload-artifact@v4
with:
name: Tower debug log file
name: Seqera Platform debug log file
path: |
tower_action_*.log
tower_action_*.json
seqera_platform_action_*.log
seqera_platform_action_*.json
16 changes: 8 additions & 8 deletions .github/workflows/awstest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ name: nf-core AWS test
on:
workflow_dispatch:
jobs:
run-tower:
run-platform:
name: Run AWS tests
if: github.repository == 'nf-core/reportho'
runs-on: ubuntu-latest
steps:
# Launch workflow using Tower CLI tool action
- name: Launch workflow via tower
uses: seqeralabs/action-tower-launch@922e5c8d5ac4e918107ec311d2ebbd65e5982b3d # v2
# Launch workflow using Seqera Platform CLI tool action
- name: Launch workflow via Seqera Platform
uses: seqeralabs/action-tower-launch@v2
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
Expand All @@ -25,9 +25,9 @@ jobs:
}
profiles: test

- uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
- uses: actions/upload-artifact@v4
with:
name: Tower debug log file
name: Seqera Platform debug log file
path: |
tower_action_*.log
tower_action_*.json
seqera_platform_action_*.log
seqera_platform_action_*.json
59 changes: 54 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,68 @@ jobs:
- "latest-everything"
steps:
- name: Check out pipeline code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

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

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

- name: Run pipeline with test data
# TODO nf-core: You can customise CI pipeline run tests as required
# For example: adding multiple test runs with different parameters
# Remember that you can parallelise this by using strategy.matrix
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results

test_fasta:
name: Run pipeline with test data with fasta files in samplesheet
# 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/reportho') }}"
runs-on: ubuntu-latest
strategy:
matrix:
NXF_VER:
- "23.04.0"
- "latest-everything"
steps:
- name: Check out pipeline code
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

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

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

- name: Run pipeline with test data
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test_fasta,docker --outdir ./results

test_offline:
name: Run ortholog fetching with offline databases
# 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/reportho') }}"
runs-on: ubuntu-latest
strategy:
matrix:
NXF_VER:
- "23.04.0"
- "latest-everything"
steps:
- name: Check out pipeline code
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

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

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

- name: Run pipeline with test data
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test_offline,docker --outdir ./results
22 changes: 18 additions & 4 deletions .github/workflows/download_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ on:
pull_request:
types:
- opened
- edited
- synchronize
branches:
- master
pull_request_target:
Expand All @@ -28,11 +30,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Nextflow
uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1
uses: nf-core/setup-nextflow@v2

- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
- name: Disk space cleanup
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1

- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
with:
python-version: "3.11"
python-version: "3.12"
architecture: "x64"
- uses: eWaterCycle/setup-singularity@931d4e31109e875b13309ae1d07c70ca8fbc8537 # v7
with:
Expand Down Expand Up @@ -65,8 +70,17 @@ jobs:
- name: Inspect download
run: tree ./${{ env.REPOTITLE_LOWERCASE }}

- name: Run the downloaded pipeline
- name: Run the downloaded pipeline (stub)
id: stub_run_pipeline
continue-on-error: true
env:
NXF_SINGULARITY_CACHEDIR: ./
NXF_SINGULARITY_HOME_MOUNT: true
run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results
- name: Run the downloaded pipeline (stub run not supported)
id: run_pipeline
if: ${{ job.steps.stub_run_pipeline.status == failure() }}
env:
NXF_SINGULARITY_CACHEDIR: ./
NXF_SINGULARITY_HOME_MOUNT: true
run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -profile test,singularity --outdir ./results
6 changes: 3 additions & 3 deletions .github/workflows/fix-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
# Use the @nf-core-bot token to check out so we can push later
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
with:
token: ${{ secrets.nf_core_bot_auth_token }}

Expand All @@ -32,9 +32,9 @@ jobs:
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}

# Install and run pre-commit
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
with:
python-version: 3.11
python-version: "3.12"

- name: Install pre-commit
run: pip install pre-commit
Expand Down
19 changes: 9 additions & 10 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- name: Set up Python 3.11
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
- name: Set up Python 3.12
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
with:
python-version: 3.11
cache: "pip"
python-version: "3.12"

- name: Install pre-commit
run: pip install pre-commit
Expand All @@ -32,14 +31,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out pipeline code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4

- name: Install Nextflow
uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1
uses: nf-core/setup-nextflow@v2

- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
with:
python-version: "3.11"
python-version: "3.12"
architecture: "x64"

- name: Install dependencies
Expand All @@ -60,7 +59,7 @@ jobs:

- name: Upload linting log file artifact
if: ${{ always() }}
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
with:
name: linting-logs
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linting_comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download lint results
uses: dawidd6/action-download-artifact@f6b0bace624032e30a85a8fd9c1a7f8f611f5737 # v3
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3
with:
workflow: linting.yml
workflow_conclusion: completed
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-announcements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: get topics and convert to hashtags
id: get_topics
run: |
curl -s https://nf-co.re/pipelines.json | jq -r '.remote_workflows[] | select(.name == "${{ github.repository }}") | .topics[]' | awk '{print "#"$0}' | tr '\n' ' ' > $GITHUB_OUTPUT
echo "topics=$(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

- uses: rzr/fediverse-action@master
with:
Expand All @@ -25,13 +25,13 @@ jobs:

Please see the changelog: ${{ github.event.release.html_url }}

${{ steps.get_topics.outputs.GITHUB_OUTPUT }} #nfcore #openscience #nextflow #bioinformatics
${{ steps.get_topics.outputs.topics }} #nfcore #openscience #nextflow #bioinformatics

send-tweet:
runs-on: ubuntu-latest

steps:
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
with:
python-version: "3.10"
- name: Install dependencies
Expand Down
6 changes: 2 additions & 4 deletions .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@ tasks:

vscode:
extensions: # based on nf-core.nf-core-extensionpack
- codezombiech.gitignore # Language support for .gitignore files
# - cssho.vscode-svgviewer # SVG viewer
- esbenp.prettier-vscode # Markdown/CommonMark linting and style checking for Visual Studio Code
- eamodio.gitlens # Quickly glimpse into whom, why, and when a line or code block was changed
- EditorConfig.EditorConfig # override user/workspace settings with settings found in .editorconfig files
- Gruntfuggly.todo-tree # Display TODO and FIXME in a tree view in the activity bar
- mechatroner.rainbow-csv # Highlight columns in csv files in different colors
# - nextflow.nextflow # Nextflow syntax highlighting
# - nextflow.nextflow # Nextflow syntax highlighting
- oderwat.indent-rainbow # Highlight indentation level
- streetsidesoftware.code-spell-checker # Spelling checker for source code
- charliermarsh.ruff # Code linter Ruff
4 changes: 4 additions & 0 deletions .nf-core.yml
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
repository_type: pipeline
nf_core_version: "2.14.1"
lint:
files_exist: conf/igenomes.config
files_unchanged: .github/CONTRIBUTING.md
3 changes: 3 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ repos:
rev: "v3.1.0"
hooks:
- id: prettier
additional_dependencies:
- [email protected]

- repo: https://github.com/editorconfig-checker/editorconfig-checker.python
rev: "2.7.3"
hooks:
Expand Down
Loading