merge

sourmash-bio · Oct 15, 2024 · 2d8b2bb · 2d8b2bb
2 parents fff1cd9 + a7b5ae0
commit 2d8b2bb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -29,7 +29,6 @@ jobs:
         auto-update-conda: true
         python-version: 3.12
         channels: conda-forge,bioconda
-        miniforge-variant: Mambaforge
         miniforge-version: latest
         use-mamba: true
         mamba-version: "*"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,8 +12,7 @@ crate-type = ["cdylib"]
 pyo3 = { version = "0.22.4", features = ["extension-module", "anyhow"] }
 rayon = "1.10.0"
 serde = { version = "1.0.210", features = ["derive"] }
-#sourmash = { version = "0.15.2", features = ["branchwater"] }
-sourmash = { git = "https://github.com/sourmash-bio/sourmash.git", branch = "refactor_rs_downsample", features = ["branchwater"] }
+sourmash = { version = "0.16.0", features = ["branchwater"] }
 serde_json = "1.0.128"
 niffler = "2.4.0"
 log = "0.4.22"