Merge pull request #479 from WrightonLabCSU/bugfix/info-sheet-A_rank-fix

Bugfix/info sheet a rank fix

Author: madeline-scyphers

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+## 2.0.0-beta22 - 2025-12-17
+
+[64da24e](https://github.com/WrightonLabCSU/DRAM/commit/64da24e51367feaffe2f643dfbb0aa602e28c5c5)...[0933424](https://github.com/WrightonLabCSU/DRAM/commit/093342450e6e49c1a706cdf2c181bd931bab7a6d)
+
+### Bug Fixes
+
+- A_rank from info sheet for hmm parse now parse properly ([0933424](https://github.com/WrightonLabCSU/DRAM/commit/093342450e6e49c1a706cdf2c181bd931bab7a6d))
+
+
+
 ## 2.0.0-beta21 - 2025-12-15
 
 [3648a77](https://github.com/WrightonLabCSU/DRAM/commit/3648a77ee93cb0e5c72dee5cf3d1b6b4a38a834e)...[1106003](https://github.com/WrightonLabCSU/DRAM/commit/1106003daaab6bea519132c5232cf62c54be2a9b)

bin/hmm_parser.py

@@ -123,7 +123,7 @@ def main(hmm_domtbl, hmm_info_path, ec_from_info, gene_locs, db_name, output):
                 print(f"Error reading HMM info file: {e}\n{e2}")
                 hmm_sheet = False
     if hmm_sheet and not hmm_info.empty:
-        merge_cols = ['score_type', 'threshold', f"{db_name}_EC", "description"]
+        merge_cols = ['score_type', 'threshold', f"{db_name}_EC", "description", "A_rank", "B_rank"]
         raise_on_ec = False
         if "description" in hmm_info.columns:
             pass
@@ -143,7 +143,8 @@ def main(hmm_domtbl, hmm_info_path, ec_from_info, gene_locs, db_name, output):
 
         hits = hits.merge(hmm_info[merge_cols], how='left', left_on="query_name", right_index=True)
         hits_sig = sig_scores_row_by_row(hits, db_name=db_name)
-        hits_sig = hits_sig.drop(columns=['score_type', 'threshold'])
+        drop_cols = [col for col in merge_cols if col in hits_sig.columns and col not in [f"{db_name}_EC", "description",]]
+        hits_sig = hits_sig.drop(columns=drop_cols)
     else:
         hits_sig = hits[hits["perc_cov"] >= 0.35]
 

nextflow.config

@@ -478,7 +478,7 @@ manifest {
     mainScript      = 'main.nf'
     defaultBranch   = 'master'
     nextflowVersion = '!>=24'
-    version         = '2.0.0-beta21'
+    version         = '2.0.0-beta22'
     doi             = ''
 }