Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Apr 1, 2024
1 parent 85340bc commit 2bf440b
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 16 deletions.
24 changes: 16 additions & 8 deletions tests/test_cmd_signature.py
Original file line number Diff line number Diff line change
Expand Up @@ -3362,14 +3362,22 @@ def test_sig_describe_1_hp(runtmp):
testdata = utils.get_test_data("short.fa")

# run four separate commands to make 4 different sets of sigs...
c.sourmash("sketch", "dna", "-p", "k=21,k=30,num=500",
"-o", "out.zip", testdata)
c.sourmash("sketch", "translate", "-p", "k=7,k=10,num=500",
"-o", "out.zip", testdata)
c.sourmash("sketch", "translate", "-p", "k=7,k=10,num=500,hp",
"-o", "out.zip", testdata)
c.sourmash("sketch", "translate", "-p", "k=7,k=10,num=500,dayhoff",
"-o", "out.zip", testdata)
c.sourmash("sketch", "dna", "-p", "k=21,k=30,num=500", "-o", "out.zip", testdata)
c.sourmash(
"sketch", "translate", "-p", "k=7,k=10,num=500", "-o", "out.zip", testdata
)
c.sourmash(
"sketch", "translate", "-p", "k=7,k=10,num=500,hp", "-o", "out.zip", testdata
)
c.sourmash(
"sketch",
"translate",
"-p",
"k=7,k=10,num=500,dayhoff",
"-o",
"out.zip",
testdata,
)

# then combine into one .sig file
c.sourmash("sig", "cat", "out.zip", "-o", "short.fa.sig")
Expand Down
34 changes: 26 additions & 8 deletions tests/test_sourmash.py
Original file line number Diff line number Diff line change
Expand Up @@ -1795,10 +1795,19 @@ def test_compare_choose_molecule_dna(runtmp):
testdata1 = utils.get_test_data("short.fa")
testdata2 = utils.get_test_data("short2.fa")

runtmp.sourmash("sketch", "dna", "-p", "k=30,num=500",
testdata1, testdata2, "-o", "sigs.zip")
runtmp.sourmash("sketch", "translate", "-p", "k=10,num=500",
testdata1, testdata2, "-o", "sigs.zip")
runtmp.sourmash(
"sketch", "dna", "-p", "k=30,num=500", testdata1, testdata2, "-o", "sigs.zip"
)
runtmp.sourmash(
"sketch",
"translate",
"-p",
"k=10,num=500",
testdata1,
testdata2,
"-o",
"sigs.zip",
)
runtmp.sourmash("compare", "--dna", "sigs.zip")

print(runtmp.last_result.status, runtmp.last_result.out, runtmp.last_result.err)
Expand All @@ -1810,10 +1819,19 @@ def test_compare_choose_molecule_protein(runtmp):
testdata1 = utils.get_test_data("short.fa")
testdata2 = utils.get_test_data("short2.fa")

runtmp.sourmash("sketch", "dna", "-p", "k=30,num=500",
testdata1, testdata2, "-o", "sigs.zip")
runtmp.sourmash("sketch", "translate", "-p", "k=10,num=500",
testdata1, testdata2, "-o", "sigs.zip")
runtmp.sourmash(
"sketch", "dna", "-p", "k=30,num=500", testdata1, testdata2, "-o", "sigs.zip"
)
runtmp.sourmash(
"sketch",
"translate",
"-p",
"k=10,num=500",
testdata1,
testdata2,
"-o",
"sigs.zip",
)
runtmp.sourmash("compare", "--protein", "sigs.zip")

print(runtmp.last_result.status, runtmp.last_result.out, runtmp.last_result.err)
Expand Down

0 comments on commit 2bf440b

Please sign in to comment.