diff --git a/cctyper/controller.py b/cctyper/controller.py index 0d4b5ae..c5c19aa 100644 --- a/cctyper/controller.py +++ b/cctyper/controller.py @@ -44,7 +44,7 @@ def __init__(self, args): logging.basicConfig(format='[%(asctime)s] %(levelname)s: %(message)s', datefmt='%Y-%m-%d %H:%M:%S', level=self.lvl) else: logging.basicConfig(format='\033[36m'+'[%(asctime)s] %(levelname)s:'+'\033[0m'+' %(message)s', datefmt='%Y-%m-%d %H:%M:%S', level=self.lvl) - logging.info('Running CRISPRCasTyper version 1.0.0') + logging.info('Running CRISPRCasTyper version 1.0.1') # Force consistency self.out = os.path.join(self.out, '') diff --git a/cctyper/crisprcas.py b/cctyper/crisprcas.py index 3e60b22..b121a62 100644 --- a/cctyper/crisprcas.py +++ b/cctyper/crisprcas.py @@ -80,8 +80,8 @@ def dist_ll(x,ll,ss,co): crispr_operon = crispr_sub[[x <= self.crispr_cas_dist for x in distances]] # Which CRISPRCas are spanning ends - crispr_circ_start = crispr_sub.iloc[[x <= self.crispr_cas_dist for x, y in dists if y == 'crispr_start'],:] - crispr_circ_end = crispr_sub.iloc[[x <= self.crispr_cas_dist for x, y in dists if y == 'crispr_end'],:] + crispr_circ_start = crispr_sub.iloc[[x <= self.crispr_cas_dist and y == 'crispr_start' for x, y in dists],:] + crispr_circ_end = crispr_sub.iloc[[x <= self.crispr_cas_dist and y == 'crispr_end' for x, y in dists],:] if len(crispr_circ_start) > 0: self.cc_circ_start[operon] = list(crispr_circ_start['CRISPR']) diff --git a/setup.py b/setup.py index 1ff0d9a..91fe28b 100644 --- a/setup.py +++ b/setup.py @@ -5,14 +5,14 @@ setuptools.setup( name="cctyper", - version="1.0.0", + version="1.0.1", author="Jakob Russel", author_email="russel2620@gmail.com", description="CRISPRCasTyper: Automatic detection and subtyping of CRISPR-Cas operons", long_description=long_description, long_description_content_type="text/markdown", url="https://github.com/Russel88/CRISPRCasTyper", - download_url="https://github.com/Russel88/CRISPRCasTyper/archive/v1.0.0.tar.gz", + download_url="https://github.com/Russel88/CRISPRCasTyper/archive/v1.0.1.tar.gz", packages=setuptools.find_packages(), classifiers=[ "Programming Language :: Python :: 3",