sourmash 3.x protein ksizes must be divisible by 3

sourmash/command_compute.py

@@ -57,7 +57,7 @@ def compute(args):
         if args.num_hashes != 0:
             notify('setting num_hashes to 0 because --scaled is set')
             args.num_hashes = 0
- 
+
     notify('computing signatures for files: {}', ", ".join(args.filenames))
 
     if args.randomize:
@@ -95,7 +95,7 @@ def compute(args):
                'signatures.')
         num_sigs = len(ksizes)
 
-    if (args.protein or args.dayhoff or args.hp) and not args.input_is_protein:
+    if (args.protein or args.dayhoff or args.hp):
         bad_ksizes = [ str(k) for k in ksizes if k % 3 != 0 ]
         if bad_ksizes:
             error('protein ksizes must be divisible by 3, sorry!')
@@ -236,7 +236,7 @@ def _compute_individual(args):
         siglist = []
 
     assert not siglist                    # juuuust checking.
-    
+
 
 def _compute_merged(args):
     # make minhashes for the whole file

tests/test_sourmash_compute.py

@@ -576,7 +576,7 @@ def test_do_sourmash_compute_multik_only_protein(c):
         assert 30 in ksizes
 
 
-def test_do_sourmash_compute_multik_protein_input_non_div3_ksize():
+def test_do_sourmash_compute_multik_protein_input_bad_ksize():
     with utils.TempDirectory() as location:
         testdata1 = utils.get_test_data('short-protein.fa')
         status, out, err = utils.runscript('sourmash',
@@ -587,7 +587,8 @@ def test_do_sourmash_compute_multik_protein_input_non_div3_ksize():
                                            in_directory=location,
                                            fail_ok=True)
         outfile = os.path.join(location, 'short-protein.fa.sig')
-        assert os.path.exists(outfile)
+        assert status != 0
+        assert 'protein ksizes must be divisible by 3' in err
 
 
 @utils.in_tempdir