Fix regression error for MAC reduction (#152)

* Fix regression error for MAC reduction

* Check the fields only

* Bump version: 0.7.1 → 0.7.2

* Bump version: 0.7.2 → 0.7.3

Author: pbashyal-nmdp

extras/sample.csv

@@ -1,4 +1,4 @@
 nmdp_id,r_a_typ1,r_a_typ2,r_b_typ1,r_b_typ2,r_c_typ1,r_c_typ2,r_drb1_typ1,r_drb1_typ2,r_dpb1_typ1,r_dpb1_typ2
-123,A*23:71,A*29:79,B*18:67,B*51:275,C*05:01:19,C*02:85:02,DRB1*03:03,DRB1*14:144,DPB1*193:01:01,DPB1*582:01:01
+123,A*01:AB,A*29:79,B*18:67,B*51:275,C*05:01:19,C*02:85:02,DRB1*03:03,DRB1*14:144,DPB1*193:01:01,DPB1*582:01:01
 456,A*01:01:42,A*30:12:02,B*44:02:32,B*35:42,C*03:148,C*04:322,DRB1*13:01:16,DRB1*15:80N,DPB1*914:01:01,DPB1*278:01:01
 789,A*02:247,A*03:227,B*15:570,B*07:02:01:17,C*16:01:10,C*06:102,DRB1*13:156,DRB1*14:167:01,DPB1*405:01:01,DPB1*479:01:01

pyard/__init__.py

@@ -24,4 +24,4 @@
 from .pyard import ARD
 
 __author__ = """NMDP Bioinformatics"""
-__version__ = '0.7.1'
+__version__ = '0.7.3'

scripts/pyard-reduce-csv

@@ -49,7 +49,11 @@ def is_3field(allele: str) -> bool:
 
 
 def is_2field(allele: str) -> bool:
-    return len(allele.split(':')) == 2
+    if '*' in allele:
+        allele = allele.split('*')[1]
+    fields = allele.split(':')
+    # Check to see the 2 fields are digits to distinguish from MAC.
+    return len(fields) == 2 and fields[0].isdigit() and fields[1].isdigit()
 
 
 def is_P(allele: str) -> bool:

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.7.1
+current_version = 0.7.3
 commit = True
 tag = True
 

setup.py

@@ -42,7 +42,7 @@
 
 setup(
     name='py-ard',
-    version='0.7.1',
+    version='0.7.3',
     description="ARD reduction for HLA with Python",
     long_description=readme + '\n\n' + history,
     long_description_content_type="text/markdown",