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

Minor fixes to tool_data_table_conf and related files for clair3 and artic #6790

Open
wants to merge 54 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
298cadd
mmuphin wrapper draft with errors
renu-pal Nov 22, 2024
ef26199
Update .shed.yml
renu-pal Nov 22, 2024
801cc88
removing long description from .shed.yml
renu-pal Nov 25, 2024
f0ca96f
Update tools/mmuphin/macros.xml
renu-pal Nov 25, 2024
c19da4d
Update tools/mmuphin/macros.xml
renu-pal Nov 25, 2024
52076ec
Update tools/mmuphin/macros.xml
renu-pal Nov 25, 2024
bab0879
Update tools/mmuphin/macros.xml
renu-pal Nov 25, 2024
7c09803
Update tools/mmuphin/macros.xml
renu-pal Nov 25, 2024
f340c26
Update tools/mmuphin/mmuphin.xml
renu-pal Nov 25, 2024
4ee8d65
reducing CRC_abd file size and adding adjust_batch.R file
renu-pal Nov 25, 2024
e861c0f
adding long description into .shed.yml due to linting issue
renu-pal Nov 25, 2024
f65885e
Update .shed.yml
renu-pal Nov 25, 2024
7fafc59
Update .shed.yml
renu-pal Nov 25, 2024
f79c79f
update
paulzierep Nov 28, 2024
1b335f1
update
paulzierep Nov 28, 2024
d86e487
rm unneeded requs
paulzierep Nov 28, 2024
47d426d
Merge pull request #4 from paulzierep/mmuphin_wrapper
renu-pal Nov 29, 2024
f815e86
changing batch value in test, as first column header is null
renu-pal Dec 3, 2024
f36aa66
removing control_output from test
renu-pal Dec 3, 2024
090b476
reducing file size
renu-pal Dec 3, 2024
c5af559
Update mmuphin.xml
renu-pal Dec 10, 2024
e60c159
fixed tests
paulzierep Dec 13, 2024
9c404da
Merge pull request #5 from paulzierep/mmuphin_wrapper
renu-pal Dec 19, 2024
7c2d2d7
Update tools/mmuphin/mmuphin.xml
renu-pal Jan 12, 2025
c1b167c
getting column names in R directly
renu-pal Jan 13, 2025
550cd60
Apply suggestions from code review
bgruening Jan 13, 2025
8d38c99
removed unnecessary commented code
renu-pal Jan 13, 2025
b6e9c39
Update tools/mmuphin/mmuphin.xml
renu-pal Jan 14, 2025
5109992
improving help section
renu-pal Jan 14, 2025
0c902c3
Update tools/mmuphin/mmuphin.xml
renu-pal Jan 14, 2025
19a33c0
removing additional options
renu-pal Jan 15, 2025
663287a
Update tools/mmuphin/mmuphin.xml
renu-pal Jan 16, 2025
a139a38
adding test with covariate=null and few other updates
renu-pal Jan 16, 2025
ed1d307
mak covariates optional with python
paulzierep Jan 31, 2025
9195bf8
Merge pull request #6 from paulzierep/mmuphin_wrapper
renu-pal Feb 4, 2025
591e5b3
adding test case with multiple covariates
renu-pal Feb 7, 2025
fa3e8a5
Update tools/mmuphin/mmuphin.xml
renu-pal Feb 8, 2025
a968744
Update tools/mmuphin/mmuphin.xml
renu-pal Feb 8, 2025
e74fa15
suggested min max convergence value
renu-pal Feb 8, 2025
243f1fc
adding filter in O/P and min max in conv
renu-pal Feb 10, 2025
d5b2dcd
Fix up tool_data_table_conf files
pvanheus Feb 22, 2025
a26b512
Remember to save this time
pvanheus Feb 22, 2025
ef8d97b
Fix columns in test-data
pvanheus Feb 22, 2025
9fe39fd
Update artic: add primer scheme download and some small enhancements …
pvanheus Feb 24, 2025
836f979
Minor update to tools/ncbi datasets (#6797)
SaimMomin12 Feb 24, 2025
a3bca79
New tool addition: MerquryFK ASMPlot (#6786)
SaimMomin12 Feb 25, 2025
9d6123a
Merge pull request #6584 from renu-pal/mmuphin_wrapper
bgruening Feb 25, 2025
e44d3cd
Correct tool data table name
pvanheus Feb 26, 2025
c6d65d9
Update starAMR DM version (#6802)
hugolefeuvre Feb 27, 2025
d5a83e7
Fix up tool_data_table_conf files
pvanheus Feb 22, 2025
3b548fd
Remember to save this time
pvanheus Feb 22, 2025
dbdf06c
Fix columns in test-data
pvanheus Feb 22, 2025
4d11cd2
Correct tool data table name
pvanheus Feb 26, 2025
a3740ec
Merge branch 'update_clair3' of github.com:pvanheus/tools-iuc into up…
wm75 Feb 27, 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
2 changes: 1 addition & 1 deletion tools/artic/artic_minion.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<tool id="artic_minion" name="ARTIC minion" version="@TOOL_VERSION@+galaxy0" profile="20.09">
<tool id="artic_minion" name="ARTIC minion" version="@TOOL_VERSION@+galaxy1" profile="23.2">
<description>Build consensus sequence and call variants from amplicon-based nanopore sequence data</description>
<macros>
<import>macros.xml</import>
Expand Down
2 changes: 1 addition & 1 deletion tools/artic/test-data/clair3_models.loc
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
#
#So, clair3_models.loc could look something like this:
test_model ont $(dirname $(which run_clair3.sh))/models/r941_prom_hac_g360+g422 clair3
r1041_e82_400bps_sup_v500 r1041_e82_400bps_sup_v500 ont 01c05768661bdd7de611e6bae1043c43b7523a54b223e029c683bfac0db7a678 /no/such/model rerio
r1041_e82_400bps_sup_v500 ont 01c05768661bdd7de611e6bae1043c43b7523a54b223e029c683bfac0db7a678 /no/such/model rerio
11 changes: 1 addition & 10 deletions tools/artic/tool-data/models.loc.sample
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
#Enter the model names in the second column, the platform name in the second and the path in the third.
#This file lists the locations and dbkeys of all the model files
#under the "models" directory (a directory that contains a directory
#for each build). This file has the format (white space characters are
#TAB characters):
#
#<id> <name> <platform> <path>
#
#So, all_model.loc could look something like this:
test_model "the_model_name" r941_prom_hac_g360+g422 $(dirname $(which run_clair3.sh))/models/r941_prom_hac_g360+g422#This file lists the names and locations of all the clair3 model files
#This file lists the names and locations of all the clair3 model files
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this entire file still needs to be renamed to clair3_models.loc.sample I guess.
Then the tool_data_table.conf needs to be adjusted too.

#under the "clair3_models" directory (a directory that contains a directory
#for each build). This file has the format (white space characters are
#TAB characters):
Expand Down
2 changes: 1 addition & 1 deletion tools/clair3/clair3.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<description>germline small variant caller for long-reads</description>
<macros>
<token name="@TOOL_VERSION@">1.0.10</token>
<token name="@VERSION_SUFFIX@">1</token>
<token name="@VERSION_SUFFIX@">2</token>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't bump this version so that we can overwrite the faulty previous attempt

</macros>
<xrefs>
<xref type='bio.tools'>clair3</xref>
Expand Down
13 changes: 6 additions & 7 deletions tools/clair3/test-data/clair3_models.loc
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#Enter the model names in the second column, the platform name in the second and the path in the third.
#This file lists the locations and dbkeys of all the model files
#under the "models" directory (a directory that contains a directory
#This file lists the names and locations of all the clair3 model files
#under the "clair3_models" directory (a directory that contains a directory
#for each build). This file has the format (white space characters are
#TAB characters):
#
#<unique_build_id> <display_name> <platform> <file_path> <source>
#<unique_name> <platform> <sha256sum> <file_path> <source>
#
#So, all_model.loc could look something like this:
test_model "the_model_name" ont $(dirname $(which run_clair3.sh))/models/r941_prom_hac_g360+g422 clair3
r1041_e82_400bps_sup_v500 r1041_e82_400bps_sup_v500 ont /no/such/model rerio
#So, clair3_models.loc could look something like this:
test_model ont $(dirname $(which run_clair3.sh))/models/r941_prom_hac_g360+g422 clair3
r1041_e82_400bps_sup_v500 ont 01c05768661bdd7de611e6bae1043c43b7523a54b223e029c683bfac0db7a678 /no/such/model rerio
9 changes: 9 additions & 0 deletions tools/clair3/tool-data/clair3_models.loc.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#This file lists the names and locations of all the clair3 model files
#under the "clair3_models" directory (a directory that contains a directory
#for each build). This file has the format (white space characters are
#TAB characters):
#
#<unique_name> <platform> <sha256sum> <file_path> <source>
#
#So, clair3_models.loc could look something like this:
test_model ont $(dirname $(which run_clair3.sh))/models/r941_prom_hac_g360+g422 clair3
11 changes: 0 additions & 11 deletions tools/clair3/tool-data/model.loc.sample

This file was deleted.

4 changes: 2 additions & 2 deletions tools/clair3/tool_data_table_conf.xml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<tables>
<!-- Locations of clair3 model folders -->
<table name="model" comment_char="#">
<columns>value, name, platform, path, source</columns>
<file path="tool-data/model.loc" />
<columns>value, platform, sha256, path, source</columns>
<file path="tool-data/clair3_models.loc" />
</table>
<table name="all_fasta" comment_char="#">
<columns>value, dbkey, name, path</columns>
Expand Down
4 changes: 2 additions & 2 deletions tools/clair3/tool_data_table_conf.xml.test
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<tables>
<!-- Locations of model folders -->
<!-- Locations of clair3 model folders -->
<table name="clair3_models" comment_char="#">
<columns>value, name, platform, path, source</columns>
<columns>value, platform, sha256, path, source</columns>
<file path="${__HERE__}/test-data/clair3_models.loc" />
</table>
<!-- Locations of reference genome files in fasta format -->
Expand Down