TreeSAK 1.35.0__tar.gz → 1.35.1__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 (99) hide show
  1. {TreeSAK-1.35.0/TreeSAK.egg-info → TreeSAK-1.35.1}/PKG-INFO +2 -2
  2. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/PB.py +7 -4
  3. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/SplitScore1.py +18 -26
  4. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/VERSION +1 -1
  5. {TreeSAK-1.35.0 → TreeSAK-1.35.1/TreeSAK.egg-info}/PKG-INFO +2 -2
  6. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/bin/TreeSAK +0 -1
  7. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/LICENSE +0 -0
  8. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/MANIFEST.in +0 -0
  9. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/README.md +0 -0
  10. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/ALE.py +0 -0
  11. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/ALE1.py +0 -0
  12. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/ALE2.py +0 -0
  13. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/ALE2RTC.py +0 -0
  14. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/ALE3.py +0 -0
  15. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/ALE4.py +0 -0
  16. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/ALE5.py +0 -0
  17. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/ALE6.py +0 -0
  18. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/ALE_backup.py +0 -0
  19. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/AlignmentPruner.py +0 -0
  20. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/AssessCVG.py +0 -0
  21. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/AssessMarker.py +0 -0
  22. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/AssessMarkerDeltaLL.py +0 -0
  23. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/AssessMarkerPA.py +0 -0
  24. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/AssessPB.py +0 -0
  25. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/BMGE.jar +0 -0
  26. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/BMGE.py +0 -0
  27. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/CompareMCMC.py +0 -0
  28. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/ConcateMSA.py +0 -0
  29. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/ConvertMSA.py +0 -0
  30. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/Dir.rb +0 -0
  31. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/ExtractMarkerSeq.py +0 -0
  32. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/FastRoot.py +0 -0
  33. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/FastRoot_backup.py +0 -0
  34. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/GTDB_tree.py +0 -0
  35. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/KEGG_Luo17.py +0 -0
  36. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/LcaToLeaves.py +0 -0
  37. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/MCMCtreeR.py +0 -0
  38. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/MarkerRef2Tree.py +0 -0
  39. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/MarkerRef2Tree_backup.py +0 -0
  40. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/MarkerSeq2Tree.py +0 -0
  41. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/ModifyTopo.py +0 -0
  42. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/OMA.py +0 -0
  43. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/OMA2.py +0 -0
  44. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/OneLineAln.py +0 -0
  45. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/PMSF.py +0 -0
  46. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/PhyloBiAssoc.R +0 -0
  47. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/PhyloBiAssoc.py +0 -0
  48. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/PlotMcmcNode.py +0 -0
  49. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/RootTree.py +0 -0
  50. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/RootTreeGTDB214.py +0 -0
  51. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/RootTreeGTDB220.py +0 -0
  52. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/SequentialDating.py +0 -0
  53. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/SingleAleHGT.py +0 -0
  54. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/SingleLinePhy.py +0 -0
  55. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/SliceMSA.py +0 -0
  56. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/SplitScore.py +0 -0
  57. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/SplitScore1OMA.py +0 -0
  58. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/SplitScore2.py +0 -0
  59. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/TaxaCountStats.R +0 -0
  60. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/TreeSAK_config.py +0 -0
  61. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/VisHPD95.R +0 -0
  62. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/VisHPD95.py +0 -0
  63. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/__init__.py +0 -0
  64. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/ale_parser.py +0 -0
  65. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/ale_splitter.py +0 -0
  66. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/compare_trees.R +0 -0
  67. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/compare_trees.py +0 -0
  68. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/dating.py +0 -0
  69. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/dating_ss.py +0 -0
  70. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/do_rrtc.rb +0 -0
  71. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/fa2phy.py +0 -0
  72. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/format_leaf_name.py +0 -0
  73. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/get_arCOG_seq.py +0 -0
  74. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/global_functions.py +0 -0
  75. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/merge_pdf.py +0 -0
  76. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/pRTC.py +0 -0
  77. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/parse_deltall_stdout.py +0 -0
  78. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/plot_distruibution_th.py +0 -0
  79. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/prep_mcmctree_ctl.py +0 -0
  80. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/print_leaves.py +0 -0
  81. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/rename_leaves.py +0 -0
  82. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/replace_clade.py +0 -0
  83. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/root_with_out_group.py +0 -0
  84. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/run_TaxaCountStats_R_s1.py +0 -0
  85. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/subsample_drep_gnms.py +0 -0
  86. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/subset.py +0 -0
  87. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/subset_tree_stupid_old_way.py +0 -0
  88. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/test_1.py +0 -0
  89. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/test_2.py +0 -0
  90. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/tmp_2.py +0 -0
  91. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/tmp_3.py +0 -0
  92. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/tmp_4.py +0 -0
  93. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK/weighted_rand.rb +0 -0
  94. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK.egg-info/SOURCES.txt +0 -0
  95. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK.egg-info/dependency_links.txt +0 -0
  96. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK.egg-info/requires.txt +0 -0
  97. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/TreeSAK.egg-info/top_level.txt +0 -0
  98. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/setup.cfg +0 -0
  99. {TreeSAK-1.35.0 → TreeSAK-1.35.1}/setup.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: TreeSAK
