moose-classifier 0.13__tar.gz → 0.15__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 (79) hide show
  1. {moose_classifier-0.13/src/moose_classifier.egg-info → moose_classifier-0.15}/PKG-INFO +1 -1
  2. {moose_classifier-0.13 → moose_classifier-0.15}/src/classify.py +13 -15
  3. {moose_classifier-0.13 → moose_classifier-0.15/src/moose_classifier.egg-info}/PKG-INFO +1 -1
  4. {moose_classifier-0.13 → moose_classifier-0.15}/.github/workflows/unnittests.yml +0 -0
  5. {moose_classifier-0.13 → moose_classifier-0.15}/.gitignore +0 -0
  6. {moose_classifier-0.13 → moose_classifier-0.15}/README.md +0 -0
  7. {moose_classifier-0.13 → moose_classifier-0.15}/pyproject.toml +0 -0
  8. {moose_classifier-0.13 → moose_classifier-0.15}/requirements.txt +0 -0
  9. {moose_classifier-0.13 → moose_classifier-0.15}/setup.cfg +0 -0
  10. {moose_classifier-0.13 → moose_classifier-0.15}/sphinx/Makefile +0 -0
  11. {moose_classifier-0.13 → moose_classifier-0.15}/sphinx/classifier.rst +0 -0
  12. {moose_classifier-0.13 → moose_classifier-0.15}/sphinx/conf.py +0 -0
  13. {moose_classifier-0.13 → moose_classifier-0.15}/sphinx/index.rst +0 -0
  14. {moose_classifier-0.13 → moose_classifier-0.15}/sphinx/make.bat +0 -0
  15. {moose_classifier-0.13 → moose_classifier-0.15}/sphinx/modules.rst +0 -0
  16. {moose_classifier-0.13 → moose_classifier-0.15}/src/lineages.py +0 -0
  17. {moose_classifier-0.13 → moose_classifier-0.15}/src/moose_classifier.egg-info/SOURCES.txt +0 -0
  18. {moose_classifier-0.13 → moose_classifier-0.15}/src/moose_classifier.egg-info/dependency_links.txt +0 -0
  19. {moose_classifier-0.13 → moose_classifier-0.15}/src/moose_classifier.egg-info/entry_points.txt +0 -0
  20. {moose_classifier-0.13 → moose_classifier-0.15}/src/moose_classifier.egg-info/requires.txt +0 -0
  21. {moose_classifier-0.13 → moose_classifier-0.15}/src/moose_classifier.egg-info/top_level.txt +0 -0
  22. {moose_classifier-0.13 → moose_classifier-0.15}/src/version.py +0 -0
  23. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/blast.csv.bz2 +0 -0
  24. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/blast_3strepto.csv +0 -0
  25. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/blast_extrafields.csv.bz2 +0 -0
  26. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/map.csv.bz2 +0 -0
  27. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/map_single.csv.bz2 +0 -0
  28. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/seq_info.csv.bz2 +0 -0
  29. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/taxonomy.csv.bz2 +0 -0
  30. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test01/classifications.csv.bz2 +0 -0
  31. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test01/details.csv.bz2 +0 -0
  32. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test02/classifications.csv.bz2 +0 -0
  33. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test02/details.csv.bz2 +0 -0
  34. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test02/map_single.csv.bz2 +0 -0
  35. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test03/classifications.csv.bz2 +0 -0
  36. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test03/details.csv.bz2 +0 -0
  37. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test06/classifications.csv.bz2 +0 -0
  38. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test06/details.csv.bz2 +0 -0
  39. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test06/map.csv.bz2 +0 -0
  40. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test07/blast.csv.bz2 +0 -0
  41. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test07/classifications.csv.bz2 +0 -0
  42. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test07/details.csv.bz2 +0 -0
  43. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test07/map.csv.bz2 +0 -0
  44. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test07/seq_info.csv.bz2 +0 -0
  45. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test07/taxonomy.csv.bz2 +0 -0
  46. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test08/classifications.csv.bz2 +0 -0
  47. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test08/details.csv.bz2 +0 -0
  48. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test09/blast.csv.bz2 +0 -0
  49. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test09/classifications.csv.bz2 +0 -0
  50. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test09/details.csv.bz2 +0 -0
  51. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test09/map.csv.bz2 +0 -0
  52. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test10/classifications.csv.bz2 +0 -0
  53. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test10/details.csv.bz2 +0 -0
  54. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test11/blast.csv.bz2 +0 -0
  55. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test11/classifications.csv.bz2 +0 -0
  56. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test11/details.csv.bz2 +0 -0
  57. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test11/seq_info.csv.bz2 +0 -0
  58. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test11/taxonomy.csv.bz2 +0 -0
  59. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test12/map_single.csv.bz2 +0 -0
  60. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test13/blast.csv.bz2 +0 -0
  61. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test13/classifications.csv.bz2 +0 -0
  62. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test13/seq_info.csv.bz2 +0 -0
  63. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test13/weights.csv.bz2 +0 -0
  64. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test14/classifications.csv.bz2 +0 -0
  65. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test14/details.csv.bz2 +0 -0
  66. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test15/classifications.csv.bz2 +0 -0
  67. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test15/details.csv.bz2 +0 -0
  68. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test16/classifications.csv.bz2 +0 -0
  69. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test16/details.csv.bz2 +0 -0
  70. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test17/classifications.csv.bz2 +0 -0
  71. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test17/details.csv.bz2 +0 -0
  72. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test18/classifications.csv.bz2 +0 -0
  73. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/test18/details.csv.bz2 +0 -0
  74. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/TestClassify/weights.csv.bz2 +0 -0
  75. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/rank_thresholds.csv +0 -0
  76. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/rrnDB_16S_copy_num.csv.bz2 +0 -0
  77. {moose_classifier-0.13 → moose_classifier-0.15}/testfiles/taxonomy.csv.bz2 +0 -0
  78. {moose_classifier-0.13 → moose_classifier-0.15}/tests/__init__.py +0 -0
  79. {moose_classifier-0.13 → moose_classifier-0.15}/tests/test_classify.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: moose_classifier
3
- Version: 0.13
3
+ Version: 0.15
4
4
  Summary: Alignment based taxonomic classifier
5
5
  Author: Chris Rosenthal
6
6
  Author-email: crosenth@gmail.com
@@ -128,6 +128,7 @@ assigned tax_ids of a higher threshold that *could* represent invalid tax_ids
128
128
  TODO: generate rank thresholds based on lineages input
129
129
  """
130
130
  import argparse
131
+ import codecs
131
132
  import bz2
132
133
  import csv
133
134
  import gzip
@@ -178,11 +179,6 @@ ALIGNMENT_DTYPES = {
178
179
  'tax_name': str
179
180
  }
180
181
 
181
- ALIGNMENT_CONVERT = {
182
- 'qaccver': 'qseqid',
183
- 'saccver': 'sseqid'
184
- }
185
-
186
182
  OUTPUT_COLS = [
187
183
  'specimen', 'assignment_id', 'assignment',
188
184
  'best_rank', 'max_percent', 'min_percent',
@@ -222,9 +218,8 @@ def action(args):
222
218
  details_cols = list(DETAILS_COLS)
223
219
  if args.columns:
224
220
  header = None
225
- sep = csv.Sniffer().sniff(args.columns).delimiter
226
- conv = ALIGNMENT_CONVERT
227
- names = [conv.get(c, c) for c in args.columns.split(sep)]
221
+ sep = args.delimiter
222
+ names = args.columns.split(',')
228
223
  elif args.delimiter:
229
224
  header = 0
230
225
  sep = args.delimiter
@@ -494,7 +489,7 @@ def action(args):
494
489
  aligns[rank + '_id'] = aligns.merge(
495
490
  lineages, left_on='tax_id',
496
491
  right_index=True,
497
- how='left')[rank].fillna(0)
492
+ how='left')[rank].fillna('0')
498
493
  aligns[rank + '_name'] = aligns.merge(
499
494
  lineages,
500
495
  left_on=rank + '_id',
@@ -741,20 +736,23 @@ def build_parser():
741
736
  title='alignment input format options',
742
737
  description='Options for alignment input that is '
743
738
  'header-less or not comma-delimited')
739
+ align_parser.add_argument(
740
+ '--delimiter',
741
+ metavar='',
742
+ default=',',
743
+ type=lambda x: codecs.decode(x, 'unicode_escape'),
744
+ help='specify delimiter')
745
+
744
746
  columns_parser = align_parser.add_mutually_exclusive_group(required=False)
745
747
  columns_parser.add_argument(
746
748
  '--columns', '--header', '-c',
747
749
  dest='columns',
748
750
  metavar='',
749
- help='specify columns names with delimiter')
750
- columns_parser.add_argument(
751
- '--delimiter',
752
- metavar='',
753
- help='specify just delimiter')
751
+ help='specify comma separated column names')
754
752
  columns_parser.add_argument(
755
753
  '--blast6', '--std',
756
754
  action='store_true',
757
- help='standard blast tab-separated format')
755
+ help='standard blast tab-separated format (ignores delimiter)')
758
756
  columns_parser.add_argument(
759
757
  '--infer',
760
758
  action='store_true',
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: moose_classifier
3
- Version: 0.13
3
+ Version: 0.15
4
4
  Summary: Alignment based taxonomic classifier
5
5
  Author: Chris Rosenthal
6
6
  Author-email: crosenth@gmail.com