TreeSAK 1.41.3__tar.gz → 1.41.5__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (111) hide show
  1. {TreeSAK-1.41.3/TreeSAK.egg-info → TreeSAK-1.41.5}/PKG-INFO +2 -2
  2. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/ALE1.py +72 -28
  3. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/MarkerRef2Tree.py +0 -1
  4. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/VERSION +1 -1
  5. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/dating.py +4 -4
  6. {TreeSAK-1.41.3 → TreeSAK-1.41.5/TreeSAK.egg-info}/PKG-INFO +2 -2
  7. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/bin/TreeSAK +14 -11
  8. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/LICENSE +0 -0
  9. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/MANIFEST.in +0 -0
  10. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/README.md +0 -0
  11. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/ALE.py +0 -0
  12. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/ALE2.py +0 -0
  13. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/ALE2RTC.py +0 -0
  14. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/ALE3.py +0 -0
  15. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/ALE4.py +0 -0
  16. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/ALE5.py +0 -0
  17. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/ALE6.py +0 -0
  18. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/ALE_backup.py +0 -0
  19. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/AssessCVG.py +0 -0
  20. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/AssessMarker.py +0 -0
  21. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/AssessMarkerDeltaLL.py +0 -0
  22. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/AssessMarkerPA.py +0 -0
  23. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/AssessPB.py +0 -0
  24. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/BMGE.jar +0 -0
  25. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/BMGE.py +0 -0
  26. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/CompareMCMC.py +0 -0
  27. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/ConcateMSA.py +0 -0
  28. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/ConvertMSA.py +0 -0
  29. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/Dir.rb +0 -0
  30. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/ExtractMarkerSeq.py +0 -0
  31. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/FastRoot.py +0 -0
  32. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/FastRoot_backup.py +0 -0
  33. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/GTDB_tree.py +0 -0
  34. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/KEGG_Luo17.py +0 -0
  35. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/LcaToLeaves.py +0 -0
  36. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/MCMCtreeR.py +0 -0
  37. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/MarkerRef2Tree_backup.py +0 -0
  38. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/MarkerSeq2Tree.py +0 -0
  39. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/ModifyTopo.py +0 -0
  40. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/Newick_tree_plotter.py +0 -0
  41. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/OMA.py +0 -0
  42. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/OMA2.py +0 -0
  43. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/OneLineAln.py +0 -0
  44. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/PB.py +0 -0
  45. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/PMSF.py +0 -0
  46. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/PhyloBiAssoc.R +0 -0
  47. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/PhyloBiAssoc.py +0 -0
  48. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/PlotMCMC.py +0 -0
  49. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/PlotMcmcNode.py +0 -0
  50. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/RootTree.py +0 -0
  51. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/RootTreeGTDB214.py +0 -0
  52. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/RootTreeGTDB220.py +0 -0
  53. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/SequentialDating.py +0 -0
  54. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/SingleAleHGT.py +0 -0
  55. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/SingleLinePhy.py +0 -0
  56. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/SliceMSA.py +0 -0
  57. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/SplitScore.py +0 -0
  58. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/SplitScore1.py +0 -0
  59. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/SplitScore1OMA.py +0 -0
  60. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/SplitScore2.py +0 -0
  61. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/TaxaCountStats.R +0 -0
  62. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/TaxonTree.py +0 -0
  63. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/TreeSAK_config.py +0 -0
  64. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/VisHPD95.R +0 -0
  65. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/VisHPD95.py +0 -0
  66. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/__init__.py +0 -0
  67. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/ale_parser.py +0 -0
  68. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/ale_splitter.py +0 -0
  69. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/alignment_pruner.pl +0 -0
  70. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/aster.py +0 -0
  71. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/catfasta2phy.py +0 -0
  72. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/compare_trees.R +0 -0
  73. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/compare_trees.py +0 -0
  74. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/dating_ss.py +0 -0
  75. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/deltall.py +0 -0
  76. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/do_rrtc.rb +0 -0
  77. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/fa2phy.py +0 -0
  78. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/format_leaf_name.py +0 -0
  79. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/gap_stats.py +0 -0
  80. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/get_SCG_tree.py +0 -0
  81. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/get_arCOG_seq.py +0 -0
  82. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/global_functions.py +0 -0
  83. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/iTOL.py +0 -0
  84. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/keep_highest_rrtc.py +0 -0
  85. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/label_tree.R +0 -0
  86. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/label_tree.py +0 -0
  87. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/mad.py +0 -0
  88. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/mcmcTC.py +0 -0
  89. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/mcmctree.py +0 -0
  90. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/merge_pdf.py +0 -0
  91. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/pRTC.py +0 -0
  92. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/plot_distruibution_th.py +0 -0
  93. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/prep_mcmctree_ctl.py +0 -0
  94. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/print_leaves.py +0 -0
  95. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/pruneMSA.py +0 -0
  96. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/recode.py +0 -0
  97. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/rename_leaves.py +0 -0
  98. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/replace_clade.py +0 -0
  99. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/root_with_out_group.py +0 -0
  100. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/run_TaxaCountStats_R_s1.py +0 -0
  101. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/subsample_drep_gnms.py +0 -0
  102. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/subset.py +0 -0
  103. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/subset_tree_stupid_old_way.py +0 -0
  104. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/tmp_1.py +0 -0
  105. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK/weighted_rand.rb +0 -0
  106. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK.egg-info/SOURCES.txt +0 -0
  107. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK.egg-info/dependency_links.txt +0 -0
  108. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK.egg-info/requires.txt +0 -0
  109. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/TreeSAK.egg-info/top_level.txt +0 -0
  110. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/setup.cfg +0 -0
  111. {TreeSAK-1.41.3 → TreeSAK-1.41.5}/setup.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: TreeSAK
3
- Version: 1.41.3
3
+ Version: 1.41.5
4
4
  Summary: BioSAK
5
5
  Home-page: https://github.com/songweizhi/TreeSAK
6
6
  Author: Weizhi Song
@@ -24,4 +24,4 @@ Requires-Dist: kaleido
24
24
  Requires-Dist: PyPDF3
25
25
  Requires-Dist: dendropy
26
26
 
27
- TreeSAK v1.41.3
27
+ TreeSAK v1.41.5
@@ -16,14 +16,24 @@ TreeSAK ALE1 -ms s03_marker_seq -msx fa -p marker_set_1 -m 50 -jst 3 -f -o ALE1_
16
16
  '''
17
17
 
18
18
 
19
+ def check_dependencies(program_list):
20
+
21
+ not_detected_programs = []
22
+ for needed_program in program_list:
23
+ if find_executable(needed_program) is None:
24
+ not_detected_programs.append(needed_program)
25
+
26
+ if not_detected_programs != []:
27
+ print('%s not found, program exited!' % ','.join(not_detected_programs))
28
+ exit()
29
+
30
+
19
31
  def sep_path_basename_ext(file_in):
20
32
 
21
- # separate path and file name
22
33
  f_path, file_name = os.path.split(file_in)
23
34
  if f_path == '':
24
35
  f_path = '.'
25
36
 
26
- # separate file basename and extension
27
37
  f_base, f_ext = os.path.splitext(file_name)
28
38
 
29
39
  return f_path, f_base, f_ext
@@ -65,17 +75,27 @@ def get_ortho_to_gene_dict(ortho_groups_txt, og_program):
65
75
 
66
76
  def ALE1(args):
67
77
 
68
- orthogroups_op_txt = args['i']
69
- combined_faa = args['s']
70
- og_program = args['p']
71
- marker_seq_dir = args['ms']
72
- marker_seq_ext = args['msx']
73
- min_og_genome_num = args['m']
74
- js_num_threads = args['jst']
75
- force_create_op_dir = args['f']
76
- op_dir = args['o']
77
- designate_ogs = []
78
- to_ignore_ogs_list = []
78
+ orthogroups_op_txt = args['i']
79
+ combined_faa = args['s']
80
+ og_program = args['p']
81
+ marker_seq_dir = args['ms']
82
+ marker_seq_ext = args['msx']
83
+ min_og_genome_num = args['m']
84
+ js_num_threads = args['jst']
85
+ force_create_op_dir = args['f']
86
+ op_dir = args['o']
87
+ trim_with_bmge = args['bmge']
88
+ bmge_trim_model = args['bmge_m']
89
+ bmge_entropy_score_cutoff = args['bmge_esc']
90
+ designate_ogs = []
91
+ to_ignore_ogs_list = []
92
+
93
+ # check dependencies
94
+ check_dependencies(['java', 'blastp', 'mafft-einsi'])
95
+
96
+ # specify path to BMGE.jar
97
+ current_file_path = '/'.join(os.path.realpath(__file__).split('/')[:-1])
98
+ pwd_bmge_jar = '%s/BMGE.jar' % current_file_path
79
99
 
80
100
  # define output file name
81
101
  get_gene_tree_cmds_txt = '%s_cmds.txt' % op_dir
@@ -140,10 +160,20 @@ def ALE1(args):
140
160
  qualified_og_gene_set = ortho_to_gene_dict[qualified_og]
141
161
  qualified_og_gene_faa = '%s/%s.faa' % (op_dir, qualified_og)
142
162
 
163
+ og_aln = '%s.aln' % qualified_og
164
+ og_aln_trimmed = '%s_trimmed.aln' % qualified_og
165
+
143
166
  # write out commands
144
- mafft_cmd = 'mafft-einsi --thread %s --quiet %s.faa > %s.aln' % (js_num_threads, qualified_og, qualified_og)
145
- iqtree_cmd = '%s -m LG+G+I -bb 1000 --wbtl -nt %s -s %s.aln -pre %s' % (iqtree_exe, js_num_threads, qualified_og, qualified_og)
146
- get_gene_tree_cmds_txt_handle.write('%s; %s\n' % (mafft_cmd, iqtree_cmd))
167
+ mafft_cmd = 'mafft-einsi --thread %s --quiet %s.faa > %s' % (js_num_threads, qualified_og, og_aln)
168
+ trim_cmd = 'java -jar %s -i %s -m %s -t AA -h %s -of %s' % (pwd_bmge_jar, og_aln, bmge_trim_model, bmge_entropy_score_cutoff, og_aln_trimmed)
169
+ iqtree_cmd = '%s -m LG+G+I -bb 1000 --wbtl -nt %s -s %s -pre %s' % (iqtree_exe, js_num_threads, og_aln, qualified_og)
170
+ if trim_with_bmge is True:
171
+ iqtree_cmd = '%s -m LG+G+I -bb 1000 --wbtl -nt %s -s %s -pre %s' % (iqtree_exe, js_num_threads, og_aln_trimmed, qualified_og)
172
+
173
+ if trim_with_bmge is True:
174
+ get_gene_tree_cmds_txt_handle.write('%s; %s; %s\n' % (mafft_cmd, trim_cmd, iqtree_cmd))
175
+ else:
176
+ get_gene_tree_cmds_txt_handle.write('%s; %s\n' % (mafft_cmd, iqtree_cmd))
147
177
 
148
178
  # write out sequences
149
179
  qualified_og_gene_faa_handle = open(qualified_og_gene_faa, 'w')
@@ -197,10 +227,21 @@ def ALE1(args):
197
227
  # copy sequence file into output directory
198
228
  os.system('cp %s/%s.%s %s/' % (marker_seq_dir, qualified_og, marker_seq_ext, op_dir))
199
229
 
230
+ qualified_og_aln = '%s.aln' % qualified_og
231
+ qualified_og_aln_trimmed = '%s_trimmed.aln' % qualified_og
232
+
200
233
  # write out commands
201
- mafft_cmd = 'mafft-einsi --thread %s --quiet %s.%s > %s.aln' % (js_num_threads, qualified_og, marker_seq_ext, qualified_og)
202
- iqtree_cmd = '%s -m LG+G+I -bb 1000 --wbtl -nt %s -s %s.aln -pre %s' % (iqtree_exe, js_num_threads, qualified_og, qualified_og)
203
- get_gene_tree_cmds_txt_handle.write('%s; %s\n' % (mafft_cmd, iqtree_cmd))
234
+ mafft_cmd = 'mafft-einsi --thread %s --quiet %s.%s > %s' % (js_num_threads, qualified_og, marker_seq_ext, qualified_og_aln)
235
+ trim_cmd = 'java -jar %s -i %s -m %s -t AA -h %s -of %s' % (pwd_bmge_jar, qualified_og_aln, bmge_trim_model, bmge_entropy_score_cutoff, qualified_og_aln_trimmed)
236
+ iqtree_cmd = '%s -m LG+G+I -bb 1000 --wbtl -nt %s -s %s -pre %s' % (iqtree_exe, js_num_threads, qualified_og_aln, qualified_og)
237
+ if trim_with_bmge is True:
238
+ iqtree_cmd = '%s -m LG+G+I -bb 1000 --wbtl -nt %s -s %s -pre %s' % (iqtree_exe, js_num_threads, qualified_og_aln_trimmed, qualified_og)
239
+
240
+ if trim_with_bmge is False:
241
+ get_gene_tree_cmds_txt_handle.write('%s; %s\n' % (mafft_cmd, iqtree_cmd))
242
+ else:
243
+ get_gene_tree_cmds_txt_handle.write('%s; %s; %s\n' % (mafft_cmd, trim_cmd, iqtree_cmd))
244
+
204
245
  get_gene_tree_cmds_txt_handle.close()
205
246
 
206
247
  print('Sequece files exported to %s.' % op_dir)
@@ -211,14 +252,17 @@ def ALE1(args):
211
252
  if __name__ == '__main__':
212
253
 
213
254
  ALE1_parser = argparse.ArgumentParser()
214
- ALE1_parser.add_argument('-i', required=False, default=None, help='orthologous groups, either from orthofinder or oma')
215
- ALE1_parser.add_argument('-s', required=False, default=None, help='sequence file, e.g., combined.faa')
216
- ALE1_parser.add_argument('-ms', required=False, default=None, help='input is a folder holds the sequence of each marker')
217
- ALE1_parser.add_argument('-msx', required=False, default='fa', help='file extension of marker sequence file, default: fa')
218
- ALE1_parser.add_argument('-p', required=True, help='orthologous identification program, orthofinder or oma')
219
- ALE1_parser.add_argument('-m', required=False, type=int, default=50, help='min_og_genome_num, default: 50')
220
- ALE1_parser.add_argument('-o', required=True, help='output dir, i.e., OMA working directory')
221
- ALE1_parser.add_argument('-jst', required=False, type=int, default=3, help='number of threads specified in job script, default: 3')
222
- ALE1_parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
255
+ ALE1_parser.add_argument('-i', required=False, default=None, help='orthologous groups, either from orthofinder or oma')
256
+ ALE1_parser.add_argument('-s', required=False, default=None, help='sequence file, e.g., combined.faa')
257
+ ALE1_parser.add_argument('-ms', required=False, default=None, help='input is a folder holds the sequence of each marker')
258
+ ALE1_parser.add_argument('-msx', required=False, default='fa', help='file extension of marker sequence file, default: fa')
259
+ ALE1_parser.add_argument('-p', required=True, help='orthologous identification program, orthofinder or oma')
260
+ ALE1_parser.add_argument('-m', required=False, type=int, default=50, help='min_og_genome_num, default: 50')
261
+ ALE1_parser.add_argument('-bmge', required=False, action="store_true", help='trim MSA with BMGE, default no trimming')
262
+ ALE1_parser.add_argument('-bmge_m', required=False, default='BLOSUM30', help='BMGE trim model, default: BLOSUM30')
263
+ ALE1_parser.add_argument('-bmge_esc', required=False, default='0.55', help='BMGE entropy score cutoff, default: 0.55')
264
+ ALE1_parser.add_argument('-o', required=True, help='output dir, i.e., OMA working directory')
265
+ ALE1_parser.add_argument('-jst', required=False, type=int, default=3, help='number of threads specified in job script, default: 3')
266
+ ALE1_parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
223
267
  args = vars(ALE1_parser.parse_args())
224
268
  ALE1(args)
@@ -340,7 +340,6 @@ def MarkerRef2Tree(args):
340
340
  pa_cutoff_str = args['c']
341
341
  minimal_marker_number = args['mmn']
342
342
  run_psiblast = args['psiblast']
343
- run_bmge = args['bmge']
344
343
  trim_with_bmge = args['bmge']
345
344
  bmge_trim_model = args['bmge_m']
346
345
  bmge_entropy_score_cutoff = args['bmge_esc']
@@ -1,4 +1,4 @@
1
- 1.41.3
1
+ 1.41.5
2
2
  - fixed bugs
3
3
 
4
4
  1.41.0
@@ -5,12 +5,12 @@ from distutils.spawn import find_executable
5
5
 
6
6
 
7
7
  dating_usage = '''
