TreeSAK 1.41.4__tar.gz → 1.41.6__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.
- {TreeSAK-1.41.4/TreeSAK.egg-info → TreeSAK-1.41.6}/PKG-INFO +2 -2
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/ALE1.py +76 -32
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/MarkerRef2Tree.py +0 -1
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/VERSION +1 -1
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/dating.py +33 -15
- {TreeSAK-1.41.4 → TreeSAK-1.41.6/TreeSAK.egg-info}/PKG-INFO +2 -2
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/bin/TreeSAK +13 -9
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/LICENSE +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/MANIFEST.in +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/README.md +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/ALE.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/ALE2.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/ALE2RTC.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/ALE3.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/ALE4.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/ALE5.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/ALE6.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/ALE_backup.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/AssessCVG.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/AssessMarker.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/AssessMarkerDeltaLL.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/AssessMarkerPA.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/AssessPB.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/BMGE.jar +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/BMGE.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/CompareMCMC.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/ConcateMSA.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/ConvertMSA.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/Dir.rb +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/ExtractMarkerSeq.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/FastRoot.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/FastRoot_backup.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/GTDB_tree.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/KEGG_Luo17.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/LcaToLeaves.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/MCMCtreeR.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/MarkerRef2Tree_backup.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/MarkerSeq2Tree.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/ModifyTopo.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/Newick_tree_plotter.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/OMA.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/OMA2.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/OneLineAln.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/PB.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/PMSF.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/PhyloBiAssoc.R +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/PhyloBiAssoc.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/PlotMCMC.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/PlotMcmcNode.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/RootTree.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/RootTreeGTDB214.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/RootTreeGTDB220.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/SequentialDating.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/SingleAleHGT.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/SingleLinePhy.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/SliceMSA.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/SplitScore.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/SplitScore1.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/SplitScore1OMA.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/SplitScore2.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/TaxaCountStats.R +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/TaxonTree.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/TreeSAK_config.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/VisHPD95.R +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/VisHPD95.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/__init__.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/ale_parser.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/ale_splitter.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/alignment_pruner.pl +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/aster.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/catfasta2phy.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/compare_trees.R +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/compare_trees.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/dating_ss.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/deltall.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/do_rrtc.rb +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/fa2phy.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/format_leaf_name.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/gap_stats.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/get_SCG_tree.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/get_arCOG_seq.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/global_functions.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/iTOL.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/keep_highest_rrtc.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/label_tree.R +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/label_tree.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/mad.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/mcmcTC.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/mcmctree.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/merge_pdf.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/pRTC.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/plot_distruibution_th.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/prep_mcmctree_ctl.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/print_leaves.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/pruneMSA.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/recode.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/rename_leaves.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/replace_clade.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/root_with_out_group.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/run_TaxaCountStats_R_s1.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/subsample_drep_gnms.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/subset.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/subset_tree_stupid_old_way.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/tmp_1.py +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK/weighted_rand.rb +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK.egg-info/SOURCES.txt +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK.egg-info/dependency_links.txt +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK.egg-info/requires.txt +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/TreeSAK.egg-info/top_level.txt +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/setup.cfg +0 -0
- {TreeSAK-1.41.4 → TreeSAK-1.41.6}/setup.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: TreeSAK
|
|
3
|
-
Version: 1.41.
|
|
3
|
+
Version: 1.41.6
|
|
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.
|
|
27
|
+
TreeSAK v1.41.6
|
|
@@ -7,23 +7,33 @@ from distutils.spawn import find_executable
|
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
ALE1_usage = '''
|
|
10
|
-
|
|
10
|
+
====================================== ALE1 example commands ======================================
|
|
11
11
|
|
|
12
|
-
TreeSAK ALE1 -i OrthologousGroups.txt -s combined.faa -p oma -m 50 -jst 3 -f -o ALE1_op_dir
|
|
13
|
-
TreeSAK ALE1 -ms s03_marker_seq -msx fa -p marker_set_1 -m 50 -jst 3 -f -o ALE1_op_dir
|
|
12
|
+
TreeSAK ALE1 -i OrthologousGroups.txt -s combined.faa -p oma -m 50 -jst 3 -f -o ALE1_op_dir -bmge
|
|
13
|
+
TreeSAK ALE1 -ms s03_marker_seq -msx fa -p marker_set_1 -m 50 -jst 3 -f -o ALE1_op_dir -bmge
|
|
14
14
|
|
|
15
|
-
|
|
15
|
+
===================================================================================================
|
|
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
|
|
69
|
-
combined_faa
|
|
70
|
-
og_program
|
|
71
|
-
marker_seq_dir
|
|
72
|
-
marker_seq_ext
|
|
73
|
-
min_og_genome_num
|
|
74
|
-
js_num_threads
|
|
75
|
-
force_create_op_dir
|
|
76
|
-
op_dir
|
|
77
|
-
|
|
78
|
-
|
|
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
|
|
145
|
-
|
|
146
|
-
|
|
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
|
|
202
|
-
|
|
203
|
-
|
|
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',
|
|
215
|
-
ALE1_parser.add_argument('-s',
|
|
216
|
-
ALE1_parser.add_argument('-ms',
|
|
217
|
-
ALE1_parser.add_argument('-msx',
|
|
218
|
-
ALE1_parser.add_argument('-p',
|
|
219
|
-
ALE1_parser.add_argument('-m',
|
|
220
|
-
ALE1_parser.add_argument('-
|
|
221
|
-
ALE1_parser.add_argument('-
|
|
222
|
-
ALE1_parser.add_argument('-
|
|
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']
|
|
@@ -5,12 +5,12 @@ from distutils.spawn import find_executable
|
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
dating_usage = '''
|
|
8
|
-
========================
|
|
8
|
+
======================== dating example commands ========================
|
|
9
9
|
|
|
10
10
|
# Requirement: PAML
|
|
11
11
|
|
|
12
12
|
# example commands
|
|
13
|
-
TreeSAK
|
|
13
|
+
TreeSAK dating -tree tree.treefile -msa markers.phylip -o dating_wd -f
|
|
14
14
|
|
|
15
15
|
=========================================================================
|
|
16
16
|
'''
|
|
@@ -110,6 +110,7 @@ def dating(args):
|
|
|
110
110
|
tree_file = args['tree']
|
|
111
111
|
msa_file = args['msa']
|
|
112
112
|
op_dir = args['o']
|
|
113
|
+
op_prefix = args['p']
|
|
113
114
|
seq_type = args['st']
|
|
114
115
|
settings_to_compare = args['s']
|
|
115
116
|
force_overwrite = args['f']
|
|
@@ -196,19 +197,35 @@ def dating(args):
|
|
|
196
197
|
os.system('cp %s %s/' % (msa_file, current_dating_wd_2))
|
|
197
198
|
|
|
198
199
|
# prepare mcmctree.ctl file
|
|
199
|
-
mcmctree_ctl_1
|
|
200
|
-
mcmctree_ctl_2
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
200
|
+
mcmctree_ctl_1 = '%s/mcmctree.ctl' % current_dating_wd_1
|
|
201
|
+
mcmctree_ctl_2 = '%s/mcmctree.ctl' % current_dating_wd_2
|
|
202
|
+
|
|
203
|
+
# run 1
|
|
204
|
+
current_para_dict_run1 = para_comb_dict[para_comb]
|
|
205
|
+
current_para_dict_run1['seqfile'] = msa_f_name
|
|
206
|
+
current_para_dict_run1['treefile'] = tree_f_name
|
|
207
|
+
current_para_dict_run1['mcmcfile'] = '%s_mcmc.txt' % para_comb
|
|
208
|
+
current_para_dict_run1['outfile'] = '%s_out.txt' % para_comb
|
|
209
|
+
if op_prefix != '':
|
|
210
|
+
current_para_dict_run1['mcmcfile'] = '%s_%s_mcmc_run1.txt' % (op_prefix, para_comb)
|
|
211
|
+
current_para_dict_run1['outfile'] = '%s_%s_out_run1.txt' % (op_prefix, para_comb)
|
|
212
|
+
current_para_dict_run1['seqtype'] = seq_type
|
|
213
|
+
current_para_dict_run1['usedata'] = '2'
|
|
214
|
+
|
|
215
|
+
# run 2
|
|
216
|
+
current_para_dict_run2 = para_comb_dict[para_comb]
|
|
217
|
+
current_para_dict_run2['seqfile'] = msa_f_name
|
|
218
|
+
current_para_dict_run2['treefile'] = tree_f_name
|
|
219
|
+
current_para_dict_run2['mcmcfile'] = '%s_mcmc.txt' % para_comb
|
|
220
|
+
current_para_dict_run2['outfile'] = '%s_out.txt' % para_comb
|
|
221
|
+
if op_prefix != '':
|
|
222
|
+
current_para_dict_run2['mcmcfile'] = '%s_%s_mcmc_run2.txt' % (op_prefix, para_comb)
|
|
223
|
+
current_para_dict_run2['outfile'] = '%s_%s_out_run2.txt' % (op_prefix, para_comb)
|
|
224
|
+
current_para_dict_run2['seqtype'] = seq_type
|
|
225
|
+
current_para_dict_run2['usedata'] = '2'
|
|
226
|
+
|
|
227
|
+
prep_mcmctree_ctl(current_para_dict_run1, mcmctree_ctl_1)
|
|
228
|
+
prep_mcmctree_ctl(current_para_dict_run2, mcmctree_ctl_2)
|
|
212
229
|
|
|
213
230
|
# copy BV files generated in step one
|
|
214
231
|
os.system('cp %s/out.BV %s/in.BV' % (get_bv_wd, current_dating_wd_1))
|
|
@@ -228,6 +245,7 @@ if __name__ == '__main__':
|
|
|
228
245
|
parser.add_argument('-tree', required=True, help='tree file')
|
|
229
246
|
parser.add_argument('-msa', required=True, help='sequence alignments')
|
|
230
247
|
parser.add_argument('-o', required=True, help='output directory')
|
|
248
|
+
parser.add_argument('-p', required=False, default='', help='output prefix')
|
|
231
249
|
parser.add_argument('-s', required=True, help='settings to compare')
|
|
232
250
|
parser.add_argument('-st', required=False, default='2', help='sequence type, 0 for nucleotides, 1 for codons, 2 for AAs, default: 2')
|
|
233
251
|
parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: TreeSAK
|
|
3
|
-
Version: 1.41.
|
|
3
|
+
Version: 1.41.6
|
|
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.
|
|
27
|
+
TreeSAK v1.41.6
|
|
@@ -307,6 +307,7 @@ if __name__ == '__main__':
|
|
|
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')
|
|
310
|
+
dating_parser.add_argument('-p', required=False, default='', help='output prefix')
|
|
310
311
|
dating_parser.add_argument('-s', required=True, help='settings to compare')
|
|
311
312
|
dating_parser.add_argument('-st', required=False, default='2', help='sequence type, 0 for nucleotides, 1 for codons, 2 for AAs, default: 2')
|
|
312
313
|
dating_parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
|
|
@@ -504,15 +505,18 @@ if __name__ == '__main__':
|
|
|
504
505
|
elif sys.argv[1] in ['ALE1', 'ale1', 'Ale1']:
|
|
505
506
|
from TreeSAK import ALE1
|
|
506
507
|
ALE1_parser = subparsers.add_parser('ALE1', usage=ALE1.ALE1_usage)
|
|
507
|
-
ALE1_parser.add_argument('-i',
|
|
508
|
-
ALE1_parser.add_argument('-s',
|
|
509
|
-
ALE1_parser.add_argument('-ms',
|
|
510
|
-
ALE1_parser.add_argument('-msx',
|
|
511
|
-
ALE1_parser.add_argument('-p',
|
|
512
|
-
ALE1_parser.add_argument('-m',
|
|
513
|
-
ALE1_parser.add_argument('-
|
|
514
|
-
ALE1_parser.add_argument('-
|
|
515
|
-
ALE1_parser.add_argument('-
|
|
508
|
+
ALE1_parser.add_argument('-i', required=False, default=None, help='orthologous groups, either from orthofinder or oma')
|
|
509
|
+
ALE1_parser.add_argument('-s', required=False, default=None, help='sequence file, e.g., combined.faa')
|
|
510
|
+
ALE1_parser.add_argument('-ms', required=False, default=None, help='input is a folder holds the sequence of each marker')
|
|
511
|
+
ALE1_parser.add_argument('-msx', required=False, default='fa', help='file extension of marker sequence file, default: fa')
|
|
512
|
+
ALE1_parser.add_argument('-p', required=True, help='orthologous identification program, orthofinder or oma')
|
|
513
|
+
ALE1_parser.add_argument('-m', required=False, type=int, default=50, help='min_og_genome_num, default: 50')
|
|
514
|
+
ALE1_parser.add_argument('-bmge', required=False, action="store_true", help='trim MSA with BMGE, default no trimming')
|
|
515
|
+
ALE1_parser.add_argument('-bmge_m', required=False, default='BLOSUM30', help='BMGE trim model, default: BLOSUM30')
|
|
516
|
+
ALE1_parser.add_argument('-bmge_esc', required=False, default='0.55', help='BMGE entropy score cutoff, default: 0.55')
|
|
517
|
+
ALE1_parser.add_argument('-o', required=True, help='output dir, i.e., OMA working directory')
|
|
518
|
+
ALE1_parser.add_argument('-jst', required=False, type=int, default=3, help='number of threads specified in job script, default: 3')
|
|
519
|
+
ALE1_parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
|
|
516
520
|
args = vars(parser.parse_args())
|
|
517
521
|
ALE1.ALE1(args)
|
|
518
522
|
|
|
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
|
|
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
|