Skip to content

Commit

Permalink
fix variable name bug i introduced in v0.3.13
Browse files Browse the repository at this point in the history
  • Loading branch information
Jon Palmer authored and Jon Palmer committed Dec 1, 2016
1 parent 4b0ffcb commit b633672
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
6 changes: 3 additions & 3 deletions bin/funannotate-functional.py
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,8 @@ def runIPRpython(Input):
lib.update_progress(pct)
time.sleep(10)
num_files = len(glob.glob1(IPROUT,"*.xml"))
#clean up protein fasta files
shutil.rmtree(PROTS)
else:
if os.path.isdir(args.iprscan):
IPROUT = args.iprscan
Expand All @@ -371,9 +373,7 @@ def runIPRpython(Input):
OBO = os.path.join(parentdir, 'DB', 'go.obo')
with open(GO_terms, 'w') as output:
subprocess.call([sys.executable, IPR2GO, OBO, IPROUT], stdout = output, stderr = FNULL)
#clean up input
if PROTS:
shutil.rmtree(PROTS)


#check if antiSMASH data is given, if so parse and reformat for annotations and cluster textual output
if args.antismash:
Expand Down
2 changes: 1 addition & 1 deletion funannotate.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def fmtcols(mylist, cols):
for i in range(0,num_lines))
return "\n".join(lines)

version = '0.3.13'
version = '0.3.14'

default_help = """
Usage: funannotate <command> <arguments>
Expand Down
8 changes: 8 additions & 0 deletions lib/library.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ class colr:
GRN = '\033[92m'
END = '\033[0m'
WARN = '\033[93m'

def SafeRemove(input):
if os.path.isdir(input):
shutil.rmtree(input)
elif os.path.isfile(input):
os.remove(input)
else:
return

def runSubprocess(cmd, dir, logfile):
logfile.debug(' '.join(cmd))
Expand Down

0 comments on commit b633672

Please sign in to comment.