diff --git a/Dockerfile b/Dockerfile index 0b57f92..a64e552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,7 @@ WORKDIR /app ADD . /app RUN apt-get update \ - && apt-get install gcc g++ zlib1g-dev -y \ + && apt-get install gcc g++ make procps libbz2-dev liblzma-dev libcurl4-openssl-dev libncurses5-dev zlib1g-dev locales locales-all -y --no-install-recommends \ + && pip install cython==0.29.36 \ && pip install -r requirements.txt \ && pip install . diff --git a/biometrics/cluster.py b/biometrics/cluster.py index 8dae9db..616022e 100644 --- a/biometrics/cluster.py +++ b/biometrics/cluster.py @@ -44,7 +44,10 @@ def cluster(self, comparisons): max_occurence = occurences.most_common() max_occurence_val = max_occurence[0][1] most_common_group = list(filter(lambda x: x[1] == max_occurence_val, max_occurence)) - most_common_group = ':'.join([i[0] for i in most_common_group]) + most_common_group = ':'.join( + str(k) if not isinstance(k, (tuple, list)) else ':'.join(map(str, k)) + for k, _ in most_common_group + ) for i, sample in enumerate(samples_in_group): diff --git a/setup.cfg b/setup.cfg index 74cb692..7a4d178 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.16 +current_version = 0.2.17 commit = True tag = True