TreeSAK 1.34.1__tar.gz → 1.34.2__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 (98) hide show
  1. {TreeSAK-1.34.1/TreeSAK.egg-info → TreeSAK-1.34.2}/PKG-INFO +2 -2
  2. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/MarkerRef2Tree.py +2 -2
  3. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/PB.py +12 -22
  4. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/VERSION +1 -1
  5. {TreeSAK-1.34.1 → TreeSAK-1.34.2/TreeSAK.egg-info}/PKG-INFO +2 -2
  6. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/LICENSE +0 -0
  7. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/MANIFEST.in +0 -0
  8. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/README.md +0 -0
  9. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/ALE.py +0 -0
  10. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/ALE1.py +0 -0
  11. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/ALE2.py +0 -0
  12. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/ALE2RTC.py +0 -0
  13. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/ALE3.py +0 -0
  14. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/ALE4.py +0 -0
  15. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/ALE5.py +0 -0
  16. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/ALE6.py +0 -0
  17. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/ALE_backup.py +0 -0
  18. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/AlignmentPruner.py +0 -0
  19. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/AssessCVG.py +0 -0
  20. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/AssessMarker.py +0 -0
  21. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/AssessMarkerDeltaLL.py +0 -0
  22. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/AssessMarkerPA.py +0 -0
  23. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/BMGE.jar +0 -0
  24. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/BMGE.py +0 -0
  25. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/CompareMCMC.py +0 -0
  26. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/ConcateMSA.py +0 -0
  27. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/ConvertMSA.py +0 -0
  28. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/Dir.rb +0 -0
  29. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/ExtractMarkerSeq.py +0 -0
  30. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/FastRoot.py +0 -0
  31. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/FastRoot_backup.py +0 -0
  32. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/GTDB_tree.py +0 -0
  33. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/KEGG_Luo17.py +0 -0
  34. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/LcaToLeaves.py +0 -0
  35. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/MCMCtreeR.py +0 -0
  36. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/MarkerRef2Tree_backup.py +0 -0
  37. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/MarkerSeq2Tree.py +0 -0
  38. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/ModifyTopo.py +0 -0
  39. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/OMA.py +0 -0
  40. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/OMA2.py +0 -0
  41. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/OneLineAln.py +0 -0
  42. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/PMSF.py +0 -0
  43. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/PhyloBiAssoc.R +0 -0
  44. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/PhyloBiAssoc.py +0 -0
  45. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/PlotMcmcNode.py +0 -0
  46. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/RootTree.py +0 -0
  47. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/RootTreeGTDB214.py +0 -0
  48. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/RootTreeGTDB220.py +0 -0
  49. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/SequentialDating.py +0 -0
  50. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/SingleAleHGT.py +0 -0
  51. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/SingleLinePhy.py +0 -0
  52. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/SliceMSA.py +0 -0
  53. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/SplitScore.py +0 -0
  54. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/SplitScore1.py +0 -0
  55. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/SplitScore1OMA.py +0 -0
  56. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/SplitScore2.py +0 -0
  57. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/TaxaCountStats.R +0 -0
  58. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/TreeSAK_config.py +0 -0
  59. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/VisHPD95.R +0 -0
  60. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/VisHPD95.py +0 -0
  61. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/__init__.py +0 -0
  62. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/ale_parser.py +0 -0
  63. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/ale_splitter.py +0 -0
  64. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/compare_trees.R +0 -0
  65. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/compare_trees.py +0 -0
  66. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/dating.py +0 -0
  67. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/dating_ss.py +0 -0
  68. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/do_rrtc.rb +0 -0
  69. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/fa2phy.py +0 -0
  70. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/format_leaf_name.py +0 -0
  71. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/get_arCOG_seq.py +0 -0
  72. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/global_functions.py +0 -0
  73. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/merge_pdf.py +0 -0
  74. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/pRTC.py +0 -0
  75. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/parse_deltall_stdout.py +0 -0
  76. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/plot_distruibution_th.py +0 -0
  77. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/prep_mcmctree_ctl.py +0 -0
  78. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/print_leaves.py +0 -0
  79. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/rename_leaves.py +0 -0
  80. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/replace_clade.py +0 -0
  81. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/root_with_out_group.py +0 -0
  82. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/run_TaxaCountStats_R_s1.py +0 -0
  83. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/subsample_drep_gnms.py +0 -0
  84. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/subset.py +0 -0
  85. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/subset_tree_stupid_old_way.py +0 -0
  86. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/test_1.py +0 -0
  87. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/test_2.py +0 -0
  88. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/tmp_2.py +0 -0
  89. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/tmp_3.py +0 -0
  90. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/tmp_4.py +0 -0
  91. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK/weighted_rand.rb +0 -0
  92. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK.egg-info/SOURCES.txt +0 -0
  93. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK.egg-info/dependency_links.txt +0 -0
  94. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK.egg-info/requires.txt +0 -0
  95. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/TreeSAK.egg-info/top_level.txt +0 -0
  96. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/bin/TreeSAK +0 -0
  97. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/setup.cfg +0 -0
  98. {TreeSAK-1.34.1 → TreeSAK-1.34.2}/setup.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: TreeSAK
3
- Version: 1.34.1
3
+ Version: 1.34.2
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.34.1
27
+ TreeSAK v1.34.2
@@ -13,8 +13,8 @@ MarkerRef2Tree_usage = '''
13
13
  Dependencies: blastp, mafft-einsi, trimal, iqtree2
14
14
 
15
15
  # example commands
16
- TreeSAK MarkerRef2Tree -i gnm_faa_files -x faa -m marker_seq -mx fa -o output_dir -e 10 -t 6 -c 85
17
- TreeSAK MarkerRef2Tree -i gnm_faa_files -x faa -m marker_seq -mx fa -o output_dir -e 10 -t 6 -c 75,100
16
+ TreeSAK MarkerRef2Tree -i faa_files -x faa -m marker_seq -mx fa -o output_dir -e 10 -t 6 -c 85
17
+ TreeSAK MarkerRef2Tree -i faa_files -x faa -m marker_seq -mx fa -o output_dir -e 10 -t 6 -c 75,100
18
18
 
19
19
  # file extension need to be faa
20
20
 
@@ -52,13 +52,12 @@ def fa2phy(fasta_in, phy_out):
52
52
 
53
53
  def PB(args):
54
54
 
55
- msa_in = args['i']
56
- op_prefix = args['p']
57
- fa_to_plp = args['fa2plp']
58
- num_of_threads = args['t']
55
+ msa_in = args['i']
56
+ op_prefix = args['p']
57
+ fa_to_plp = args['fa2plp']
58
+ num_of_threads = args['t']
59
59
 
60
60
  settings_dombrowski = '-cat -gtr -x 10 -1 -dgam 4'
61
- settings_fan = ''
62
61
 
63
62
  msa_to_use = msa_in
64
63
  if fa_to_plp is True:
@@ -66,15 +65,16 @@ def PB(args):
66
65
  fa2phy(msa_in, msa_in_plp)
67
66
  msa_to_use = msa_in_plp
68
67
 
69
- pb_mpi_cmd = 'mpirun -np %s pb_mpi -d %s %s -s %s' % (num_of_threads, msa_to_use, settings_dombrowski, op_prefix)
68
+ pb_mpi_cmd = 'mpirun -np %s pb_mpi -d %s %s -s %s' % (num_of_threads, msa_to_use, settings_dombrowski, op_prefix)
69
+ readpb_cmd = ''
70
+ bpcomp_cmd = ''
71
+
72
+ print('Running pb_mpi with %s threads' % (pb_mpi_cmd, num_of_threads))
70
73
  print(pb_mpi_cmd)
71
74
  os.system(pb_mpi_cmd)
72
75
 
73
- readpb_cmd = ''
74
- print(readpb_cmd)
75
-
76
- bpcomp_cmd = ''
77
- print(bpcomp_cmd)
76
+ # print(readpb_cmd)
77
+ # print(bpcomp_cmd)
78
78
 
79
79
 
80
80
  if __name__ == '__main__':
@@ -83,16 +83,6 @@ if __name__ == '__main__':
83
83
  parser.add_argument('-i', required=True, help='input MSA file')
84
84
  parser.add_argument('-p', required=True, help='output prefix')
85
85
  parser.add_argument('-fa2plp', required=False, action="store_true", help='convert MSA format from fasta to phylip')
86
- parser.add_argument('-t', required=False, type=int, default=2, help='num of threads')
86
+ parser.add_argument('-t', required=False, type=int, default=1, help='num of threads, default: 1')
87
87
  args = vars(parser.parse_args())
88
88
  PB(args)
89
-
90
-
91
- '''
92
-
93
- export OMPI_MCA_btl=^openib
94
- cd /scratch/PI/ocessongwz/Sponge_2023_12_01/MarkerRef2Tree_marker_set_4/s08_iqtree_wd/pb_test
95
- mpirun -np 12 pb_mpi -d marker_pa85_pruner0.BMGE.phylip -cat -gtr -x 10 -1 -dgam 4 -s chain_test
96
-
97
- '''
98
-
@@ -1,4 +1,4 @@
1
- 1.34.1
1
+ 1.34.2
2
2
  - fixed bugs
3
3
 
4
4
  1.34.0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: TreeSAK
3
- Version: 1.34.1
3
+ Version: 1.34.2
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.34.1
27
+ TreeSAK v1.34.2
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes