Skip to content

Commit b633672

Browse files
Jon PalmerJon Palmer
Jon Palmer
authored and
Jon Palmer
committed
fix variable name bug i introduced in v0.3.13
1 parent 4b0ffcb commit b633672

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

bin/funannotate-functional.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,8 @@ def runIPRpython(Input):
346346
lib.update_progress(pct)
347347
time.sleep(10)
348348
num_files = len(glob.glob1(IPROUT,"*.xml"))
349+
#clean up protein fasta files
350+
shutil.rmtree(PROTS)
349351
else:
350352
if os.path.isdir(args.iprscan):
351353
IPROUT = args.iprscan
@@ -371,9 +373,7 @@ def runIPRpython(Input):
371373
OBO = os.path.join(parentdir, 'DB', 'go.obo')
372374
with open(GO_terms, 'w') as output:
373375
subprocess.call([sys.executable, IPR2GO, OBO, IPROUT], stdout = output, stderr = FNULL)
374-
#clean up input
375-
if PROTS:
376-
shutil.rmtree(PROTS)
376+
377377

378378
#check if antiSMASH data is given, if so parse and reformat for annotations and cluster textual output
379379
if args.antismash:

funannotate.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def fmtcols(mylist, cols):
3131
for i in range(0,num_lines))
3232
return "\n".join(lines)
3333

34-
version = '0.3.13'
34+
version = '0.3.14'
3535

3636
default_help = """
3737
Usage: funannotate <command> <arguments>

lib/library.py

+8
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ class colr:
5555
GRN = '\033[92m'
5656
END = '\033[0m'
5757
WARN = '\033[93m'
58+
59+
def SafeRemove(input):
60+
if os.path.isdir(input):
61+
shutil.rmtree(input)
62+
elif os.path.isfile(input):
63+
os.remove(input)
64+
else:
65+
return
5866

5967
def runSubprocess(cmd, dir, logfile):
6068
logfile.debug(' '.join(cmd))

0 commit comments

Comments
 (0)