3
- Version: 1.35.0
3
+ Version: 1.35.1
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.35.0
27
+ TreeSAK v1.35.1
@@ -14,16 +14,19 @@ TreeSAK PB -i in.phylip -p chain_name -t 12
14
14
 
15
15
  # Notes:
16
16
  1. This is a wrapper for: mpirun -np 12 pb_mpi -d in.phylip -cat -gtr -x 10 -1 -dgam 4 -s chain_name
17
-
18
17
  2. Input MSA need to be in phylip format.
18
+ 3. To stop a chain, just open the <chain_name>.run file and replace the 1 by a 0 (echo 0 > <chain_name>.run).
19
+ 4. Be careful not to restart an already running chain.
20
+ 5. You can stop a chain and restart it under a different degree of parallelization.
21
+ 6. Generally, PhyloBayes provides good results for a total number of points of 10000-30000.
19
22
 
20
- 3. Settings used by Nina Dombrowski: -cat -gtr -x 10 -1 -dgam 4
23
+ * Settings used by Nina Dombrowski: -cat -gtr -x 10 -1 -dgam 4
21
24
  For each marker protein family, four parallel chains were run until convergence was reached, unless stated
22
25
  otherwise (maxdiff < 0.3; settings: bpcomp -x 25_burnin chain1 chain2 chain3 chain4). Additionally, we
23
26
  checked for the minimum effective size using tracecomp (minimum effective size > 50; settings: -x 25_burnin
24
27
  chain1 chain2 chain3 chain4).
25
-
26
- 4. Settings used by Fan Lu:
28
+
29
+ * Settings used by Fan Lu:
27
30
  Four chains were run for each consensus tree, and for each chain over 15,000 cycles (5,000 burn-in)
28
31
  were conducted, until a maxdiff value lower than 0.3 was reached. Otherwise, non-converged chains were
29
32
  continually run to over 20,000 cycles. Posterior predictive tests were conducted using PhyloBayes MPI
@@ -37,7 +37,6 @@ def SplitScore1(args):
37
37
  force_overwrite = args['f']
38
38
  num_of_js_threads = args['jst']
39
39
  op_dir = args['o']
40
- run_cmd = args['r']
41
40
 
42
41
  ################################################################################
43
42
 
@@ -89,7 +88,9 @@ def SplitScore1(args):
89
88
 
90
89
  # define file name
91
90
  qualified_og_dir = '%s/qualified_OGs' % op_dir
92
- iqtree_cmds_txt = '%s/iqtree_cmds.txt' % op_dir
91
+ cmd_1_mafft_txt = '%s/cmd_1_mafft.txt' % op_dir
92
+ cmd_2_trimal_txt = '%s/cmd_2_trimal.txt' % op_dir
93
+ cmd_3_iqtree_txt = '%s/cmd_3_iqtree.txt' % op_dir
93
94
  ignored_marker_txt = '%s/ignored_markers.txt' % op_dir
94
95
 
95
96
  # create output folder
@@ -104,11 +105,11 @@ def SplitScore1(args):
104
105
 
105
106
  ################################################################################
106
107
 
107
- iqtree_cmds_txt_handle = open(iqtree_cmds_txt, 'w')
108
- cmd_list = []
108
+ cmd_1_mafft_txt_handle = open(cmd_1_mafft_txt, 'w')
109
+ cmd_2_trimal_txt_handle = open(cmd_2_trimal_txt, 'w')
110
+ cmd_3_iqtree_txt_handle = open(cmd_3_iqtree_txt, 'w')
109
111
  ignored_og_dict = dict()
110
112
  for each_og in og_to_gene_dict:
111
-
112
113
  seq_file_in = '%s/%s.%s' % (oma_op_fasta, each_og, fasta_file_ext)
113
114
  file_out_seq = '%s/%s.%s' % (qualified_og_dir, each_og, fasta_file_ext)
114
115
  file_out_aln = '%s.aln' % each_og
@@ -138,10 +139,12 @@ def SplitScore1(args):
138
139
  trimal_cmd = 'trimal -in %s -out %s -automated1' % (file_out_aln, file_out_aln_trimmed)
139
140
  iqtree_cmd = 'iqtree2 -s %s --seqtype AA -m %s -B 1000 --wbtl --bnni --prefix %s -T %s --quiet' % (file_out_aln_trimmed, iqtree_model, each_og, num_of_js_threads)
140
141
  # Undinarchaeota illuminate DPANN phylogeny and the impact of gene transfer on archaeal evolution, settings: -m LG+G -bb 1000 -wbtl -bnni
141
- cmds_one_line = '%s; %s; %s' % (mafft_cmd, trimal_cmd, iqtree_cmd)
142
- cmd_list.append(cmds_one_line)
143
- iqtree_cmds_txt_handle.write(cmds_one_line + '\n')
144
- iqtree_cmds_txt_handle.close()
142
+ cmd_1_mafft_txt_handle.write(mafft_cmd + '\n')
143
+ cmd_2_trimal_txt_handle.write(trimal_cmd + '\n')
144
+ cmd_3_iqtree_txt_handle.write(iqtree_cmd + '\n')
145
+ cmd_1_mafft_txt_handle.close()
146
+ cmd_2_trimal_txt_handle.close()
147
+ cmd_3_iqtree_txt_handle.close()
145
148
 
146
149
  # report ignored markers
147
150
  if len(ignored_og_dict) > 0:
@@ -152,14 +155,12 @@ def SplitScore1(args):
152
155
  ignored_marker_txt_handle.write(ignored_og_dict[each_ignored_marker] + '\n')
153
156
  ignored_marker_txt_handle.close()
154
157
 
155
- # run cmds
156
- if run_cmd is True:
157
- os.chdir(qualified_og_dir)
158
- cmd_index = 1
159
- for each_cmd in cmd_list:
160
- print('running %s/%s: %s' % (cmd_index, len(cmd_list), each_cmd))
161
- os.system(each_cmd)
162
- cmd_index += 1
158
+ # report
159
+ print('You will need to execute the commands exported to the following three files before moving to SplitScore2')
160
+ print(cmd_1_mafft_txt)
161
+ print(cmd_2_trimal_txt)
162
+ print(cmd_3_iqtree_txt)
163
+ print('Done!')
163
164
 
164
165
 
165
166
  if __name__ == '__main__':
@@ -173,14 +174,5 @@ if __name__ == '__main__':
173
174
  SplitScore1_parser.add_argument('-c', required=False, type=int, default=85, help='coverage cutoff, default: 85')
174
175
  SplitScore1_parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
175
176
  SplitScore1_parser.add_argument('-jst', required=False, type=int, default=1, help='num of threads for iqtree2, default: 1')
176
- SplitScore1_parser.add_argument('-r', required=False, action="store_true", help='run commands')
177
177
  args = vars(SplitScore1_parser.parse_args())
178
178
  SplitScore1(args)
179
-
180
-
181
- '''
182
-
183
- cd /Users/songweizhi/Desktop/888
184
- /usr/local/bin/python3.7 /Users/songweizhi/PycharmProjects/TreeSAK/TreeSAK/SplitScore1.py -i marker_set_1_s03_marker_seq -x fa -o op_dir -f -jst 6
185
-
186
- '''
@@ -1,4 +1,4 @@
1
- 1.35.0
1
+ 1.35.1
2
2
  - new module added: AssessPB
3
3
 
4
4
  1.34.8
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: TreeSAK
3
- Version: 1.35.0
3
+ Version: 1.35.1
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.35.0
27
+ TreeSAK v1.35.1
@@ -407,7 +407,6 @@ if __name__ == '__main__':
407
407
  SplitScore1_parser.add_argument('-c', required=False, type=int, default=85, help='coverage cutoff, default: 85')
408
408
  SplitScore1_parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
409
409
  SplitScore1_parser.add_argument('-jst', required=False, type=int, default=1, help='num of threads for iqtree2, default: 1')
410
- SplitScore1_parser.add_argument('-r', required=False, action="store_true", help='run commands')
411
410
  args = vars(parser.parse_args())
412
411
  SplitScore1.SplitScore1(args)
413
412
 
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes