TreeSAK 1.47.1__tar.gz → 1.47.3__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 (122) hide show
  1. {TreeSAK-1.47.1/TreeSAK.egg-info → TreeSAK-1.47.3}/PKG-INFO +2 -2
  2. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/GeneTree.py +16 -11
  3. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/VERSION +1 -1
  4. {TreeSAK-1.47.1 → TreeSAK-1.47.3/TreeSAK.egg-info}/PKG-INFO +2 -2
  5. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/LICENSE +0 -0
  6. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/MANIFEST.in +0 -0
  7. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/README.md +0 -0
  8. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/ALE.py +0 -0
  9. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/ALE1.py +0 -0
  10. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/ALE2.py +0 -0
  11. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/ALE2RTC.py +0 -0
  12. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/ALE3.py +0 -0
  13. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/ALE4.py +0 -0
  14. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/ALE5.py +0 -0
  15. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/ALE6.py +0 -0
  16. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/ALE7.py +0 -0
  17. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/ALE_backup.py +0 -0
  18. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/AssessCVG.py +0 -0
  19. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/AssessMarker.py +0 -0
  20. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/AssessMarkerDeltaLL.py +0 -0
  21. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/AssessMarkerPA.py +0 -0
  22. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/AssessPB.py +0 -0
  23. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/BMGE.jar +0 -0
  24. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/BMGE.py +0 -0
  25. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/CompareMCMC.py +0 -0
  26. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/ConcateMSA.py +0 -0
  27. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/ConvertMSA.py +0 -0
  28. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/Dir.rb +0 -0
  29. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/ExtractMarkerSeq.py +0 -0
  30. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/FastRoot.py +0 -0
  31. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/FastRoot_backup.py +0 -0
  32. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/FigTree.py +0 -0
  33. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/GTDB_tree.py +0 -0
  34. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/KEGG_Luo17.py +0 -0
  35. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/LcaToLeaves.py +0 -0
  36. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/MarkerRef2Tree.py +0 -0
  37. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/MarkerRef2Tree_backup.py +0 -0
  38. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/MarkerSeq2Tree.py +0 -0
  39. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/MarkerSeq2Tree_backup.py +0 -0
  40. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/ModifyTopo.py +0 -0
  41. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/Newick_tree_plotter.py +0 -0
  42. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/OMA.py +0 -0
  43. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/OMA2.py +0 -0
  44. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/OneLineAln.py +0 -0
  45. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/PB.py +0 -0
  46. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/PMSF.py +0 -0
  47. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/PhyloBiAssoc.R +0 -0
  48. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/PhyloBiAssoc.py +0 -0
  49. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/PlotMCMC.py +0 -0
  50. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/PlotMcmcNode.py +0 -0
  51. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/PlotMcmcNode_old.py +0 -0
  52. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/RootTree.py +0 -0
  53. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/RootTreeGTDB214.py +0 -0
  54. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/RootTreeGTDB220.py +0 -0
  55. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/SequentialDating.py +0 -0
  56. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/SingleAleHGT.py +0 -0
  57. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/SingleLinePhy.py +0 -0
  58. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/SliceMSA.py +0 -0
  59. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/SplitScore.py +0 -0
  60. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/SplitScore1.py +0 -0
  61. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/SplitScore1OMA.py +0 -0
  62. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/SplitScore2.py +0 -0
  63. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/TaxaCountStats.R +0 -0
  64. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/TaxonTree.py +0 -0
  65. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/TreeSAK_config.py +0 -0
  66. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/VisHPD95.R +0 -0
  67. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/VisHPD95.py +0 -0
  68. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/__init__.py +0 -0
  69. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/ale_parser.py +0 -0
  70. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/ale_splitter.py +0 -0
  71. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/alignment_pruner.pl +0 -0
  72. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/assessOG.py +0 -0
  73. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/catfasta2phy.py +0 -0
  74. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/cogTree.py +0 -0
  75. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/compare_trees.R +0 -0
  76. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/compare_trees.py +0 -0
  77. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/dating.py +0 -0
  78. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/dating_ss.py +0 -0
  79. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/deltall.py +0 -0
  80. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/do_rrtc.rb +0 -0
  81. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/fa2phy.py +0 -0
  82. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/format_leaf_name.py +0 -0
  83. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/gap_stats.py +0 -0
  84. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/get_SCG_tree.py +0 -0
  85. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/get_arCOG_seq.py +0 -0
  86. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/global_functions.py +0 -0
  87. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/gnm_leaves.py +0 -0
  88. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/iTOL.py +0 -0
  89. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/iTOL_gene_tree.py +0 -0
  90. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/keep_highest_rrtc.py +0 -0
  91. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/koTree.py +0 -0
  92. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/label_tree.R +0 -0
  93. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/label_tree.py +0 -0
  94. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/mad.py +0 -0
  95. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/mcmc2tree.py +0 -0
  96. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/mcmcTC copy.py +0 -0
  97. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/mcmcTC.py +0 -0
  98. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/merge_pdf.py +0 -0
  99. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/pRTC.py +0 -0
  100. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/phy2fa.py +0 -0
  101. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/plot_distruibution_th.py +0 -0
  102. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/prep_mcmctree_ctl.py +0 -0
  103. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/print_leaves.py +0 -0
  104. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/pruneMSA.py +0 -0
  105. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/recode.py +0 -0
  106. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/remove_bias.R +0 -0
  107. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/rename_leaves.py +0 -0
  108. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/replace_clade.py +0 -0
  109. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/root_with_out_group.py +0 -0
  110. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/run_TaxaCountStats_R_s1.py +0 -0
  111. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/subsample_drep_gnms.py +0 -0
  112. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/subset.py +0 -0
  113. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/subset_tree_stupid_old_way.py +0 -0
  114. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/supertree.py +0 -0
  115. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK/weighted_rand.rb +0 -0
  116. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK.egg-info/SOURCES.txt +0 -0
  117. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK.egg-info/dependency_links.txt +0 -0
  118. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK.egg-info/requires.txt +0 -0
  119. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/TreeSAK.egg-info/top_level.txt +0 -0
  120. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/bin/TreeSAK +0 -0
  121. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/setup.cfg +0 -0
  122. {TreeSAK-1.47.1 → TreeSAK-1.47.3}/setup.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: TreeSAK
3
- Version: 1.47.1
3
+ Version: 1.47.3
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.47.1
27
+ TreeSAK v1.47.3
@@ -45,7 +45,6 @@ def GeneTree(args):
45
45
  bmge_trim_model = args['bmge_m']
46
46
  bmge_entropy_score_cutoff = args['bmge_esc']
47
47
 
48
-
49
48
  # check dependencies
50
49
  check_dependencies(['java', 'mafft-einsi'])
51
50
 
@@ -53,12 +52,6 @@ def GeneTree(args):
53
52
  current_file_path = '/'.join(os.path.realpath(__file__).split('/')[:-1])
54
53
  pwd_bmge_jar = '%s/BMGE.jar' % current_file_path
55
54
 
56
- # define output file name
57
- sep_file_path, sep_file_base, sep_file_ext = sep_path_basename_ext(seq_file)
58
- get_gene_tree_cmds_txt = '%s/cmds.txt' % op_dir
59
- msa_file = '%s/%s.aln' % (op_dir, sep_file_base)
60
- msa_file_bmge = '%s/%s.BMGE.aln' % (op_dir, sep_file_base)
61
-
62
55
  # determine the version of iqtree available on the system
63
56
  if find_executable('iqtree2'):
64
57
  iqtree_exe = 'iqtree2'
@@ -77,28 +70,40 @@ def GeneTree(args):
77
70
  exit()
78
71
  os.system('mkdir %s' % op_dir)
79
72
 
80
- # prepare commands
81
- mafft_cmd = 'mafft-einsi --thread %s --quiet %s > %s/%s' % (num_threads, seq_file, op_dir, msa_file)
82
- trim_cmd = 'java -jar %s -i %s/%s -m %s -t AA -h %s -of %s/%s' % (pwd_bmge_jar, op_dir, msa_file, bmge_trim_model, bmge_entropy_score_cutoff, op_dir, msa_file_bmge)
73
+ ######################################## define output file name ########################################
74
+
75
+ sep_file_path, sep_file_base, sep_file_ext = sep_path_basename_ext(seq_file)
76
+ get_gene_tree_cmds_txt = '%s/cmds.txt' % op_dir
77
+ msa_file = '%s/%s.aln' % (op_dir, sep_file_base)
78
+ msa_file_bmge = '%s/%s.bmge.aln' % (op_dir, sep_file_base)
83
79
 
84
80
  msa_for_iqtree = msa_file
85
81
  if trim_with_bmge is True:
86
82
  msa_for_iqtree = msa_file_bmge
87
83
 
88
- iqtree_cmd = '%s -m LG+G+I -bb 1000 --wbtl -nt %s -s %s/%s -pre %s' % (iqtree_exe, num_threads, op_dir, msa_for_iqtree, sep_file_base)
84
+ #########################################################################################################
85
+
86
+ # prepare commands
87
+ mafft_cmd = 'mafft-einsi --thread %s --quiet %s > %s' % (num_threads, seq_file, msa_file)
88
+ trim_cmd = 'java -jar %s -i %s -m %s -t AA -h %s -of %s' % (pwd_bmge_jar, msa_file, bmge_trim_model, bmge_entropy_score_cutoff, msa_file_bmge)
89
+ iqtree_cmd = '%s -m LG+G+I -bb 1000 --wbtl -nt %s -s %s -pre %s/%s' % (iqtree_exe, num_threads, msa_for_iqtree, op_dir, sep_file_base)
89
90
 
91
+ # write out commands
90
92
  with open(get_gene_tree_cmds_txt, 'w') as f:
91
93
  if trim_with_bmge is True:
92
94
  f.write('%s\n%s\n%s\n' % (mafft_cmd, trim_cmd, iqtree_cmd))
93
95
  else:
94
96
  f.write('%s\n%s\n' % (mafft_cmd, iqtree_cmd))
95
97
 
98
+ # run mafft
96
99
  print(mafft_cmd)
97
100
  os.system(mafft_cmd)
98
101
 
102
+ # run BMGE
99
103
  print(trim_cmd)
100
104
  os.system(trim_cmd)
101
105
 
106
+ # run iqtree
102
107
  print(iqtree_cmd)
103
108
  os.system(iqtree_cmd)
104
109
 
@@ -1,4 +1,4 @@
1
- 1.47.1
1
+ 1.47.3
2
2
  - fixed bugs
3
3
 
4
4
  1.47.0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: TreeSAK
3
- Version: 1.47.1
3
+ Version: 1.47.3
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.47.1
27
+ TreeSAK v1.47.3
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes