moose-classifier 0.15__tar.gz → 1.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 (89) hide show
  1. moose_classifier-1.1/.github/workflows/publish-pypi.yml +39 -0
  2. moose_classifier-0.15/.github/workflows/unnittests.yml → moose_classifier-1.1/.github/workflows/unittests.yml +4 -5
  3. {moose_classifier-0.15 → moose_classifier-1.1}/.gitignore +1 -0
  4. {moose_classifier-0.15/src/moose_classifier.egg-info → moose_classifier-1.1}/PKG-INFO +3 -1
  5. {moose_classifier-0.15 → moose_classifier-1.1}/README.md +2 -0
  6. {moose_classifier-0.15 → moose_classifier-1.1}/src/classify.py +9 -17
  7. {moose_classifier-0.15 → moose_classifier-1.1/src/moose_classifier.egg-info}/PKG-INFO +3 -1
  8. {moose_classifier-0.15 → moose_classifier-1.1}/src/moose_classifier.egg-info/SOURCES.txt +4 -1
  9. moose_classifier-1.1/src/moose_classifier.egg-info/scm_file_list.json +76 -0
  10. moose_classifier-1.1/src/moose_classifier.egg-info/scm_version.json +8 -0
  11. moose_classifier-1.1/testfiles/TestClassify/test01/details.csv.bz2 +0 -0
  12. moose_classifier-1.1/testfiles/TestClassify/test02/details.csv.bz2 +0 -0
  13. moose_classifier-1.1/testfiles/TestClassify/test03/details.csv.bz2 +0 -0
  14. moose_classifier-1.1/testfiles/TestClassify/test06/details.csv.bz2 +0 -0
  15. moose_classifier-1.1/testfiles/TestClassify/test14/details.csv.bz2 +0 -0
  16. moose_classifier-1.1/testfiles/TestClassify/test15/details.csv.bz2 +0 -0
  17. moose_classifier-1.1/testfiles/TestClassify/test16/details.csv.bz2 +0 -0
  18. moose_classifier-0.15/testfiles/TestClassify/test01/details.csv.bz2 +0 -0
  19. moose_classifier-0.15/testfiles/TestClassify/test02/details.csv.bz2 +0 -0
  20. moose_classifier-0.15/testfiles/TestClassify/test03/details.csv.bz2 +0 -0
  21. moose_classifier-0.15/testfiles/TestClassify/test06/details.csv.bz2 +0 -0
  22. moose_classifier-0.15/testfiles/TestClassify/test14/details.csv.bz2 +0 -0
  23. moose_classifier-0.15/testfiles/TestClassify/test15/details.csv.bz2 +0 -0
  24. moose_classifier-0.15/testfiles/TestClassify/test16/details.csv.bz2 +0 -0
  25. {moose_classifier-0.15 → moose_classifier-1.1}/pyproject.toml +0 -0
  26. {moose_classifier-0.15 → moose_classifier-1.1}/requirements.txt +0 -0
  27. {moose_classifier-0.15 → moose_classifier-1.1}/setup.cfg +0 -0
  28. {moose_classifier-0.15 → moose_classifier-1.1}/sphinx/Makefile +0 -0
  29. {moose_classifier-0.15 → moose_classifier-1.1}/sphinx/classifier.rst +0 -0
  30. {moose_classifier-0.15 → moose_classifier-1.1}/sphinx/conf.py +0 -0
  31. {moose_classifier-0.15 → moose_classifier-1.1}/sphinx/index.rst +0 -0
  32. {moose_classifier-0.15 → moose_classifier-1.1}/sphinx/make.bat +0 -0
  33. {moose_classifier-0.15 → moose_classifier-1.1}/sphinx/modules.rst +0 -0
  34. {moose_classifier-0.15 → moose_classifier-1.1}/src/lineages.py +0 -0
  35. {moose_classifier-0.15 → moose_classifier-1.1}/src/moose_classifier.egg-info/dependency_links.txt +0 -0
  36. {moose_classifier-0.15 → moose_classifier-1.1}/src/moose_classifier.egg-info/entry_points.txt +0 -0
  37. {moose_classifier-0.15 → moose_classifier-1.1}/src/moose_classifier.egg-info/requires.txt +0 -0
  38. {moose_classifier-0.15 → moose_classifier-1.1}/src/moose_classifier.egg-info/top_level.txt +0 -0
  39. {moose_classifier-0.15 → moose_classifier-1.1}/src/version.py +0 -0
  40. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/blast.csv.bz2 +0 -0
  41. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/blast_3strepto.csv +0 -0
  42. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/blast_extrafields.csv.bz2 +0 -0
  43. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/map.csv.bz2 +0 -0
  44. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/map_single.csv.bz2 +0 -0
  45. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/seq_info.csv.bz2 +0 -0
  46. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/taxonomy.csv.bz2 +0 -0
  47. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test01/classifications.csv.bz2 +0 -0
  48. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test02/classifications.csv.bz2 +0 -0
  49. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test02/map_single.csv.bz2 +0 -0
  50. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test03/classifications.csv.bz2 +0 -0
  51. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test06/classifications.csv.bz2 +0 -0
  52. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test06/map.csv.bz2 +0 -0
  53. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test07/blast.csv.bz2 +0 -0
  54. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test07/classifications.csv.bz2 +0 -0
  55. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test07/details.csv.bz2 +0 -0
  56. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test07/map.csv.bz2 +0 -0
  57. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test07/seq_info.csv.bz2 +0 -0
  58. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test07/taxonomy.csv.bz2 +0 -0
  59. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test08/classifications.csv.bz2 +0 -0
  60. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test08/details.csv.bz2 +0 -0
  61. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test09/blast.csv.bz2 +0 -0
  62. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test09/classifications.csv.bz2 +0 -0
  63. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test09/details.csv.bz2 +0 -0
  64. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test09/map.csv.bz2 +0 -0
  65. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test10/classifications.csv.bz2 +0 -0
  66. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test10/details.csv.bz2 +0 -0
  67. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test11/blast.csv.bz2 +0 -0
  68. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test11/classifications.csv.bz2 +0 -0
  69. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test11/details.csv.bz2 +0 -0
  70. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test11/seq_info.csv.bz2 +0 -0
  71. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test11/taxonomy.csv.bz2 +0 -0
  72. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test12/map_single.csv.bz2 +0 -0
  73. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test13/blast.csv.bz2 +0 -0
  74. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test13/classifications.csv.bz2 +0 -0
  75. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test13/seq_info.csv.bz2 +0 -0
  76. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test13/weights.csv.bz2 +0 -0
  77. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test14/classifications.csv.bz2 +0 -0
  78. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test15/classifications.csv.bz2 +0 -0
  79. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test16/classifications.csv.bz2 +0 -0
  80. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test17/classifications.csv.bz2 +0 -0
  81. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test17/details.csv.bz2 +0 -0
  82. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test18/classifications.csv.bz2 +0 -0
  83. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/test18/details.csv.bz2 +0 -0
  84. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/TestClassify/weights.csv.bz2 +0 -0
  85. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/rank_thresholds.csv +0 -0
  86. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/rrnDB_16S_copy_num.csv.bz2 +0 -0
  87. {moose_classifier-0.15 → moose_classifier-1.1}/testfiles/taxonomy.csv.bz2 +0 -0
  88. {moose_classifier-0.15 → moose_classifier-1.1}/tests/__init__.py +0 -0
  89. {moose_classifier-0.15 → moose_classifier-1.1}/tests/test_classify.py +0 -0
@@ -0,0 +1,39 @@
1
+ ---
2
+ name: Publish to PyPI
3
+
4
+ on:
5
+ release:
6
+ types: [published]
7
+ workflow_dispatch:
8
+
9
+ jobs:
10
+ test:
11
+ uses: ./.github/workflows/unittests.yml
12
+
13
+ publish:
14
+ needs: test
15
+ runs-on: ubuntu-latest
16
+ environment: pypi
17
+ permissions:
18
+ id-token: write
19
+
20
+ steps:
21
+ - name: Checkout tag
22
+ uses: actions/checkout@v4
23
+ with:
24
+ ref: ${{ github.ref }}
25
+ fetch-depth: 0
26
+
27
+ - name: Set up Python
28
+ uses: actions/setup-python@v5
29
+ with:
30
+ python-version: '3.12'
31
+
32
+ - name: Install build
33
+ run: python -m pip install build
34
+
35
+ - name: Build package
36
+ run: python -m build
37
+
38
+ - name: Publish to PyPI
39
+ uses: pypa/gh-action-pypi-publish@release/v1
@@ -5,8 +5,7 @@ on:
5
5
  branches: [ master ]
6
6
  pull_request:
7
7
  branches: [ master ]
8
- schedule:
9
- - cron: '0 6 * * 1' # 6am Monday
8
+ workflow_call:
10
9
 
11
10
  jobs:
12
11
  build:
@@ -14,14 +13,14 @@ jobs:
14
13
  strategy:
15
14
  matrix:
16
15
  os: [ubuntu-latest]
17
- python-version: ['3.12', '3.11', '3.10', '3.9']
16
+ python-version: ['3.13', '3.12', '3.11', '3.10']
18
17
  steps:
19
18
  -
20
- uses: actions/setup-python@v3
19
+ uses: actions/setup-python@v5
21
20
  with:
22
21
  python-version: ${{ matrix.python-version }}
23
22
  -
24
- uses: actions/checkout@v3
23
+ uses: actions/checkout@v4
25
24
  -
26
25
  name: Install and test
27
26
  run: |
@@ -3,3 +3,4 @@ build/
3
3
  dist
4
4
  *.egg-info
5
5
  test_output
6
+ .venv/
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: moose_classifier
3
- Version: 0.15
3
+ Version: 1.1
4
4
  Summary: Alignment based taxonomic classifier
5
5
  Author: Chris Rosenthal
6
6
  Author-email: crosenth@gmail.com
@@ -18,6 +18,8 @@ Requires-Dist: pandas>=2.0.2
18
18
 
19
19
  # moose
20
20
 
21
+ [![Unit Tests](https://github.com/crosenth/moose/actions/workflows/unittests.yml/badge.svg)](https://github.com/fhcrc/taxtastic/actions/workflows/unittests.yml)
22
+
21
23
  A tool for taxonomically selecting, grouping and summarizing pairwise
22
24
  alignment classifications into something more concise and readable.
23
25
 
@@ -1,5 +1,7 @@
1
1
  # moose
2
2
 
3
+ [![Unit Tests](https://github.com/crosenth/moose/actions/workflows/unittests.yml/badge.svg)](https://github.com/fhcrc/taxtastic/actions/workflows/unittests.yml)
4
+
3
5
  A tool for taxonomically selecting, grouping and summarizing pairwise
4
6
  alignment classifications into something more concise and readable.
5
7
 
@@ -220,10 +220,6 @@ def action(args):
220
220
  header = None
221
221
  sep = args.delimiter
222
222
  names = args.columns.split(',')
223
- elif args.delimiter:
224
- header = 0
225
- sep = args.delimiter
226
- names = None
227
223
  elif args.blast6:
228
224
  header = None
229
225
  sep = '\t'
@@ -236,7 +232,7 @@ def action(args):
236
232
  names = None
237
233
  else:
238
234
  header = 0
239
- sep = ','
235
+ sep = args.delimiter
240
236
  names = None
241
237
 
242
238
  logging.info('loading alignments ' + str(args.alignments))
@@ -506,12 +502,12 @@ def action(args):
506
502
  qseqids['assignment'] = '[no blast result]'
507
503
  qseqids['assignment_hash'] = 0
508
504
  qseqids['assignment_tax_name'] = ''
509
- qseqids['assignment_rank'] = ''
510
- qseqids['assignment_rank'] = qseqids['assignment_rank'].astype(cat_ranks)
505
+ qseqids['assignment_rank'] = pd.Categorical(
506
+ [pd.NA] * len(qseqids), dtype=cat_ranks)
511
507
  qseqids['assignment_threshold'] = numpy.nan
512
508
  qseqids['condensed_id'] = ''
513
- qseqids['condensed_rank'] = ''
514
- qseqids['condensed_rank'] = qseqids['condensed_rank'].astype(cat_ranks)
509
+ qseqids['condensed_rank'] = pd.Categorical(
510
+ [pd.NA] * len(qseqids), dtype=cat_ranks)
515
511
  qseqids['starred'] = ''
516
512
 
517
513
  # add back qseqids that have no hits back into aligns
@@ -623,7 +619,10 @@ def action(args):
623
619
  """sort details for consistency and ease of viewing.
624
620
  [no blast results] may have irregular aligns.columns
625
621
  """
626
- aligns = aligns.sort_values(by=details_cols)
622
+ aligns = aligns.sort_values(
623
+ by=['specimen', 'assignment_id', 'weight', 'pident', 'tax_name'],
624
+ ascending=[True, True, False, False, True]
625
+ )
627
626
 
628
627
  aligns.to_csv(
629
628
  args.details_out,
@@ -766,13 +765,6 @@ def build_parser():
766
765
  '--rank-thresholds',
767
766
  metavar='',
768
767
  help='Columns [tax_id,ranks...] [%(default)s]')
769
- selection_parser.add_argument(
770
- '--top-n-pct',
771
- metavar='',
772
- default=25,
773
- type=float,
774
- help=('top percent hits sorted by pident, evalue '
775
- 'or bitscore per taxonomy group'))
776
768
 
777
769
  assignment_parser = parser.add_argument_group('assignment options')
778
770
  assignment_parser.add_argument(
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: moose_classifier
3
- Version: 0.15
3
+ Version: 1.1
4
4
  Summary: Alignment based taxonomic classifier
5
5
  Author: Chris Rosenthal
6
6
  Author-email: crosenth@gmail.com
@@ -18,6 +18,8 @@ Requires-Dist: pandas>=2.0.2
18
18
 
19
19
  # moose
20
20
 
21
+ [![Unit Tests](https://github.com/crosenth/moose/actions/workflows/unittests.yml/badge.svg)](https://github.com/fhcrc/taxtastic/actions/workflows/unittests.yml)
22
+
21
23
  A tool for taxonomically selecting, grouping and summarizing pairwise
22
24
  alignment classifications into something more concise and readable.
23
25
 
@@ -2,7 +2,8 @@
2
2
  README.md
3
3
  pyproject.toml
4
4
  requirements.txt
5
- .github/workflows/unnittests.yml
5
+ .github/workflows/publish-pypi.yml
6
+ .github/workflows/unittests.yml
6
7
  sphinx/Makefile
7
8
  sphinx/classifier.rst
8
9
  sphinx/conf.py
@@ -17,6 +18,8 @@ src/moose_classifier.egg-info/SOURCES.txt
17
18
  src/moose_classifier.egg-info/dependency_links.txt
18
19
  src/moose_classifier.egg-info/entry_points.txt
19
20
  src/moose_classifier.egg-info/requires.txt
21
+ src/moose_classifier.egg-info/scm_file_list.json
22
+ src/moose_classifier.egg-info/scm_version.json
20
23
  src/moose_classifier.egg-info/top_level.txt
21
24
  testfiles/rank_thresholds.csv
22
25
  testfiles/rrnDB_16S_copy_num.csv.bz2
@@ -0,0 +1,76 @@
1
+ {
2
+ "files": [
3
+ ".github/workflows/publish-pypi.yml",
4
+ ".github/workflows/unittests.yml",
5
+ ".gitignore",
6
+ "README.md",
7
+ "pyproject.toml",
8
+ "requirements.txt",
9
+ "sphinx/Makefile",
10
+ "sphinx/classifier.rst",
11
+ "sphinx/conf.py",
12
+ "sphinx/index.rst",
13
+ "sphinx/make.bat",
14
+ "sphinx/modules.rst",
15
+ "src/classify.py",
16
+ "src/lineages.py",
17
+ "src/version.py",
18
+ "testfiles/TestClassify/blast.csv.bz2",
19
+ "testfiles/TestClassify/blast_3strepto.csv",
20
+ "testfiles/TestClassify/blast_extrafields.csv.bz2",
21
+ "testfiles/TestClassify/map.csv.bz2",
22
+ "testfiles/TestClassify/map_single.csv.bz2",
23
+ "testfiles/TestClassify/seq_info.csv.bz2",
24
+ "testfiles/TestClassify/taxonomy.csv.bz2",
25
+ "testfiles/TestClassify/test01/classifications.csv.bz2",
26
+ "testfiles/TestClassify/test01/details.csv.bz2",
27
+ "testfiles/TestClassify/test02/classifications.csv.bz2",
28
+ "testfiles/TestClassify/test02/details.csv.bz2",
29
+ "testfiles/TestClassify/test02/map_single.csv.bz2",
30
+ "testfiles/TestClassify/test03/classifications.csv.bz2",
31
+ "testfiles/TestClassify/test03/details.csv.bz2",
32
+ "testfiles/TestClassify/test06/classifications.csv.bz2",
33
+ "testfiles/TestClassify/test06/details.csv.bz2",
34
+ "testfiles/TestClassify/test06/map.csv.bz2",
35
+ "testfiles/TestClassify/test07/blast.csv.bz2",
36
+ "testfiles/TestClassify/test07/classifications.csv.bz2",
37
+ "testfiles/TestClassify/test07/details.csv.bz2",
38
+ "testfiles/TestClassify/test07/map.csv.bz2",
39
+ "testfiles/TestClassify/test07/seq_info.csv.bz2",
40
+ "testfiles/TestClassify/test07/taxonomy.csv.bz2",
41
+ "testfiles/TestClassify/test08/classifications.csv.bz2",
42
+ "testfiles/TestClassify/test08/details.csv.bz2",
43
+ "testfiles/TestClassify/test09/blast.csv.bz2",
44
+ "testfiles/TestClassify/test09/classifications.csv.bz2",
45
+ "testfiles/TestClassify/test09/details.csv.bz2",
46
+ "testfiles/TestClassify/test09/map.csv.bz2",
47
+ "testfiles/TestClassify/test10/classifications.csv.bz2",
48
+ "testfiles/TestClassify/test10/details.csv.bz2",
49
+ "testfiles/TestClassify/test11/blast.csv.bz2",
50
+ "testfiles/TestClassify/test11/classifications.csv.bz2",
51
+ "testfiles/TestClassify/test11/details.csv.bz2",
52
+ "testfiles/TestClassify/test11/seq_info.csv.bz2",
53
+ "testfiles/TestClassify/test11/taxonomy.csv.bz2",
54
+ "testfiles/TestClassify/test12/map_single.csv.bz2",
55
+ "testfiles/TestClassify/test13/blast.csv.bz2",
56
+ "testfiles/TestClassify/test13/classifications.csv.bz2",
57
+ "testfiles/TestClassify/test13/seq_info.csv.bz2",
58
+ "testfiles/TestClassify/test13/weights.csv.bz2",
59
+ "testfiles/TestClassify/test14/classifications.csv.bz2",
60
+ "testfiles/TestClassify/test14/details.csv.bz2",
61
+ "testfiles/TestClassify/test15/classifications.csv.bz2",
62
+ "testfiles/TestClassify/test15/details.csv.bz2",
63
+ "testfiles/TestClassify/test16/classifications.csv.bz2",
64
+ "testfiles/TestClassify/test16/details.csv.bz2",
65
+ "testfiles/TestClassify/test17/classifications.csv.bz2",
66
+ "testfiles/TestClassify/test17/details.csv.bz2",
67
+ "testfiles/TestClassify/test18/classifications.csv.bz2",
68
+ "testfiles/TestClassify/test18/details.csv.bz2",
69
+ "testfiles/TestClassify/weights.csv.bz2",
70
+ "testfiles/rank_thresholds.csv",
71
+ "testfiles/rrnDB_16S_copy_num.csv.bz2",
72
+ "testfiles/taxonomy.csv.bz2",
73
+ "tests/__init__.py",
74
+ "tests/test_classify.py"
75
+ ]
76
+ }
@@ -0,0 +1,8 @@
1
+ {
2
+ "tag": "1.1",
3
+ "distance": 0,
4
+ "node": "g51a0c0d9324b51eaecbf403faf35f0a70c504221",
5
+ "dirty": false,
6
+ "branch": "HEAD",
7
+ "node_date": "2026-10-02"
8
+ }