WIP: fixed RocksDB-based fastmultigather (#348)

* switch to using a specific branch of sourmash * upd * upd * upd to latest * include bumped sourmash version (but still git branch) * update to use sourmash latest * bump min sourmash req, sourmash-rs => 0.14.0 * upd lock for 0.14.0 * revert back to dependong on 4.8.8 * fix average ANI test
sourmash-bio · Jun 10, 2024 · 7a6b830 · 7a6b830
1 parent aa82597
commit 7a6b830
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 45 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
 pyo3 = { version = "0.21.2", features = ["extension-module", "anyhow"] }
 rayon = "1.10.0"
 serde = { version = "1.0.203", features = ["derive"] }
-sourmash = { version = "0.13.1", features = ["branchwater"] }
+sourmash = { version = "0.14.0", features = ["branchwater"] }
 serde_json = "1.0.117"
 niffler = "2.4.0"
 log = "0.4.14"

diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,7 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     ]
-dependencies = ["sourmash>=4.8.5,<5"]
+dependencies = ["sourmash>=4.8.8,<5"]
 
 authors = [
   { name="N. Tessa Pierce-Ward", orcid="0000-0002-2942-5331" },

diff --git a/src/python/tests/test_multigather.py b/src/python/tests/test_multigather.py
@@ -1015,7 +1015,7 @@ def test_indexed_full_output(runtmp):
     # check a few columns
     average_ani = set(df['average_containment_ani'])
     avg_ani = set([round(x, 4) for x in average_ani])
-    assert avg_ani == {0.8602, 0.8504, 0.8361}
+    assert avg_ani == {0.8359, 0.8502, 0.8602}
 
     f_unique_weighted = set(df['f_unique_weighted'])
     f_unique_weighted = set([round(x, 4) for x in f_unique_weighted])