add --name to sig intersect and sig subtract

src/sourmash/cli/sig/intersect.py

@@ -44,6 +44,7 @@ def subparser(subparsers):
         metavar="FILE",
         help="intersect with & take abundances from this signature",
     )
+    subparser.add_argument("--name", help="rename output signature")
     subparser.add_argument(
         "-f", "--force", action="store_true", help="try to load all files as signatures"
     )

src/sourmash/cli/sig/subtract.py

@@ -50,6 +50,7 @@ def subparser(subparsers):
         metavar="FILE",
         help="intersect with & take abundances from this signature",
     )
+    subparser.add_argument("--name", help="rename output signature")
     add_ksize_arg(subparser)
     add_moltype_args(subparser)
 

src/sourmash/sig/__main__.py

@@ -583,6 +583,9 @@ def intersect(args):
         intersect_mh = intersect_mh.inflate(abund_sig.minhash)
 
     intersect_sigobj = sourmash.SourmashSignature(intersect_mh)
+    if args.name:
+        intersect_sigobj.name = args.name
+
     with sourmash_args.SaveSignaturesToLocation(args.output) as save_sigs:
         save_sigs.add(intersect_sigobj)
 
@@ -704,6 +707,8 @@ def subtract(args):
         subtract_mh = subtract_mh.inflate(abund_sig.minhash)
 
     subtract_sigobj = sourmash.SourmashSignature(subtract_mh)
+    if args.name:
+        subtract_sigobj.name = args.name
 
     with sourmash_args.SaveSignaturesToLocation(args.output) as save_sigs:
         save_sigs.add(subtract_sigobj)

tests/test_cmd_signature.py

@@ -473,6 +473,28 @@ def test_sig_intersect_1(runtmp):
     assert actual_intersect_sig.minhash == test_intersect_sig.minhash
 
 
+def test_sig_intersect_1_rename(runtmp):
+    # intersect of 47 and 63 should be intersection of mins
+    sig47 = utils.get_test_data("47.fa.sig")
+    sig63 = utils.get_test_data("63.fa.sig")
+    sig47and63 = utils.get_test_data("47+63-intersect.fa.sig")
+    runtmp.run_sourmash("sig", "intersect", sig47, sig63,
+                        "--name", "footest")
+
+    # stdout should be new signature
+    out = runtmp.last_result.out
+
+    test_intersect_sig = load_one_signature_from_json(sig47and63)
+    actual_intersect_sig = load_one_signature_from_json(out)
+
+    print(test_intersect_sig.minhash)
+    print(actual_intersect_sig.minhash)
+    print(out)
+
+    assert actual_intersect_sig.minhash == test_intersect_sig.minhash
+    assert actual_intersect_sig.name == "footest"
+
+
 def test_sig_intersect_1_fromfile_picklist(runtmp):
     c = runtmp
 
@@ -793,6 +815,27 @@ def test_sig_subtract_1(runtmp):
     assert set(actual_subtract_sig.minhash.hashes.keys()) == set(mins)
 
 
+def test_sig_subtract_1_name(runtmp):
+    # subtract of 63 from 47; rename
+    sig47 = utils.get_test_data("47.fa.sig")
+    sig63 = utils.get_test_data("63.fa.sig")
+    runtmp.run_sourmash("sig", "subtract", sig47, sig63,
+                        "--name", "footest")
+
+    # stdout should be new signature
+    out = runtmp.last_result.out
+
+    test1_sig = load_one_signature_from_json(sig47)
+    test2_sig = load_one_signature_from_json(sig63)
+    actual_subtract_sig = load_one_signature_from_json(out)
+
+    mins = set(test1_sig.minhash.hashes.keys())
+    mins -= set(test2_sig.minhash.hashes.keys())
+
+    assert set(actual_subtract_sig.minhash.hashes.keys()) == set(mins)
+    assert actual_subtract_sig.name == "footest"
+
+
 def test_sig_subtract_1_sigzip(runtmp):
     c = runtmp
     # subtract of 63 from 47