8
- ======================== Dating example commands ========================
8
+ ======================== dating example commands ========================
9
9
 
10
10
  # Requirement: PAML
11
11
 
12
12
  # example commands
13
- TreeSAK Dating -tree tree.treefile -msa markers.phylip -o dating_wd -f
13
+ TreeSAK dating -tree tree.treefile -msa markers.phylip -o dating_wd -f
14
14
 
15
15
  =========================================================================
16
16
  '''
@@ -169,8 +169,8 @@ def dating(args):
169
169
  # run command to get bv file
170
170
  print('Running step one command to get the BV file.')
171
171
  os.chdir(get_bv_wd)
172
- #os.system('mcmctree > log.txt')
173
- os.system('touch out.BV')
172
+ os.system('mcmctree > log.txt')
173
+ #os.system('touch out.BV')
174
174
  print('Step one finished.')
175
175
  os.chdir(current_pwd)
176
176
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: TreeSAK
3
- Version: 1.41.3
3
+ Version: 1.41.5
4
4
  Summary: BioSAK
5
5
  Home-page: https://github.com/songweizhi/TreeSAK
6
6
  Author: Weizhi Song
@@ -24,4 +24,4 @@ Requires-Dist: kaleido
24
24
  Requires-Dist: PyPDF3
25
25
  Requires-Dist: dendropy
26
26
 
27
- TreeSAK v1.41.3
27
+ TreeSAK v1.41.5
@@ -83,7 +83,7 @@ def print_main_help():
83
83
  PPA -> (to be added) Perform Posterior Predictive Analysis (across-site)
84
84
 
85
85
  Dating-related
86
- Dating -> Perform molecular dating
86
+ dating -> Perform molecular dating
87
87
  AssessCVG -> Assess dating convergence
88
88
  CompareMCMC -> Compare MCMCTree outputs
89
89
  PlotMcmcNode -> distribution of node's age estimation
@@ -303,7 +303,7 @@ if __name__ == '__main__':
303
303
 
304
304
  elif sys.argv[1] in ['Dating', 'dating']:
305
305
  from TreeSAK import dating
306
- dating_parser = subparsers.add_parser('Dating', usage=dating.dating_usage)
306
+ dating_parser = subparsers.add_parser('dating', usage=dating.dating_usage)
307
307
  dating_parser.add_argument('-tree', required=True, help='outgroup leaves, one id per line')
308
308
  dating_parser.add_argument('-msa', required=True, help='EU tree with time constraints')
309
309
  dating_parser.add_argument('-o', required=True, help='dating wd')
@@ -504,15 +504,18 @@ if __name__ == '__main__':
504
504
  elif sys.argv[1] in ['ALE1', 'ale1', 'Ale1']:
505
505
  from TreeSAK import ALE1
506
506
  ALE1_parser = subparsers.add_parser('ALE1', usage=ALE1.ALE1_usage)
507
- ALE1_parser.add_argument('-i', required=False, default=None, help='orthologous groups, either from orthofinder or oma')
508
- ALE1_parser.add_argument('-s', required=False, default=None, help='sequence file, e.g., combined.faa')
509
- ALE1_parser.add_argument('-ms', required=False, default=None, help='input is a folder holds the sequence of each marker')
510
- ALE1_parser.add_argument('-msx', required=False, default='fa', help='file extension of marker sequence file, default: fa')
511
- ALE1_parser.add_argument('-p', required=True, help='orthologous identification program, orthofinder or oma')
512
- ALE1_parser.add_argument('-m', required=False, type=int, default=50, help='min_og_genome_num, default: 50')
513
- ALE1_parser.add_argument('-o', required=True, help='output dir, i.e., OMA working directory')
514
- ALE1_parser.add_argument('-jst', required=False, type=int, default=3, help='number of threads specified in job script, default: 3')
515
- ALE1_parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
507
+ ALE1_parser.add_argument('-i', required=False, default=None, help='orthologous groups, either from orthofinder or oma')
508
+ ALE1_parser.add_argument('-s', required=False, default=None, help='sequence file, e.g., combined.faa')
509
+ ALE1_parser.add_argument('-ms', required=False, default=None, help='input is a folder holds the sequence of each marker')
510
+ ALE1_parser.add_argument('-msx', required=False, default='fa', help='file extension of marker sequence file, default: fa')
511
+ ALE1_parser.add_argument('-p', required=True, help='orthologous identification program, orthofinder or oma')
512
+ ALE1_parser.add_argument('-m', required=False, type=int, default=50, help='min_og_genome_num, default: 50')
513
+ ALE1_parser.add_argument('-bmge', required=False, action="store_true", help='trim MSA with BMGE, default no trimming')
514
+ ALE1_parser.add_argument('-bmge_m', required=False, default='BLOSUM30', help='BMGE trim model, default: BLOSUM30')
515
+ ALE1_parser.add_argument('-bmge_esc', required=False, default='0.55', help='BMGE entropy score cutoff, default: 0.55')
516
+ ALE1_parser.add_argument('-o', required=True, help='output dir, i.e., OMA working directory')
517
+ ALE1_parser.add_argument('-jst', required=False, type=int, default=3, help='number of threads specified in job script, default: 3')
518
+ ALE1_parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
516
519
  args = vars(parser.parse_args())
517
520
  ALE1.ALE1(args)
518
521
 
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes