TreeSAK 1.53.2__tar.gz → 1.53.4__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 (137) hide show
  1. {treesak-1.53.2/treesak.egg-info → treesak-1.53.4}/PKG-INFO +2 -2
  2. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/VERSION +1 -1
  3. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/batch_itol.py +45 -25
  4. treesak-1.53.4/TreeSAK/tmp_5.py +12 -0
  5. {treesak-1.53.2 → treesak-1.53.4}/bin/TreeSAK +2 -1
  6. {treesak-1.53.2 → treesak-1.53.4/treesak.egg-info}/PKG-INFO +2 -2
  7. {treesak-1.53.2 → treesak-1.53.4}/treesak.egg-info/SOURCES.txt +1 -0
  8. {treesak-1.53.2 → treesak-1.53.4}/LICENSE +0 -0
  9. {treesak-1.53.2 → treesak-1.53.4}/MANIFEST.in +0 -0
  10. {treesak-1.53.2 → treesak-1.53.4}/README.md +0 -0
  11. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/ALE.py +0 -0
  12. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/ALE1.py +0 -0
  13. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/ALE2.py +0 -0
  14. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/ALE2RTC.py +0 -0
  15. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/ALE3.py +0 -0
  16. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/ALE4.py +0 -0
  17. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/ALE5.py +0 -0
  18. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/ALE6.py +0 -0
  19. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/ALE7.py +0 -0
  20. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/ALE_backup.py +0 -0
  21. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/AssessCVG.py +0 -0
  22. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/AssessMarker.py +0 -0
  23. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/AssessMarkerDeltaLL.py +0 -0
  24. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/AssessMarkerPA.py +0 -0
  25. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/AssessPB.py +0 -0
  26. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/BMGE.jar +0 -0
  27. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/BMGE.py +0 -0
  28. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/C60SR4.nex +0 -0
  29. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/CompareMCMC.py +0 -0
  30. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/ConcateMSA.py +0 -0
  31. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/ConvertMSA.py +0 -0
  32. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/Dir.rb +0 -0
  33. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/ExtractMarkerSeq.py +0 -0
  34. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/FastRoot.py +0 -0
  35. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/FastRoot_backup.py +0 -0
  36. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/FigTree.py +0 -0
  37. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/GTDB_tree.py +0 -0
  38. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/GeneTree.py +0 -0
  39. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/KEGG_Luo17.py +0 -0
  40. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/LcaToLeaves.py +0 -0
  41. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/MarkerRef2Tree.py +0 -0
  42. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/MarkerRef2Tree_backup.py +0 -0
  43. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/MarkerSeq2Tree.py +0 -0
  44. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/MarkerSeq2Tree_backup.py +0 -0
  45. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/ModifyTopo.py +0 -0
  46. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/Newick_tree_plotter.py +0 -0
  47. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/OMA.py +0 -0
  48. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/OMA2.py +0 -0
  49. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/OneLineAln.py +0 -0
  50. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/PB.py +0 -0
  51. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/PMSF.py +0 -0
  52. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/PhyloBiAssoc.R +0 -0
  53. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/PhyloBiAssoc.py +0 -0
  54. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/PlotMCMC.py +0 -0
  55. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/PlotMcmcNode.py +0 -0
  56. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/PlotMcmcNode_old.py +0 -0
  57. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/RootTree.py +0 -0
  58. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/RootTreeGTDB.py +0 -0
  59. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/RootTreeGTDB214.py +0 -0
  60. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/RootTreeGTDB220.py +0 -0
  61. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/SequentialDating.py +0 -0
  62. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/SingleAleHGT.py +0 -0
  63. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/SingleLinePhy.py +0 -0
  64. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/SliceMSA.py +0 -0
  65. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/SplitScore.py +0 -0
  66. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/SplitScore1.py +0 -0
  67. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/SplitScore1OMA.py +0 -0
  68. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/SplitScore2.py +0 -0
  69. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/TaxaCountStats.R +0 -0
  70. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/TaxonTree.py +0 -0
  71. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/TreeSAK_config.py +0 -0
  72. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/VisHPD95.R +0 -0
  73. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/VisHPD95.py +0 -0
  74. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/__init__.py +0 -0
  75. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/ale_parser.py +0 -0
  76. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/ale_splitter.py +0 -0
  77. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/alignment_pruner.pl +0 -0
  78. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/assessOG.py +0 -0
  79. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/catfasta2phy.py +0 -0
  80. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/cogTree.py +0 -0
  81. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/compare_trees.R +0 -0
  82. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/compare_trees.py +0 -0
  83. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/dating.py +0 -0
  84. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/dating_ss.py +0 -0
  85. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/deltall.py +0 -0
  86. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/do_rrtc.rb +0 -0
  87. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/fa2phy.py +0 -0
  88. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/filter_rename_ar53.py +0 -0
  89. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/format_leaf_name.py +0 -0
  90. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/gap_stats.py +0 -0
  91. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/get_SCG_tree.py +0 -0
  92. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/get_arCOG_seq.py +0 -0
  93. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/global_functions.py +0 -0
  94. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/gnm_leaves.py +0 -0
  95. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/iTOL.py +0 -0
  96. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/iTOL_gene_tree.py +0 -0
  97. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/itol_msa_stats.py +0 -0
  98. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/keep_highest_rrtc.py +0 -0
  99. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/koTree.py +0 -0
  100. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/label_gene_tree_by_gnm.py +0 -0
  101. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/label_tree.R +0 -0
  102. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/label_tree.py +0 -0
  103. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/mad.py +0 -0
  104. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/mcmc2tree.py +0 -0
  105. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/mcmcTC copy.py +0 -0
  106. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/mcmcTC.py +0 -0
  107. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/mcmctree_vs_reltime.R +0 -0
  108. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/mcmctree_vs_reltime.py +0 -0
  109. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/merge_pdf.py +0 -0
  110. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/pRTC.py +0 -0
  111. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/parse_mcmctree.py +0 -0
  112. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/parse_reltime.py +0 -0
  113. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/phy2fa.py +0 -0
  114. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/plot_distruibution_th.py +0 -0
  115. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/prep_mcmctree_ctl.py +0 -0
  116. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/print_leaves.py +0 -0
  117. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/pruneMSA.py +0 -0
  118. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/recode.py +0 -0
  119. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/remove_bias.R +0 -0
  120. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/rename_leaves.py +0 -0
  121. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/replace_clade.py +0 -0
  122. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/root_with_out_group.py +0 -0
  123. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/run_TaxaCountStats_R_s1.py +0 -0
  124. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/subsample_drep_gnms.py +0 -0
  125. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/subset.py +0 -0
  126. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/subset_tree_stupid_old_way.py +0 -0
  127. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/supertree.py +0 -0
  128. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/tmp_1.py +0 -0
  129. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/tmp_2.py +0 -0
  130. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/tmp_3.py +0 -0
  131. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/tmp_4.py +0 -0
  132. {treesak-1.53.2 → treesak-1.53.4}/TreeSAK/weighted_rand.rb +0 -0
  133. {treesak-1.53.2 → treesak-1.53.4}/setup.cfg +0 -0
  134. {treesak-1.53.2 → treesak-1.53.4}/setup.py +0 -0
  135. {treesak-1.53.2 → treesak-1.53.4}/treesak.egg-info/dependency_links.txt +0 -0
  136. {treesak-1.53.2 → treesak-1.53.4}/treesak.egg-info/requires.txt +0 -0
  137. {treesak-1.53.2 → treesak-1.53.4}/treesak.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: treesak
3
- Version: 1.53.2
3
+ Version: 1.53.4
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.53.2
27
+ TreeSAK v1.53.4
@@ -1,4 +1,4 @@
1
- 1.53.2
1
+ 1.53.4
2
2
  - fixed bugs
3
3
 
4
4
  1.53.0
@@ -8,13 +8,16 @@ from itolapi import Itol
8
8
  batch_itol_usage = '''
9
9
  ======================================= batch_itol example commands =======================================
10
10
 
11
- BioSAK batch_itol -api API_key -ip batch_access_tmp -a annotation_files.txt -i input.tree -o out.pdf
12
- BioSAK batch_itol -api API_key -ip batch_access_tmp -a annotation_files.txt -i tree_dir -x tree -o out_pdf
11
+ TreeSAK batch_itol -f -api API_key -ip batch_access_tmp -a annotation_files.txt -i input.tree -o out.pdf
12
+ TreeSAK batch_itol -f -api API_key -ip batch_access_tmp -a annotation_files.txt -i tree_dir -x tree -o out_pdf
13
13
 
14
14
  Manual
15
15
  https://github.com/albertyw/itolapi
16
16
  http://itol.embl.de/help.cgi#batch
17
17
 
18
+ # An example of the parameter file is available here
19
+ # to be added
20
+
18
21
  ===========================================================================================================
19
22
  '''
20
23
 
@@ -29,7 +32,7 @@ def sep_path_basename_ext(file_in):
29
32
  return f_name, f_path, f_base, f_ext
30
33
 
31
34
 
32
- def itol_single_tree(tree_file, annotation_files_txt, project_name, APIkey, op_plot):
35
+ def itol_single_tree(tree_file, annotation_files_txt, project_name, APIkey, parameter_dict, op_plot):
33
36
 
34
37
  annotation_file_list = []
35
38
  for each_file in open(annotation_files_txt):
@@ -62,36 +65,38 @@ def itol_single_tree(tree_file, annotation_files_txt, project_name, APIkey, op_p
62
65
  else:
63
66
  datasets_visible_str = ','.join([str(i) for i in list(range(0, len(annotation_file_list)))])
64
67
 
68
+ parameter_dict.get('', 'to be added')
69
+ parameter_dict.get('', '')
70
+
71
+
65
72
  # for a full list of options, go to https://itol.embl.de/help.cgi#batchExp
66
73
  itol_exporter = itol_uploader.get_itol_export()
67
- itol_exporter.set_export_param_value('internal_scale', '0')
74
+ itol_exporter.set_export_param_value('internal_scale', parameter_dict.get('internal_scale', '0'))
68
75
  itol_exporter.set_export_param_value('datasets_visible', datasets_visible_str)
69
- itol_exporter.set_export_param_value('display_mode', '1')
70
- itol_exporter.set_export_param_value('range_mode', '2')
71
- itol_exporter.set_export_param_value('vertical_shift_factor', '1')
72
- itol_exporter.set_export_param_value('horizontal_scale_factor', '0.9')
76
+ itol_exporter.set_export_param_value('display_mode', parameter_dict.get('display_mode', '1'))
77
+ itol_exporter.set_export_param_value('vertical_shift_factor', parameter_dict.get('vertical_shift_factor', '1'))
78
+ itol_exporter.set_export_param_value('horizontal_scale_factor', parameter_dict.get('horizontal_scale_factor', '0.9'))
73
79
 
74
80
  # range
75
- itol_exporter.set_export_param_value('range_mode', '2') # Possible values: 0,1 or 2 (0=off, 1=cover labels only, 2=cover full clades)
76
- itol_exporter.set_export_param_value('include_ranges_legend', '0')
77
- itol_exporter.set_export_param_value('ranges_legend_title', 'to be added')
81
+ itol_exporter.set_export_param_value('range_mode', parameter_dict.get('range_mode', '2')) # Possible values: 0,1 or 2 (0=off, 1=cover labels only, 2=cover full clades)
82
+ itol_exporter.set_export_param_value('include_ranges_legend', parameter_dict.get('include_ranges_legend', '0'))
78
83
 
79
84
  # label
80
85
  # itol_exporter.set_export_param_value('current_font_size', '12') # the default looks good
81
- itol_exporter.set_export_param_value('current_font_name', 'Courier')
82
- itol_exporter.set_export_param_value('default_label_color', '#000000')
86
+ itol_exporter.set_export_param_value('current_font_name', parameter_dict.get('current_font_name', 'Courier'))
87
+ itol_exporter.set_export_param_value('default_label_color', parameter_dict.get('default_label_color', '#000000'))
83
88
 
84
89
  # branch
85
- itol_exporter.set_export_param_value('line_width', '2')
86
- itol_exporter.set_export_param_value('dashed_lines', '1')
87
- itol_exporter.set_export_param_value('default_branch_color', '#000000')
90
+ itol_exporter.set_export_param_value('line_width', parameter_dict.get('line_width', '2'))
91
+ itol_exporter.set_export_param_value('dashed_lines', parameter_dict.get('dashed_lines', '1'))
92
+ itol_exporter.set_export_param_value('default_branch_color', parameter_dict.get('default_branch_color', '#000000'))
88
93
 
89
94
  # bootstrap
90
- itol_exporter.set_export_param_value('metadata_source', 'bootstrap') # Which metadata source to use for bootstrap display options
91
- itol_exporter.set_export_param_value('bootstrap_display', '1') # possible values: 0 or 1
92
- itol_exporter.set_export_param_value('bootstrap_type', '2') # Possible values: 1, 2, 3 or 4 (1=Symbol, 2=Text label, 3=Branch color and 4=Branch width)
93
- itol_exporter.set_export_param_value('bootstrap_label_size', '15') # in pixels, integer >= 9
94
- itol_exporter.set_export_param_value('bootstrap_label_percent_factor', '10') # in pixels, integer >= 9
95
+ itol_exporter.set_export_param_value('metadata_source', parameter_dict.get('metadata_source', 'bootstrap')) # Which metadata source to use for bootstrap display options
96
+ itol_exporter.set_export_param_value('bootstrap_display', parameter_dict.get('bootstrap_display', '1')) # possible values: 0 or 1
97
+ itol_exporter.set_export_param_value('bootstrap_type', parameter_dict.get('bootstrap_type', '2')) # Possible values: 1, 2, 3 or 4 (1=Symbol, 2=Text label, 3=Branch color and 4=Branch width)
98
+ itol_exporter.set_export_param_value('bootstrap_label_size', parameter_dict.get('bootstrap_label_size', '15')) # in pixels, integer >= 9
99
+ itol_exporter.set_export_param_value('bootstrap_label_percent_factor', parameter_dict.get('bootstrap_label_percent_factor', '10')) # in pixels, integer >= 9
95
100
 
96
101
  # write out
97
102
  itol_exporter.set_export_param_value('format', op_plot_ext)
@@ -107,9 +112,23 @@ def batch_itol(args):
107
112
  force_overwrite = args['f']
108
113
  API_key = args['api']
109
114
  project_name = args['ip']
115
+ para_txt = args['para']
116
+
117
+ para_dict = dict()
118
+ if para_txt is not None:
119
+ if os.path.isfile(para_txt) is False:
120
+ print('The specified parameter file does not exist, program exited!')
121
+ exit()
122
+ else:
123
+ for each_line in open(para_txt):
124
+ if not each_line.startswith('#'):
125
+ if len(each_line.strip()) > 0:
126
+ para_without_comment = each_line.strip().split('#')[0].strip()
127
+ para_without_comment_split = para_without_comment.split('\t')
128
+ para_dict[para_without_comment_split[0]] = para_without_comment_split[1]
110
129
 
111
130
  if os.path.isfile(tree_file_dir) is True:
112
- itol_single_tree(tree_file_dir, annotation_files_txt, project_name, API_key, op_file_dir)
131
+ itol_single_tree(tree_file_dir, annotation_files_txt, project_name, API_key, para_dict, op_file_dir)
113
132
  elif os.path.isdir(tree_file_dir) is True:
114
133
  file_re = '%s/*.%s' % (tree_file_dir, tree_file_ext)
115
134
  file_list = glob.glob(file_re)
@@ -127,11 +146,11 @@ def batch_itol(args):
127
146
  exit()
128
147
  os.system('mkdir %s' % op_file_dir)
129
148
 
130
- for each_file in file_list:
149
+ for each_file in sorted(file_list):
131
150
  f_name, f_path, f_base, f_ext = sep_path_basename_ext(each_file)
132
151
  op_pdf = '%s/%s.pdf' % (op_file_dir, f_base)
133
152
 
134
- itol_single_tree(each_file, annotation_files_txt, project_name, API_key, op_pdf)
153
+ itol_single_tree(each_file, annotation_files_txt, project_name, API_key, para_dict, op_pdf)
135
154
  else:
136
155
  print('please provide input file with -i, program exited!')
137
156
  exit()
@@ -142,8 +161,9 @@ if __name__ == '__main__':
142
161
  batch_itol_parser = argparse.ArgumentParser(usage=batch_itol_usage)
143
162
  batch_itol_parser.add_argument('-i', required=True, help='input tree file or folder')
144
163
  batch_itol_parser.add_argument('-x', required=False, default=None, help='file extension')
145
- batch_itol_parser.add_argument('-a', required=False, default=None, help='a txt file contain absolute to all annotation files')
146
164
  batch_itol_parser.add_argument('-o', required=True, help='output file or folder')
165
+ batch_itol_parser.add_argument('-a', required=False, default=None, help='a txt file contain absolute to all annotation files')
166
+ batch_itol_parser.add_argument('-para', required=False, default=None, help='parameter file')
147
167
  batch_itol_parser.add_argument('-api', required=True, help='iTOL API key')
148
168
  batch_itol_parser.add_argument('-ip', required=False, default='batch_access_tmp', help='iTOL project name, default: batch_access_tmp')
149
169
  batch_itol_parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
@@ -0,0 +1,12 @@
1
+
2
+ para_txt = '/Users/songweizhi/Desktop/555/batch_itol_para.txt'
3
+
4
+ para_dict = dict()
5
+ for each_line in open(para_txt):
6
+ if not each_line.startswith('#'):
7
+ if len(each_line.strip()) > 0:
8
+ para_without_comment = each_line.strip().split('#')[0].strip()
9
+ para_without_comment_split = para_without_comment.split('\t')
10
+ para_dict[para_without_comment_split[0]] = para_without_comment_split[1]
11
+
12
+ print(para_dict)
@@ -927,8 +927,9 @@ if __name__ == '__main__':
927
927
  batch_itol_parser = subparsers.add_parser('batch_itol', usage=batch_itol.batch_itol_usage)
928
928
  batch_itol_parser.add_argument('-i', required=True, help='input tree file or folder')
929
929
  batch_itol_parser.add_argument('-x', required=False, default=None, help='file extension')
930
- batch_itol_parser.add_argument('-a', required=False, default=None, help='a txt file contain absolute to all annotation files')
931
930
  batch_itol_parser.add_argument('-o', required=True, help='output file or folder')
931
+ batch_itol_parser.add_argument('-a', required=False, default=None, help='a txt file contain absolute to all annotation files')
932
+ batch_itol_parser.add_argument('-para', required=False, default=None, help='parameter file')
932
933
  batch_itol_parser.add_argument('-api', required=True, help='iTOL API key')
933
934
  batch_itol_parser.add_argument('-ip', required=False, default='batch_access_tmp', help='iTOL project name, default: batch_access_tmp')
934
935
  batch_itol_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.53.2
3
+ Version: 1.53.4
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.53.2
27
+ TreeSAK v1.53.4
@@ -125,6 +125,7 @@ TreeSAK/tmp_1.py
125
125
  TreeSAK/tmp_2.py
126
126
  TreeSAK/tmp_3.py
127
127
  TreeSAK/tmp_4.py
128
+ TreeSAK/tmp_5.py
128
129
  TreeSAK/weighted_rand.rb
129
130
  bin/TreeSAK
130
131
  treesak.egg-info/PKG-INFO
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes