moose-classifier 0.10__tar.gz → 0.12__tar.gz

{moose_classifier-0.10 → moose_classifier-0.12}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: moose_classifier
-Version: 0.10
+Version: 0.12
 Summary: Alignment based taxonomic classifier
 Author: Chris Rosenthal
 Author-email: crosenth@gmail.com
@@ -690,6 +690,7 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pandas>=2.0.2
+Dynamic: license-file
 
 # moose
 

{moose_classifier-0.10 → moose_classifier-0.12}/pyproject.toml

@@ -20,7 +20,7 @@ license = {file = "LICENSE"}
 name = "moose_classifier"
 readme = "README.md"
 requires-python = ">=3.7"
-version = "0.10"
+version = "0.12"
 
 [project.urls]
 repository = "https://github.com/crosenth/moose"

{moose_classifier-0.10 → moose_classifier-0.12}/src/classify.py

@@ -132,7 +132,7 @@ import bz2
 import csv
 import gzip
 import itertools
-from src import __version__, lineages
+import lineages
 import logging
 import lzma
 import math
@@ -142,6 +142,7 @@ import operator
 import os
 import sys
 import tarfile
+import version
 
 ASSIGNMENT_TAX_ID = 'assignment_tax_id'
 
@@ -411,7 +412,8 @@ def action(args):
             'threshold_level', 'assignment_level',
             'threshold_level_threshold', 'assignment_level_threshold']
         return_cols = ['assignment_threshold', 'best_hit']
-        best_hits[return_cols] = spec_group[sub_cols].apply(select_best_hits)
+        best_hits.loc[:, return_cols] = spec_group[sub_cols].apply(
+            select_best_hits)
         best_hits = best_hits[best_hits['best_hit']]
 
     if args.hits_below_threshold:
@@ -505,20 +507,16 @@ def action(args):
     qseqids['assignment_hash'] = 0
     qseqids['assignment_tax_name'] = ''
     qseqids['assignment_rank'] = ''
+    qseqids['assignment_rank'] = qseqids['assignment_rank'].astype(cat_ranks)
     qseqids['assignment_threshold'] = numpy.nan
     qseqids['condensed_id'] = ''
     qseqids['condensed_rank'] = ''
+    qseqids['condensed_rank'] = qseqids['condensed_rank'].astype(cat_ranks)
     qseqids['starred'] = ''
 
-    if aligns.empty:
-        dtypes = qseqids.dtypes
-    else:
-        dtypes = aligns.dtypes
-
     # add back qseqids that have no hits back into aligns
     if not qseqids.empty:
         aligns = pd.concat([aligns, qseqids])
-    aligns = aligns.astype(dtypes)
 
     # concludes our alignment details, on to output summary
     logging.info('summarizing output')
@@ -713,7 +711,7 @@ def build_parser():
     package_parser.add_argument(
         '-V', '--version',
         action='version',
-        version=__version__,
+        version=version.__version__,
         help='Print the version number and exit')
     package_parser.add_argument(
         '-l', '--log',

{moose_classifier-0.10 → moose_classifier-0.12}/src/moose_classifier.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: moose_classifier
-Version: 0.10
+Version: 0.12
 Summary: Alignment based taxonomic classifier
 Author: Chris Rosenthal
 Author-email: crosenth@gmail.com
@@ -690,6 +690,7 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pandas>=2.0.2
+Dynamic: license-file
 
 # moose
 

{moose_classifier-0.10 → moose_classifier-0.12}/src/moose_classifier.egg-info/SOURCES.txt

@@ -1,9 +1,9 @@
 LICENSE
 README.md
 pyproject.toml
-src/__init__.py
 src/classify.py
 src/lineages.py
+src/version.py
 src/moose_classifier.egg-info/PKG-INFO
 src/moose_classifier.egg-info/SOURCES.txt
 src/moose_classifier.egg-info/dependency_links.txt

{moose_classifier-0.10 → moose_classifier-0.12}/src/moose_classifier.egg-info/top_level.txt

@@ -1,3 +1,3 @@
-__init__
 classify
 lineages
+version

moose_classifier-0.10/src/__init__.py → moose_classifier-0.12/src/version.py

@@ -1,6 +1,6 @@
 from importlib.metadata import PackageNotFoundError, version
 
 try:
-    __version__  = version('moose-classifier')
+    __version__ = version('moose-classifier')
 except PackageNotFoundError:
     __version__ = ''

{moose_classifier-0.10 → moose_classifier-0.12}/tests/test_classify.py

@@ -1,7 +1,7 @@
 """
 Test classifier
 """
-from src import classify
+import classify
 import filecmp
 import logging
 import os