TreeSAK 1.46.30__tar.gz → 1.46.32__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 (119) hide show
  1. {TreeSAK-1.46.30/TreeSAK.egg-info → TreeSAK-1.46.32}/PKG-INFO +2 -2
  2. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/PMSF.py +14 -10
  3. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/VERSION +1 -1
  4. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/iTOL.py +2 -1
  5. {TreeSAK-1.46.30 → TreeSAK-1.46.32/TreeSAK.egg-info}/PKG-INFO +2 -2
  6. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/bin/TreeSAK +8 -7
  7. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/LICENSE +0 -0
  8. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/MANIFEST.in +0 -0
  9. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/README.md +0 -0
  10. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/ALE.py +0 -0
  11. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/ALE1.py +0 -0
  12. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/ALE2.py +0 -0
  13. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/ALE2RTC.py +0 -0
  14. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/ALE3.py +0 -0
  15. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/ALE4.py +0 -0
  16. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/ALE5.py +0 -0
  17. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/ALE6.py +0 -0
  18. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/ALE7.py +0 -0
  19. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/ALE_backup.py +0 -0
  20. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/AssessCVG.py +0 -0
  21. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/AssessMarker.py +0 -0
  22. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/AssessMarkerDeltaLL.py +0 -0
  23. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/AssessMarkerPA.py +0 -0
  24. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/AssessPB.py +0 -0
  25. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/BMGE.jar +0 -0
  26. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/BMGE.py +0 -0
  27. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/CompareMCMC.py +0 -0
  28. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/ConcateMSA.py +0 -0
  29. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/ConvertMSA.py +0 -0
  30. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/Dir.rb +0 -0
  31. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/ExtractMarkerSeq.py +0 -0
  32. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/FastRoot.py +0 -0
  33. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/FastRoot_backup.py +0 -0
  34. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/FigTree.py +0 -0
  35. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/GTDB_tree.py +0 -0
  36. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/KEGG_Luo17.py +0 -0
  37. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/LcaToLeaves.py +0 -0
  38. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/MarkerRef2Tree.py +0 -0
  39. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/MarkerRef2Tree_backup.py +0 -0
  40. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/MarkerSeq2Tree.py +0 -0
  41. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/MarkerSeq2Tree_backup.py +0 -0
  42. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/ModifyTopo.py +0 -0
  43. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/Newick_tree_plotter.py +0 -0
  44. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/OMA.py +0 -0
  45. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/OMA2.py +0 -0
  46. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/OneLineAln.py +0 -0
  47. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/PB.py +0 -0
  48. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/PhyloBiAssoc.R +0 -0
  49. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/PhyloBiAssoc.py +0 -0
  50. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/PlotMCMC.py +0 -0
  51. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/PlotMcmcNode.py +0 -0
  52. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/PlotMcmcNode_old.py +0 -0
  53. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/RootTree.py +0 -0
  54. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/RootTreeGTDB214.py +0 -0
  55. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/RootTreeGTDB220.py +0 -0
  56. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/SequentialDating.py +0 -0
  57. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/SingleAleHGT.py +0 -0
  58. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/SingleLinePhy.py +0 -0
  59. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/SliceMSA.py +0 -0
  60. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/SplitScore.py +0 -0
  61. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/SplitScore1.py +0 -0
  62. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/SplitScore1OMA.py +0 -0
  63. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/SplitScore2.py +0 -0
  64. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/TaxaCountStats.R +0 -0
  65. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/TaxonTree.py +0 -0
  66. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/TreeSAK_config.py +0 -0
  67. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/VisHPD95.R +0 -0
  68. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/VisHPD95.py +0 -0
  69. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/__init__.py +0 -0
  70. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/ale_parser.py +0 -0
  71. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/ale_splitter.py +0 -0
  72. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/alignment_pruner.pl +0 -0
  73. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/assessOG.py +0 -0
  74. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/catfasta2phy.py +0 -0
  75. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/cogTree.py +0 -0
  76. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/compare_trees.R +0 -0
  77. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/compare_trees.py +0 -0
  78. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/dating.py +0 -0
  79. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/dating_ss.py +0 -0
  80. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/deltall.py +0 -0
  81. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/do_rrtc.rb +0 -0
  82. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/fa2phy.py +0 -0
  83. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/format_leaf_name.py +0 -0
  84. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/gap_stats.py +0 -0
  85. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/get_SCG_tree.py +0 -0
  86. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/get_arCOG_seq.py +0 -0
  87. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/global_functions.py +0 -0
  88. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/gnm_leaves.py +0 -0
  89. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/iTOL_gene_tree.py +0 -0
  90. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/keep_highest_rrtc.py +0 -0
  91. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/koTree.py +0 -0
  92. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/label_tree.R +0 -0
  93. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/label_tree.py +0 -0
  94. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/mad.py +0 -0
  95. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/mcmc2tree.py +0 -0
  96. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/mcmcTC.py +0 -0
  97. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/merge_pdf.py +0 -0
  98. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/pRTC.py +0 -0
  99. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/plot_distruibution_th.py +0 -0
  100. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/prep_mcmctree_ctl.py +0 -0
  101. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/print_leaves.py +0 -0
  102. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/pruneMSA.py +0 -0
  103. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/recode.py +0 -0
  104. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/remove_bias.R +0 -0
  105. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/rename_leaves.py +0 -0
  106. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/replace_clade.py +0 -0
  107. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/root_with_out_group.py +0 -0
  108. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/run_TaxaCountStats_R_s1.py +0 -0
  109. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/subsample_drep_gnms.py +0 -0
  110. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/subset.py +0 -0
  111. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/subset_tree_stupid_old_way.py +0 -0
  112. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/supertree.py +0 -0
  113. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK/weighted_rand.rb +0 -0
  114. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK.egg-info/SOURCES.txt +0 -0
  115. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK.egg-info/dependency_links.txt +0 -0
  116. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK.egg-info/requires.txt +0 -0
  117. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/TreeSAK.egg-info/top_level.txt +0 -0
  118. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/setup.cfg +0 -0
  119. {TreeSAK-1.46.30 → TreeSAK-1.46.32}/setup.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: TreeSAK
3
- Version: 1.46.30
3
+ Version: 1.46.32
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.46.30
27
+ TreeSAK v1.46.32
@@ -34,6 +34,7 @@ def PMSF(args):
34
34
  tree_prefix = args['p']
35
35
  force_overwrite = args['f']
36
36
  num_of_threads = args['t']
37
+ topo_constraint_txt = args['topo']
37
38
 
38
39
  guide_tree_wd = '%s/guide_tree' % op_dir
39
40
  pwd_guide_tree = '%s/guide_tree.treefile' % guide_tree_wd
@@ -65,6 +66,9 @@ def PMSF(args):
65
66
 
66
67
  guidetree_cmd = '%s -s %s --prefix %s/guide_tree --seqtype AA -m %s -T %s -B 1000 --alrt 1000 --quiet' % (iqtree_exe, msa_in, guide_tree_wd, iqtree_model_guide_tree, num_of_threads)
67
68
  iqtree_cmd = '%s -s %s --prefix %s/%s --seqtype AA -m %s -T %s -B 1000 --alrt 1000 --quiet -ft %s' % (iqtree_exe, msa_in, op_dir, tree_prefix, iqtree_model, num_of_threads, pwd_guide_tree)
69
+ if topo_constraint_txt is not None:
70
+ guidetree_cmd = '%s -s %s --prefix %s/guide_tree --seqtype AA -m %s -T %s -B 1000 --alrt 1000 --quiet -g %s' % (iqtree_exe, msa_in, guide_tree_wd, iqtree_model_guide_tree, num_of_threads, topo_constraint_txt)
71
+ iqtree_cmd = '%s -s %s --prefix %s/%s --seqtype AA -m %s -T %s -B 1000 --alrt 1000 --quiet -ft %s -g %s' % (iqtree_exe, msa_in, op_dir, tree_prefix, iqtree_model, num_of_threads, pwd_guide_tree, topo_constraint_txt)
68
72
 
69
73
  # write out commands
70
74
  pwd_cmd_txt_handle = open(pwd_cmd_txt, 'w')
@@ -88,14 +92,14 @@ def PMSF(args):
88
92
  if __name__ == '__main__':
89
93
 
90
94
  # initialize the options parser
