TreeSAK 1.41.5__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.5/TreeSAK.egg-info → TreeSAK-1.41.6}/PKG-INFO +2 -2
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/ALE1.py +4 -4
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/VERSION +1 -1
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/dating.py +31 -13
- {TreeSAK-1.41.5 → TreeSAK-1.41.6/TreeSAK.egg-info}/PKG-INFO +2 -2
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/bin/TreeSAK +1 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/LICENSE +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/MANIFEST.in +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/README.md +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/ALE.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/ALE2.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/ALE2RTC.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/ALE3.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/ALE4.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/ALE5.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/ALE6.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/ALE_backup.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/AssessCVG.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/AssessMarker.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/AssessMarkerDeltaLL.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/AssessMarkerPA.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/AssessPB.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/BMGE.jar +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/BMGE.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/CompareMCMC.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/ConcateMSA.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/ConvertMSA.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/Dir.rb +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/ExtractMarkerSeq.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/FastRoot.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/FastRoot_backup.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/GTDB_tree.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/KEGG_Luo17.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/LcaToLeaves.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/MCMCtreeR.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/MarkerRef2Tree.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/MarkerRef2Tree_backup.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/MarkerSeq2Tree.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/ModifyTopo.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/Newick_tree_plotter.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/OMA.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/OMA2.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/OneLineAln.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/PB.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/PMSF.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/PhyloBiAssoc.R +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/PhyloBiAssoc.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/PlotMCMC.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/PlotMcmcNode.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/RootTree.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/RootTreeGTDB214.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/RootTreeGTDB220.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/SequentialDating.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/SingleAleHGT.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/SingleLinePhy.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/SliceMSA.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/SplitScore.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/SplitScore1.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/SplitScore1OMA.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/SplitScore2.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/TaxaCountStats.R +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/TaxonTree.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/TreeSAK_config.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/VisHPD95.R +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/VisHPD95.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/__init__.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/ale_parser.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/ale_splitter.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/alignment_pruner.pl +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/aster.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/catfasta2phy.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/compare_trees.R +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/compare_trees.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/dating_ss.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/deltall.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/do_rrtc.rb +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/fa2phy.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/format_leaf_name.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/gap_stats.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/get_SCG_tree.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/get_arCOG_seq.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/global_functions.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/iTOL.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/keep_highest_rrtc.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/label_tree.R +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/label_tree.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/mad.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/mcmcTC.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/mcmctree.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/merge_pdf.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/pRTC.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/plot_distruibution_th.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/prep_mcmctree_ctl.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/print_leaves.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/pruneMSA.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/recode.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/rename_leaves.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/replace_clade.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/root_with_out_group.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/run_TaxaCountStats_R_s1.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/subsample_drep_gnms.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/subset.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/subset_tree_stupid_old_way.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/tmp_1.py +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK/weighted_rand.rb +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK.egg-info/SOURCES.txt +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK.egg-info/dependency_links.txt +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK.egg-info/requires.txt +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/TreeSAK.egg-info/top_level.txt +0 -0
- {TreeSAK-1.41.5 → TreeSAK-1.41.6}/setup.cfg +0 -0
- {TreeSAK-1.41.5 → 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,12 +7,12 @@ 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
|
|
|
@@ -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')
|
|
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
|
|
File without changes
|