Skip to content

Commit

Permalink
Fix sketchlib functions in prune_db and reference_pick
Browse files Browse the repository at this point in the history
  • Loading branch information
johnlees committed Feb 10, 2020
1 parent 620aa4a commit 0bb9724
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
4 changes: 4 additions & 0 deletions PopPUNK/prune_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# import poppunk package
from .__init__ import __version__

from .sketchlib import no_sketchlib
from .sketchlib import removeFromDB

from .mash import checkMashVersion
Expand Down Expand Up @@ -135,6 +136,9 @@ def main():
args = get_options()

resketch = args.resketch
if no_sketchlib:
args.use_mash = True

if args.use_mash:
checkMashVersion(args.mash)
else:
Expand Down
8 changes: 7 additions & 1 deletion PopPUNK/reference_pick.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
# import poppunk package
from .__init__ import __version__

from .sketchlib import no_sketchlib
from .sketchlib import removeFromDB

from .mash import checkMashVersion
from .mash import createDatabaseDir
from .mash import constructDatabase
Expand Down Expand Up @@ -63,7 +66,10 @@ def main():

# Check input args ok
args = get_options()
resketch = !(args.no_resketch)
resketch = not args.no_resketch
if no_sketchlib:
args.use_mash = True

if args.use_mash:
checkMashVersion(args.mash)
else:
Expand Down

0 comments on commit 0bb9724

Please sign in to comment.