Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First release - v1.0.0 - German Rollmops #221

Merged
merged 876 commits into from
Feb 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
876 commits
Select commit Hold shift + click to select a range
2e3f265
Update nextflow_schema.json
Darcy220606 Dec 21, 2022
4e56f1c
Update nextflow.config
Darcy220606 Dec 21, 2022
bf8510b
Update nextflow.config
Darcy220606 Dec 21, 2022
2b840ae
Add relevant parametrs for BAKTA
Darcy220606 Dec 21, 2022
ceaf67a
Merge branch 'nf-core:dev' into params_abricate
Darcy220606 Dec 21, 2022
c10ddcd
Merge branch 'nf-core:dev' into params_ampir
Darcy220606 Dec 21, 2022
671d7b2
Merge branch 'nf-core:dev' into params_amrfinderplus
Darcy220606 Dec 21, 2022
6ce0442
Merge branch 'nf-core:dev' into params_antismash
Darcy220606 Dec 21, 2022
8216d68
Merge branch 'nf-core:dev' into params_bakta
Darcy220606 Dec 21, 2022
3911ad4
Merge branch 'nf-core:dev' into params_deepbgc
Darcy220606 Dec 21, 2022
caced9c
Merge branch 'nf-core:dev' into params_fargene
Darcy220606 Dec 21, 2022
e315a6c
Merge branch 'nf-core:dev' into params_gecco
Darcy220606 Dec 21, 2022
b40deaa
Merge branch 'nf-core:dev' into params_prodigal
Darcy220606 Dec 21, 2022
76383cb
Merge branch 'nf-core:dev' into params_prokka
Darcy220606 Dec 21, 2022
1ca88da
Merge branch 'nf-core:dev' into params_rgi
Darcy220606 Dec 21, 2022
d8c06fb
Fix nf-core schema [skip ci]
Darcy220606 Dec 21, 2022
1207726
Fix nf-core schema
Darcy220606 Dec 21, 2022
3a40538
Merge branch 'params_abricate' of https://github.com/Darcy220606/func…
Darcy220606 Dec 21, 2022
92a482d
Add uodate to schema
Darcy220606 Dec 21, 2022
7de9273
Fix linting probs
Darcy220606 Dec 21, 2022
ef6871c
Update antismash lite and remove need for enable_conda
jfy133 Dec 21, 2022
1c921c1
Add local mocule (draft)
jasmezz Dec 21, 2022
5859bca
Fetch modules update
jasmezz Dec 21, 2022
1071055
Try different system that does similar thing...
jfy133 Dec 21, 2022
5838f6c
Revert "Try different system that does similar thing..."
jfy133 Dec 21, 2022
49075aa
Merge pull request #176 from Darcy220606/params_abricate
Darcy220606 Dec 21, 2022
f28af72
Merge branch 'nf-core:dev' into params_ampir
Darcy220606 Dec 21, 2022
7a81627
Merge pull request #164 from Darcy220606/params_ampir
Darcy220606 Dec 21, 2022
016ba30
update prettier schema
Darcy220606 Dec 21, 2022
a34d73f
Merge pull request #165 from Darcy220606/params_gecco
Darcy220606 Dec 21, 2022
6df2f6c
Merge branch 'nf-core:dev' into params_amrfinderplus
Darcy220606 Dec 21, 2022
5b5f518
Merge branch 'nf-core:dev' into params_fargene
Darcy220606 Dec 21, 2022
242830d
Merge pull request #169 from Darcy220606/params_amrfinderplus
Darcy220606 Dec 21, 2022
dac16ec
Merge branch 'nf-core:dev' into params_fargene
Darcy220606 Dec 21, 2022
cc06b7d
Merge pull request #172 from Darcy220606/params_fargene
Darcy220606 Dec 21, 2022
e3f0956
Merge branch 'nf-core:dev' into params_rgi
Darcy220606 Dec 21, 2022
4529ae0
update schema
Darcy220606 Dec 21, 2022
b4c6606
Merge pull request #174 from Darcy220606/params_rgi
Darcy220606 Dec 21, 2022
baa9b9d
Add updates to schema
Darcy220606 Dec 21, 2022
13d723d
Merge branch 'nf-core:dev' into params_deepbgc
Darcy220606 Dec 21, 2022
230379e
Merge pull request #166 from Darcy220606/params_deepbgc
Darcy220606 Dec 21, 2022
77e08aa
Merge branch 'nf-core:dev' into params_prodigal
Darcy220606 Dec 21, 2022
1cd38d0
update schema
Darcy220606 Dec 21, 2022
14521fe
Merge pull request #177 from Darcy220606/params_prodigal
Darcy220606 Dec 22, 2022
8c99732
Merge branch 'dev' into params_prokka
Darcy220606 Dec 22, 2022
f2f816a
Update schema and add review
Darcy220606 Dec 22, 2022
005bb44
Merge pull request #178 from Darcy220606/params_prokka
Darcy220606 Dec 22, 2022
2e0cdd1
Update nextflow_schema.json
Darcy220606 Dec 22, 2022
a92f78b
Update nextflow_schema.json
Darcy220606 Dec 22, 2022
7e98284
Update nextflow_schema.json
Darcy220606 Dec 22, 2022
7e05ae5
Update nextflow_schema.json
Darcy220606 Dec 22, 2022
3c0d1f6
Update nextflow_schema.json
Darcy220606 Dec 22, 2022
0f67f72
Update nextflow_schema.json
Darcy220606 Dec 22, 2022
857c6ca
Merge branch 'dev' into params_bakta
Darcy220606 Dec 22, 2022
5c15321
add code review and schema updates
Darcy220606 Dec 22, 2022
b0dc5d0
Start post-draft tweaks to param docs
jfy133 Dec 22, 2022
2e953a1
Add version + verbosity
jasmezz Dec 22, 2022
0125521
fix combgc include statement
jasmezz Dec 23, 2022
ca74fa8
Add warning using conda
jfy133 Dec 23, 2022
ad3b1b7
Merge remote-tracking branch 'origin' into antismash-ver-update
jfy133 Dec 23, 2022
7ed2d7f
Update config
jfy133 Dec 23, 2022
91b780c
Apply suggestions from code review
jfy133 Dec 23, 2022
9e912d8
Fixed parts of combgc input channels
jasmezz Dec 23, 2022
0587d3d
Further tweaks (minus antiSMASH and BAKTA)
jfy133 Dec 23, 2022
2fe700c
Several updates, BGC subworkflow runs with conda
jasmezz Jan 10, 2023
82ab90a
Merge branch 'comBGC' of https://github.com/nf-core/funcscan into comBGC
jasmezz Jan 10, 2023
6c23cdd
Avoid merge conflicts with dev
jasmezz Jan 10, 2023
7ceb376
Merge pull request #183 from nf-core/dev
jasmezz Jan 10, 2023
39cbdba
Update nextflow_schema.json per review
Darcy220606 Jan 11, 2023
1a37f05
add review suggestions
Darcy220606 Jan 11, 2023
cd8d067
Update workflows/funcscan.nf
jfy133 Jan 12, 2023
9fd4df9
Merge pull request #181 from nf-core/antismash-ver-update
jfy133 Jan 12, 2023
d74f920
Attempts to get comBGC working sample-wise
jasmezz Jan 13, 2023
dc64837
Merge branch 'dev' into params_bakta
Darcy220606 Jan 17, 2023
13e35b6
Add latest reviews
Darcy220606 Jan 17, 2023
1f924a3
Update nextflow_schema.json
Darcy220606 Jan 17, 2023
04c2919
Update nextflow_schema.json
Darcy220606 Jan 17, 2023
f0a787d
Update nextflow_schema.json
Darcy220606 Jan 17, 2023
1aa83c8
Update nextflow_schema.json
Darcy220606 Jan 17, 2023
6aca7bd
Update nextflow_schema.json
Darcy220606 Jan 17, 2023
7232654
Merge branch 'dev' into params_antismash
Darcy220606 Jan 17, 2023
5a6d611
Update nextflow_schema.json
Darcy220606 Jan 17, 2023
42d5fad
update output.md
louperelo Jan 18, 2023
892e264
Apply suggestions from code review [skip-ci]
jfy133 Jan 18, 2023
f0b2ab7
[automated] Fix linting with Prettier
nf-core-bot Jan 18, 2023
e2fdc0a
Apply suggestions from code review
jfy133 Jan 18, 2023
7003c42
Merge pull request #163 from Darcy220606/params_antismash
jfy133 Jan 18, 2023
ab3c926
Merge branch 'dev' of https://github.com/Darcy220606/funcscan into pa…
Darcy220606 Jan 18, 2023
bd80691
Merge pull request #180 from Darcy220606/params_bakta
Darcy220606 Jan 18, 2023
4d35b05
Apply suggestions from code review
jfy133 Jan 18, 2023
1d7e4f4
add BAKTA to base.config
louperelo Jan 18, 2023
546fa10
Merge branch 'dev' of https://github.com/louperelo/funcscan into docr…
louperelo Jan 18, 2023
b068ebc
update usage.md (set time and cpus)
louperelo Jan 18, 2023
cd64821
minor change output.md
louperelo Jan 18, 2023
84d9c96
Updates for running comBGC sample-wise
jasmezz Jan 18, 2023
bc17258
Merge branch 'dev' into comBGC
jasmezz Jan 18, 2023
0eb4001
Update modules
jasmezz Jan 18, 2023
ddf1cff
undo changes in usage.md and base.config
louperelo Jan 18, 2023
045c3de
Merge branch 'dev' of https://github.com/Darcy220606/funcscan into pa…
Darcy220606 Jan 18, 2023
1415a8d
Update nextflow_schema.json
Darcy220606 Jan 18, 2023
d5db09f
Update nextflow_schema.json
Darcy220606 Jan 18, 2023
6051f81
[automated] Fix linting with Prettier
nf-core-bot Jan 18, 2023
e89a807
Merge pull request #184 from louperelo/docreview
louperelo Jan 18, 2023
56f0a2a
Deactivate DeepARG testing
jfy133 Jan 18, 2023
7bb8eb7
Tweak message
jfy133 Jan 18, 2023
3e5a41d
Standardise some more parametrs
Darcy220606 Jan 18, 2023
88fc882
Merge pull request #182 from nf-core/params-docs-fixes
Darcy220606 Jan 18, 2023
c9e083b
Update workflows/funcscan.nf
jfy133 Jan 18, 2023
d706981
Reduce AMPCombi memory and remove warning
jfy133 Jan 18, 2023
9ebacaa
Merge branch 'dev' of github.com:nf-core/funcscan into dev
jfy133 Jan 18, 2023
f9c9f74
fix documentation links in schema help message
louperelo Jan 18, 2023
b054e7d
Merge pull request #185 from nf-core/deeparg-deactivate
jasmezz Jan 18, 2023
4383cd1
Add links in group description help message
Darcy220606 Jan 18, 2023
df295e8
Rewrite input handling for comBGC
jasmezz Jan 18, 2023
7d49db7
Add prodigal compatibility + comBGC sample summary
jasmezz Jan 19, 2023
230fe94
Merge pull request #187 from louperelo/schema
louperelo Jan 19, 2023
40f3b26
Fix comBGC sample summary
jasmezz Jan 19, 2023
154bd71
Merge branch 'dev' into comBGC
jasmezz Jan 19, 2023
c322281
Finalise output docs
jasmezz Jan 19, 2023
bad0e36
Merge branch 'dev' into comBGC
jasmezz Jan 19, 2023
a1c8bfc
Fix linting (black)
jasmezz Jan 19, 2023
01544bd
Apply suggestion from code review
jasmezz Jan 20, 2023
ab5db1d
Update ampcombi module
Darcy220606 Jan 20, 2023
7bc523d
Change default to prokka except for tests
jfy133 Jan 23, 2023
7bd3ae9
Merge pull request #190 from Darcy220606/fix_ampcombi
Darcy220606 Jan 23, 2023
145b01c
Merge pull request #191 from nf-core/anno-default
jfy133 Jan 23, 2023
ce94e28
Apply changes from code review
jasmezz Jan 24, 2023
2d96689
Fix linting
jasmezz Jan 24, 2023
66c13f6
Merge pull request #188 from nf-core/comBGC
jfy133 Jan 25, 2023
2df003c
Allow pipeline to run when no conda scope specified
jfy133 Jan 25, 2023
bd68f3c
Update check in module to
jfy133 Jan 25, 2023
39a4a65
update output.md and usage.md
louperelo Jan 25, 2023
b5d992c
[automated] Fix linting with Prettier
nf-core-bot Jan 26, 2023
4d135f9
Modules.json [skip ci]
jfy133 Jan 26, 2023
2075340
Merge pull request #193 from nf-core/fix-antismash-conda-check
jfy133 Jan 26, 2023
ca6b365
delete TODOs
louperelo Jan 26, 2023
f5e6f7b
Merge branch 'nf-core:dev' into dev
louperelo Jan 26, 2023
55ed3bc
Add new parametrs to prokka
Darcy220606 Jan 26, 2023
3c89240
Apply suggestions from code review
louperelo Jan 26, 2023
40cbf8e
adjust header hierarchy
louperelo Jan 26, 2023
6fb99c8
Update nextflow_schema.json
Darcy220606 Jan 26, 2023
4bc6dfa
Merge pull request #197 from Darcy220606/dev
Darcy220606 Jan 26, 2023
56a0476
Apply suggestions from code review
louperelo Jan 27, 2023
19f3805
Merge branch 'nf-core:dev' into dev
louperelo Jan 27, 2023
695f305
Add descriptions to ARG summary table headers
louperelo Jan 27, 2023
b36459b
[automated] Fix linting with Prettier
nf-core-bot Jan 27, 2023
f9bc278
Merge pull request #195 from louperelo/dev
louperelo Jan 27, 2023
7f862eb
another output.md update
louperelo Jan 27, 2023
2cc4613
Merge branch 'docs' of https://github.com/louperelo/funcscan into docs
louperelo Jan 27, 2023
0c089a7
yet another one
louperelo Jan 27, 2023
6b568c7
[automated] Fix linting with Prettier
nf-core-bot Jan 27, 2023
8ee8b5c
fix code-box ``` in usage.md
louperelo Jan 27, 2023
f37c7d0
Merge branch 'docs' of https://github.com/louperelo/funcscan into docs
louperelo Jan 27, 2023
5148f94
Merge pull request #194 from louperelo/docs
jasmezz Jan 27, 2023
c5ab114
Fix resume fail by stop-bioawk cache
jfy133 Jan 27, 2023
2838335
Merge pull request #199 from nf-core/fix-resume-fail
jfy133 Jan 27, 2023
6c56111
output.md fix comment
louperelo Jan 27, 2023
0e2317d
Update metro map with fixes
jfy133 Jan 27, 2023
810dc1d
[automated] Fix linting with Prettier
nf-core-bot Jan 27, 2023
017a056
Merge pull request #201 from louperelo/docs
louperelo Jan 27, 2023
7f8a715
next try to fix comment on fargene update
louperelo Jan 27, 2023
120fa9f
Merge branch 'docs' of https://github.com/louperelo/funcscan into docs
louperelo Jan 27, 2023
7240f2c
next try to fix comment on fargene update
louperelo Jan 27, 2023
657ca79
Merge branch 'nf-core:dev' into docs
louperelo Jan 27, 2023
328593f
Merge pull request #202 from louperelo/docs
jasmezz Jan 27, 2023
67dde14
update docs
jasmezz Jan 27, 2023
d4f532b
Merge branch 'dev' into fix-output
jasmezz Jan 27, 2023
b3f4bc8
Bump RGI memory [skip ci]
jfy133 Jan 30, 2023
75fc5ef
Update conf/base.config
jfy133 Jan 30, 2023
c430ae5
Try fixing antismash and prokka incompatibility
jfy133 Jan 30, 2023
445fe52
Update subworkflows/local/bgc.nf
jfy133 Jan 30, 2023
1e390cb
Update subworkflows/local/bgc.nf
jfy133 Jan 30, 2023
0aa9d4f
Update subworkflows/local/bgc.nf
jfy133 Jan 30, 2023
51c86e2
Update after feedback from Jasmin and Louisa
jfy133 Jan 30, 2023
7f747ad
Fix BGC channels for antismash, downgrade to 6.0.1
jasmezz Jan 30, 2023
30231b8
Test if CI tests work with antismash 6.1.1
jasmezz Jan 30, 2023
8bd6a22
Remove exit status 1 to get logs now that BIOAWK issue is implented
jfy133 Jan 31, 2023
926e06e
Try with GBK instead of GFF for Prokka only
jfy133 Jan 31, 2023
735f498
Fix prodigal natimash route filter function
jfy133 Jan 31, 2023
a558349
Remove terminal dump
jasmezz Jan 31, 2023
b4591be
Merge pull request #204 from nf-core/rgi-mem-bump
jfy133 Feb 1, 2023
d5ba3b4
Widen exit codes to help stop deepbgc from timing out and remove anti…
jfy133 Feb 1, 2023
2e366a9
Merge pull request #206 from nf-core/widen-exits
jfy133 Feb 1, 2023
96a5334
Merge pull request #205 from nf-core/prokka-antismash-fix
jfy133 Feb 1, 2023
cd9a395
Added new input file logic for bakta
jasmezz Feb 1, 2023
3c4b951
Add auto-clean up to full test as funcscan makes a _lot_
jfy133 Feb 1, 2023
4e732ae
Merge branch 'dev' into prokka-antismash-fix
jasmezz Feb 1, 2023
23b1d14
Fix linting
jasmezz Feb 1, 2023
139e138
Merge pull request #200 from nf-core/metromap-update
jfy133 Feb 1, 2023
5a3eba0
Merge pull request #207 from nf-core/prokka-antismash-fix
jfy133 Feb 1, 2023
e928af0
reset default Prodigal and update usage.md
louperelo Feb 1, 2023
6a49d0a
[automated] Fix linting with Prettier
nf-core-bot Feb 1, 2023
f03888b
Apply suggestions from code review
louperelo Feb 1, 2023
f70b1cb
Apply suggestions from code review
louperelo Feb 2, 2023
5df9b32
Merge pull request #210 from louperelo/annotationtool
louperelo Feb 2, 2023
fb8f51e
Merge branch 'dev' into fix-output
jasmezz Feb 2, 2023
4c01f16
Fix variable that caused wrong annotation logic
jasmezz Feb 2, 2023
1980a04
Revert docs back to fit template + fix annotation logic error
jasmezz Feb 2, 2023
55fbe99
More suggestions from code review
jasmezz Feb 2, 2023
d53cd2b
Fix missing sentence in Readme
jasmezz Feb 2, 2023
aadcb56
Add current PFAM HMM download link
jasmezz Feb 2, 2023
8d788c0
Merge pull request #203 from nf-core/fix-output
jasmezz Feb 2, 2023
c0a0b0d
fix tool citation style in README
louperelo Feb 3, 2023
c891dfd
Apply suggestions from code review
louperelo Feb 3, 2023
f7bfa3b
[skip ci] Update some parts in usage.md
jasmezz Feb 3, 2023
0821367
Fix markdown style of code snippets
jasmezz Feb 3, 2023
d8d007a
Fix uppercase tool names
jasmezz Feb 3, 2023
f2f9265
[skip ci] Find something to skip ci tests
jasmezz Feb 3, 2023
9bb0628
trigger CI tests
louperelo Feb 3, 2023
d211aab
Merge pull request #211 from nf-core/readme_toolstyle
louperelo Feb 3, 2023
7146876
[skip ci] base.config deepBGC set time to 12h
louperelo Feb 6, 2023
aeb2ad0
Merge pull request #212 from nf-core/readme_toolstyle
louperelo Feb 6, 2023
ee8e40b
Add license + version
jasmezz Feb 7, 2023
30d432b
Fix linting (black)
jasmezz Feb 7, 2023
62c7bb4
Merge pull request #216 from nf-core/combgc-version
jasmezz Feb 7, 2023
3141a7e
Deactivate DeepBGC, don't save databases
jasmezz Feb 8, 2023
e9fdf1e
Fix ch_versions typo
jasmezz Feb 8, 2023
3127661
Don't save RGI temporary files
jasmezz Feb 8, 2023
c5f7f60
Don't save UNTAR stuffs (from antismash)
jasmezz Feb 8, 2023
969cef6
Add comment
jasmezz Feb 8, 2023
63dd2b9
Fix linting
jasmezz Feb 8, 2023
6d98736
Save prokka/bakta results in meta_id folder
jasmezz Feb 8, 2023
3573457
Don't save fargene tmp files
jasmezz Feb 8, 2023
c0b8ac7
Merge pull request #217 from nf-core/deactivate-deepbgc-tests
jasmezz Feb 8, 2023
fd652b1
add changelog
louperelo Feb 8, 2023
f3eed61
[skip ci] changelog.md
louperelo Feb 8, 2023
5eaa908
Merge pull request #218 from nf-core/readme_toolstyle
jfy133 Feb 8, 2023
509d2f6
Update modules, fix linting
jasmezz Feb 8, 2023
47402bc
Add meta to comBGC, fix other linting stuff
jasmezz Feb 8, 2023
2f9fbee
Update module baktadbdownload
jasmezz Feb 8, 2023
df56886
Merge pull request #219 from nf-core/update-stuff
jasmezz Feb 8, 2023
232c131
Update CHANGELOG.md
jasmezz Feb 8, 2023
d757944
First release version bump
jasmezz Feb 8, 2023
1bcacac
[skip ci] Merge pull request #220 from nf-core/release-version-bump
jasmezz Feb 8, 2023
d77f473
Merge branch 'master' into dev
jasmezz Feb 8, 2023
2f25998
Apply suggestions from dev->master code review
jasmezz Feb 13, 2023
6a886e1
Add indentation
jasmezz Feb 13, 2023
20835d9
Fix modules.config
jasmezz Feb 13, 2023
bb5e50e
Remove curly brackets around args list elements
jasmezz Feb 13, 2023
75dd5e3
Update nextflow.config
jfy133 Feb 14, 2023
fd09d8b
Merge pull request #223 from nf-core/activate-institutional-profiles
jfy133 Feb 14, 2023
99917c3
Apply suggestions from code review
jasmezz Feb 14, 2023
5cdc300
Fix variable evaluation in modules.config
jasmezz Feb 14, 2023
f86fd1e
[automated] Fix linting with Prettier
nf-core-bot Feb 14, 2023
96d39a5
Update conf/modules.config
jfy133 Feb 15, 2023
56ea223
Linting
jfy133 Feb 15, 2023
84d986b
Fianly Fixes from review except DRAMP which publishDir isn't playing nic
jfy133 Feb 15, 2023
776ffa8
Apply suggestions from code review
jasmezz Feb 15, 2023
6a51152
Tiny typo fix
jasmezz Feb 15, 2023
adaa105
Merge pull request #222 from nf-core/review-suggestions
jasmezz Feb 15, 2023
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
27 changes: 27 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"name": "nfcore",
"image": "nfcore/gitpod:latest",
"remoteUser": "gitpod",

// Configure tool-specific properties.
"customizations": {
// Configure properties specific to VS Code.
"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"
},

// Add the IDs of extensions you want installed when the container is created.
"extensions": ["ms-python.python", "ms-python.vscode-pylance", "nf-core.nf-core-extensionpack"]
}
}
}
5 changes: 1 addition & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,9 @@ trim_trailing_whitespace = true
indent_size = 4
indent_style = space

[*.{yml,yaml}]
[*.{md,yml,yaml,html,css,scss,js,cff}]
indent_size = 2

[*.json]
insert_final_newline = unset

# These files are edited and tested upstream in nf-core/modules
[/modules/nf-core/**]
charset = unset
Expand Down
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
*.config linguist-language=nextflow
*.nf.test linguist-language=nextflow
modules/nf-core/** linguist-generated
subworkflows/nf-core/** linguist-generated
59 changes: 25 additions & 34 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ Contributions to the code are even more welcome ;)

If you'd like to write some code for nf-core/funcscan, the standard workflow is as follows:

1. Check that there isn't already an issue about your idea in the [nf-core/funcscan issues](https://github.com/nf-core/funcscan/issues) to avoid duplicating work
* If there isn't one already, please create one so that others know you're working on this
1. Check that there isn't already an issue about your idea in the [nf-core/funcscan issues](https://github.com/nf-core/funcscan/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/funcscan repository](https://github.com/nf-core/funcscan) 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).
Expand Down Expand Up @@ -49,9 +48,9 @@ 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`.
* Fix the bug, and bump version (X.Y.Z+1).
* A PR should be made on `master` from patch to directly this particular bug.
- On your own fork, make a new branch `patch` based on `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.

## Getting help

Expand All @@ -68,16 +67,13 @@ 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
2. Write the process block (see below).
3. Define the output channel if needed (see below).
4. Add any new flags/options to `nextflow.config` with a default (see below).
5. Add any new flags/options to `nextflow_schema.json` with help text (with `nf-core schema build`).
6. Add any new flags/options to the help message (for integer/text parameters, print to help the corresponding `nextflow.config` parameter).
7. Add sanity checks for all relevant parameters.
8. Add any new software to the `scrape_software_versions.py` script in `bin/` and the version command to the `scrape_software_versions` process in `main.nf`.
9. Do local tests that the new code works properly and as expected.
10. Add a new test command in `.github/workflow/ci.yml`.
11. If applicable add a [MultiQC](https://https://multiqc.info/) module.
12. Update MultiQC config `assets/multiqc_config.yaml` so relevant suffixes, name clean up, General Statistics Table column order, and module figures are in the right order.
13. Optional: Add any descriptions of MultiQC report sections and output files to `docs/output.md`.
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).
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`.
9. Update MultiQC config `assets/multiqc_config.yml` so relevant suffixes, file name clean up and module plots are in the appropriate order. If applicable, add a [MultiQC](https://https://multiqc.info/) module.
10. Add a description of the output files and if relevant any appropriate images from the MultiQC report to `docs/output.md`.

### Default values

Expand All @@ -95,34 +91,29 @@ The process resources can be passed on to the tool dynamically within the proces

Please use the following naming schemes, to make it easy to understand what is going where.

* initial process channel: `ch_output_from_<process>`
* intermediate and terminal channels: `ch_<previousprocess>_for_<nextprocess>`
- initial process channel: `ch_output_from_<process>`
- intermediate and terminal channels: `ch_<previousprocess>_for_<nextprocess>`

### 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]`

### Software version reporting

If you add a new tool to the pipeline, please ensure you add the information of the tool to the `get_software_version` process.

Add to the script block of the process, something like the following:
### Images and figures

```bash
<YOUR_TOOL> --version &> v_<YOUR_TOOL>.txt 2>&1 || true
```
For overview images and other documents we follow the nf-core [style guidelines and examples](https://nf-co.re/developers/design_guidelines).

or
## GitHub Codespaces

```bash
<YOUR_TOOL> --help | head -n 1 &> v_<YOUR_TOOL>.txt 2>&1 || true
```
This repo includes a devcontainer configuration which will create a GitHub Codespaces for Nextflow development! This is an online developer environment that runs in your browser, complete with VSCode and a terminal.

You then need to edit the script `bin/scrape_software_versions.py` to:
To get started:

1. Add a Python regex for your tool's `--version` output (as in stored in the `v_<YOUR_TOOL>.txt` file), to ensure the version is reported as a `v` and the version number e.g. `v2.1.1`
2. Add a HTML entry to the `OrderedDict` for formatting in MultiQC.
- Open the repo in [Codespaces](https://github.com/nf-core/funcscan/codespaces)
- Tools installed
- nf-core
- Nextflow

### Images and figures
Devcontainer specs:

For overview images and other documents we follow the nf-core [style guidelines and examples](https://nf-co.re/developers/design_guidelines).
- [DevContainer config](.devcontainer/devcontainer.json)
- [Dockerfile](.devcontainer/Dockerfile)
63 changes: 0 additions & 63 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

50 changes: 50 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Bug report
description: Report something that is broken or incorrect
labels: bug
body:
- type: markdown
attributes:
value: |
Before you post this issue, please check the documentation:

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

- type: textarea
id: description
attributes:
label: Description of the bug
description: A clear and concise description of what the bug is.
validations:
required: true

- type: textarea
id: command_used
attributes:
label: Command used and terminal output
description: Steps to reproduce the behaviour. Please paste the command you used to launch the pipeline and the output from your terminal.
render: console
placeholder: |
$ nextflow run ...

Some output where something broke

- type: textarea
id: files
attributes:
label: Relevant files
description: |
Please drag and drop the relevant files here. Create a `.zip` archive if the extension is not allowed.
Your verbose log file `.nextflow.log` is often useful _(this is a hidden file in the directory where you launched the pipeline)_ as well as custom Nextflow configuration files.

- type: textarea
id: system
attributes:
label: System information
description: |
* Nextflow version _(eg. 22.10.1)_
* Hardware _(eg. HPC, Desktop, Cloud)_
* Executor _(eg. slurm, local, awsbatch)_
* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter or Charliecloud)_
* OS _(eg. CentOS Linux, macOS, Linux Mint)_
* Version of nf-core/funcscan _(eg. 1.1, 1.5, 1.8.2)_
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
blank_issues_enabled: false
contact_links:
- name: Join nf-core
url: https://nf-co.re/join
Expand Down
32 changes: 0 additions & 32 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Feature request
description: Suggest an idea for the nf-core/funcscan pipeline
labels: enhancement
body:
- type: textarea
id: description
attributes:
label: Description of feature
description: Please describe your suggestion for a new feature. It might help to describe a problem or use case, plus any alternatives that you have considered.
validations:
required: true
6 changes: 2 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,14 @@ Remember that PRs should be made against the dev branch, unless you're preparing

Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/funcscan/tree/master/.github/CONTRIBUTING.md)
-->
<!-- markdownlint-disable ul-indent -->

## PR checklist

- [ ] This comment contains a description of changes (with reason).
- [ ] 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/funcscan/tree/master/.github/CONTRIBUTING.md)
- [ ] If necessary, also make a PR on the nf-core/funcscan _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/funcscan/tree/master/.github/CONTRIBUTING.md)- [ ] If necessary, also make a PR on the nf-core/funcscan _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] Make sure your code lints (`nf-core lint`).
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker`).
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
- [ ] Usage Documentation in `docs/usage.md` is updated.
- [ ] Output Documentation in `docs/output.md` is updated.
- [ ] `CHANGELOG.md` is updated.
Expand Down
17 changes: 7 additions & 10 deletions .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Launch workflow via tower
uses: nf-core/tower-action@master
# 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

uses: nf-core/tower-action@v3
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
bearer_token: ${{ secrets.TOWER_BEARER_TOKEN }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
pipeline: ${{ github.repository }}
revision: ${{ github.sha }}
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/funcscan/work-${{ github.sha }}
parameters: |
{
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/funcscan/results-${{ github.sha }}"
}
profiles: '[ "test_full", "aws_tower" ]'

profiles: test_full,aws_tower
- uses: actions/upload-artifact@v3
with:
name: Tower debug log file
path: tower_action_*.log
17 changes: 9 additions & 8 deletions .github/workflows/awstest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,20 @@ jobs:
if: github.repository == 'nf-core/funcscan'
runs-on: ubuntu-latest
steps:
# Launch workflow using Tower CLI tool action
- name: Launch workflow via tower
uses: nf-core/tower-action@master

uses: nf-core/tower-action@v3
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
bearer_token: ${{ secrets.TOWER_BEARER_TOKEN }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
pipeline: ${{ github.repository }}
revision: ${{ github.sha }}
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/funcscan/work-${{ github.sha }}
parameters: |
{
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/funcscan/results-${{ github.sha }}"
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/funcscan/results-test-${{ github.sha }}"
}
profiles: '[ "test", "aws_tower" ]'

profiles: test,aws_tower
- uses: actions/upload-artifact@v3
with:
name: Tower debug log file
path: tower_action_*.log
2 changes: 0 additions & 2 deletions .github/workflows/branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
run: |
{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/funcscan ]] && [[ $GITHUB_HEAD_REF = "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]


# If the above check failed, post a comment on the PR explaining the failure
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
- name: Post PR comment
Expand Down Expand Up @@ -43,4 +42,3 @@ jobs:
Thanks again for your contribution!
repo-token: ${{ secrets.GITHUB_TOKEN }}
allow-repeats: false

Loading