From 609b2a1aa9ca72291337abf6fd13b2eba18b0c55 Mon Sep 17 00:00:00 2001 From: "C. Titus Brown" Date: Sat, 11 Jan 2025 09:05:46 -0800 Subject: [PATCH] MRG: update to sourmash v4.8.13 (python package) (#583) * print out sourmash version * MRG: update to require sourmash v4.8.13 * upd --- environment.yml | 2 +- pyproject.toml | 2 +- src/python/tests/test_sketch.py | 12 ++---------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/environment.yml b/environment.yml index eb9f21a1..1033f0b9 100644 --- a/environment.yml +++ b/environment.yml @@ -4,7 +4,7 @@ channels: - bioconda - defaults dependencies: - - sourmash>=4.8.3,<5 + - sourmash>=4.8.13,<5 - pip - rust - maturin>=1,<2 diff --git a/pyproject.toml b/pyproject.toml index b191c9f6..410b524a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ classifiers = [ "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", ] -dependencies = ["sourmash>=4.8.10,<5"] +dependencies = ["sourmash>=4.8.13,<5"] authors = [ { name="N. Tessa Pierce-Ward", orcid="0000-0002-2942-5331" }, diff --git a/src/python/tests/test_sketch.py b/src/python/tests/test_sketch.py index 7753e608..ac9aaed7 100644 --- a/src/python/tests/test_sketch.py +++ b/src/python/tests/test_sketch.py @@ -1438,16 +1438,8 @@ def test_manysketch_skipm2n3(runtmp, capfd): sigs = list(idx.signatures()) print(sigs) - # add in a version check so this works under latest release AND latest - # dev. - ver = sourmash.version("sourmash") - major, minor, micro = map(int, ver.split(".")[:3]) - assert major == 4 - assert minor >= 8 - if "dev" in ver: - assert len(sigs) == 6 # 3 dna, 3 skipmer. - else: - assert len(sigs) == 3 # 3 dna, 3 skipmer but not recognized yet. + # note: requires sourmash v4.8.13 or later. + assert len(sigs) == 6 # 3 dna, 3 skipmer. # check moltypes, etc! dna_md5sums = {