Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyard/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
from .pyard import ARD

__author__ = """NMDP Bioinformatics"""
__version__ = '0.0.21'
__version__ = '0.0.22'
9 changes: 6 additions & 3 deletions pyard/pyard.py
Original file line number Diff line number Diff line change
Expand Up @@ -392,11 +392,14 @@ def redux(self, allele: str, ars_type: str) -> str:
:rtype: str
"""

# PERFORMANCE: precompiled regex
# dealing with leading 'HLA-'
# deal with leading 'HLA-'
if self.HLA_regex.search(allele):
hla, allele_name = allele.split("-")
return "-".join(["HLA", self.redux(allele_name, ars_type)])
redux_allele = self.redux(allele_name, ars_type)
if redux_allele:
return "HLA-" + redux_allele
else:
return redux_allele

# Alleles ending with P or G are valid
if allele.endswith(('P', 'G')):
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.0.21
current_version = 0.0.22
commit = True
tag = True

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

setup(
name='py-ard',
version='0.0.21',
version='0.0.22',
description="ARD reduction for HLA with python",
long_description=readme + '\n\n' + history,
author="CIBMTR",
Expand Down
2 changes: 2 additions & 0 deletions tests/test_pyard.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,5 @@ def test_redux_gl(self):

def test_mac_G(self):
self.assertEqual(self.ard.redux("A*01:01:01", 'G'), "A*01:01:01G")
self.assertEqual(self.ard.redux_gl("HLA-A*01:AB", "G"), "HLA-A*01:01:01G/HLA-A*01:02")
self.assertEqual(self.ard.redux("HLA-A*01:AB", "G"), "")