91
- parser = argparse.ArgumentParser()
92
- parser.add_argument('-i', required=True, help='input MSA file')
93
- parser.add_argument('-gm', required=False, default='LG+F+G', help='iqtree model for guide tree, default: LG+F+G')
94
- parser.add_argument('-m', required=False, default='LG+C60+F+G', help='iqtree model, default: LG+C60+F+G')
95
- parser.add_argument('-o', required=True, help='output plot')
96
- parser.add_argument('-p', required=False, default='PMSF', help='tree prefix, default: PMSF')
97
- parser.add_argument('-t', required=False, type=int, default=1, help='num of threads')
98
- parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
99
- args = vars(parser.parse_args())
95
+ PMSF_parser = argparse.ArgumentParser()
96
+ PMSF_parser.add_argument('-i', required=True, help='input MSA file')
97
+ PMSF_parser.add_argument('-gm', required=False, default='LG+F+G', help='iqtree model for guide tree, default: LG+F+G')
98
+ PMSF_parser.add_argument('-m', required=False, default='LG+C60+F+G', help='iqtree model, default: LG+C60+F+G')
99
+ PMSF_parser.add_argument('-o', required=True, help='output plot')
100
+ PMSF_parser.add_argument('-p', required=False, default='PMSF', help='tree prefix, default: PMSF')
101
+ PMSF_parser.add_argument('-topo', required=False, default=None, help='topological constraint tree, pass to -g, default is None')
102
+ PMSF_parser.add_argument('-t', required=False, type=int, default=1, help='num of threads')
103
+ PMSF_parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
104
+ args = vars(PMSF_parser.parse_args())
100
105
  PMSF(args)
101
-
@@ -1,4 +1,4 @@
1
- 1.46.30
1
+ 1.46.32
2
2
  - fixed bugs
3
3
 
4
4
  1.46.0
@@ -231,8 +231,9 @@ def iTOL(args):
231
231
  FileOut_handle.write('SEPARATOR TAB\n')
232
232
  FileOut_handle.write('DATASET_LABEL\t%s\n' % LegendTitle)
233
233
  FileOut_handle.write('SHOW_LABELS\t1\n')
234
- FileOut_handle.write('SIZE_FACTOR\t3\n')
234
+ FileOut_handle.write('LABEL_SHIFT\t30\n')
235
235
  FileOut_handle.write('LABEL_ROTATION\t45\n')
236
+ FileOut_handle.write('SIZE_FACTOR\t2\n')
236
237
  FileOut_handle.write('COLOR_BRANCHES\t0\n')
237
238
 
238
239
  if ColorRange is True:
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: TreeSAK
3
- Version: 1.46.30
3
+ Version: 1.46.32
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.46.30
27
+ TreeSAK v1.46.32
@@ -375,13 +375,14 @@ if __name__ == '__main__':
375
375
  elif sys.argv[1] in ['PMSF', 'pmsf']:
376
376
  from TreeSAK import PMSF
377
377
  PMSF_parser = subparsers.add_parser('PMSF', usage=PMSF.PMSF_usage)
378
- PMSF_parser.add_argument('-i', required=True, help='input MSA file')
379
- PMSF_parser.add_argument('-gm', required=False, default='LG+F+G', help='iqtree model for guide tree, default: LG+F+G')
380
- PMSF_parser.add_argument('-m', required=False, default='LG+C60+F+G', help='iqtree model, default: LG+C60+F+G')
381
- PMSF_parser.add_argument('-o', required=True, help='output plot')
382
- PMSF_parser.add_argument('-p', required=False, default='PMSF', help='tree prefix, default: PMSF')
383
- PMSF_parser.add_argument('-t', required=False, type=int, default=1, help='num of threads')
384
- PMSF_parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
378
+ PMSF_parser.add_argument('-i', required=True, help='input MSA file')
379
+ PMSF_parser.add_argument('-gm', required=False, default='LG+F+G', help='iqtree model for guide tree, default: LG+F+G')
380
+ PMSF_parser.add_argument('-m', required=False, default='LG+C60+F+G', help='iqtree model, default: LG+C60+F+G')
381
+ PMSF_parser.add_argument('-o', required=True, help='output plot')
382
+ PMSF_parser.add_argument('-p', required=False, default='PMSF', help='tree prefix, default: PMSF')
383
+ PMSF_parser.add_argument('-topo', required=False, default=None, help='topological constraint tree, pass to -g, default is None')
384
+ PMSF_parser.add_argument('-t', required=False, type=int, default=1, help='num of threads')
385
+ PMSF_parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
385
386
  args = vars(parser.parse_args())
386
387
  PMSF.PMSF(args)
387
388
 
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