Skip to content

Commit 2f81014

Browse files
committed
happy pylint
1 parent feb7a20 commit 2f81014

File tree

3 files changed

+3
-81
lines changed

3 files changed

+3
-81
lines changed

extend.py

+1-10
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,14 @@
22
from Bio.Seq import Seq
33
from Bio.SeqIO import SeqRecord
44
from Bio.Align import MultipleSeqAlignment
5-
from glob import glob
65
import logging
7-
import tempfile
86
from pathlib import Path
97
import re
10-
import subprocess
118
from collections import namedtuple, defaultdict, Counter
129
import bisect
13-
import os
14-
from Bio.Align import substitution_matrices
15-
from itertools import product, combinations
1610
import numpy as np
17-
from Bio.AlignIO.MafIO import MafWriter, MafIterator
18-
from Bio.AlignIO.MauveIO import MauveWriter, MauveIterator
19-
from logger import logger, TqdmToLogger, MIN_TQDM_INTERVAL
2011
from tqdm import tqdm
21-
import time
12+
from logger import logger, TqdmToLogger, MIN_TQDM_INTERVAL
2213
import spoa
2314
#%%
2415

parsnp

+2-5
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,16 @@
55
66
'''
77

8-
import os, sys, string, getopt, random,subprocess, time,operator, math, datetime,numpy #pysam
8+
import os, sys, string, random, subprocess, time, operator, math, datetime, numpy #pysam
99
from collections import defaultdict
10-
import csv
1110
import shutil
1211
import shlex
1312
from tempfile import TemporaryDirectory
1413
import re
1514
import logging
1615
from logger import logger, TqdmToLogger, MIN_TQDM_INTERVAL
17-
import multiprocessing
1816
import argparse
1917
import signal
20-
import inspect
2118
from multiprocessing import Pool
2219
from Bio import SeqIO
2320
from glob import glob
@@ -149,7 +146,7 @@ def run_phipack(query,seqlen,workingdir):
149146
currdir = os.getcwd()
150147
os.chdir(workingdir)
151148
command = "Profile -o -v -n %d -w 100 -m 100 -f %s > %s.out"%(seqlen,query,query)
152-
run_command(command,1, prepend_time=True)
149+
run_command(command, 1)
153150
os.chdir(currdir)
154151

155152
def run_fasttree(query,workingdir,recombination_sites):

partition.py

-66
Original file line numberDiff line numberDiff line change
@@ -729,69 +729,3 @@ def merge_xmfas(
729729
xmfa_out_handle.write(tx.read())
730730

731731

732-
if __name__ == "__main__":
733-
args = parse_args()
734-
os.makedirs(args.output_dir, exist_ok=True)
735-
736-
query_files = list()
737-
for arg_path in args.sequences:
738-
if arg_path.endswith(".txt"):
739-
with open(arg_path) as input_list_handle:
740-
for line in input_list_handle:
741-
query_files.append(line.strip())
742-
elif any(arg_path.endswith(suff) for suff in FASTA_SUFFIX_LIST):
743-
query_files.append(arg_path)
744-
elif os.path.isdir(arg_path):
745-
for f in os.listdir(arg_path):
746-
if any(f.endswith(suff) for suff in FASTA_SUFFIX_LIST):
747-
query_files.append(f"{arg_path}/{f}")
748-
749-
full_query_list_path = f"{args.output_dir}/input-list.txt"
750-
with open(full_query_list_path, 'w') as input_list_handle:
751-
for qf in query_files:
752-
input_list_handle.write(qf + "\n")
753-
754-
partition_output_dir = f"{args.output_dir}/partition"
755-
partition_list_dir = f"{partition_output_dir}/input-lists"
756-
os.makedirs(partition_list_dir, exist_ok=True)
757-
run_command(f"split -l {args.partition_size} -a 5 --additional-suffix '.txt' {full_query_list_path} {partition_list_dir}/{CHUNK_PREFIX}-")
758-
759-
chunk_label_parser = re.compile(f'{CHUNK_PREFIX}-(.*).txt')
760-
chunk_labels = []
761-
for partition_list_file in os.listdir(partition_list_dir):
762-
chunk_labels.append(chunk_label_parser.search(partition_list_file).groups()[0])
763-
764-
parsnp_commands = []
765-
for cl in chunk_labels:
766-
chunk_output_dir = f"{partition_output_dir}/{CHUNK_PREFIX}-{cl}-out"
767-
os.makedirs(chunk_output_dir, exist_ok=True)
768-
chunk_command = f"./parsnp -d {partition_list_dir}/{CHUNK_PREFIX}-{cl}.txt -r {args.reference} -o {chunk_output_dir} "
769-
chunk_command += args.parsnp_flags
770-
chunk_command += f" > {chunk_output_dir}/parsnp.stdout 2> {chunk_output_dir}/parsnp.stderr"
771-
parsnp_commands.append(chunk_command)
772-
773-
good_chunks = set(chunk_labels)
774-
run_command_nocheck = partial(run_command, check=False)
775-
with Pool(args.threads) as pool:
776-
return_codes = tqdm(pool.imap(run_command_nocheck, parsnp_commands, chunksize=1), total=len(parsnp_commands))
777-
for cl, rc in zip(chunk_labels, return_codes):
778-
if rc != 0:
779-
logger.error("Partition {cl} failed...")
780-
good_chunks.remove(cl)
781-
782-
chunk_labels = list(good_chunks)
783-
784-
logger.info("Computing intersection of all partition LCBs...")
785-
chunk_to_intvervaldict = get_chunked_intervals(partition_output_dir, chunk_labels)
786-
intersected_interval_dict = get_intersected_intervals(chunk_to_intvervaldict)
787-
788-
logger.info("Trimming partitioned XMFAs back to intersected intervals...")
789-
num_clusters = trim_xmfas(partition_output_dir, chunk_labels, intersected_interval_dict, args.threads)
790-
791-
os.makedirs(f"{args.output_dir}/merged-out/", exist_ok=True)
792-
xmfa_out_f = f"{args.output_dir}/merged-out/parsnp.xmfa"
793-
794-
logger.info(f"Merging trimmed XMFA files into a single XMFA at {xmfa_out_f}")
795-
merge_xmfas(partition_output_dir, chunk_labels, xmfa_out_f, num_clusters, args.threads)
796-
797-

0 commit comments

Comments
 (0)