Merge branch 'main' into upd-smash-core

sourmash-bio · Jan 30, 2024 · b5a175e · b5a175e
2 parents 86d6c16 + 6c0d568
commit b5a175e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,10 +11,10 @@ crate-type = ["cdylib"]
 [dependencies]
 pyo3 = { version = "0.20.2", features = ["extension-module", "anyhow"] }
 rayon = "1.8.1"
-serde = { version = "1.0.195", features = ["derive"] }
+serde = { version = "1.0.196", features = ["derive"] }
 sourmash = { git = "https://github.com/sourmash-bio/sourmash", rev= "94b88cc314f781342721addc5ed35c531732a9b6", features = ["branchwater"] }
 #sourmash = { version = "0.12.0", features = ["branchwater"] }
-serde_json = "1.0.111"
+serde_json = "1.0.113"
 niffler = "2.4.0"
 log = "0.4.14"
 env_logger = "0.10.2"

diff --git a/pyproject.toml b/pyproject.toml
@@ -33,7 +33,7 @@ pairwise = "sourmash_plugin_branchwater:Branchwater_Pairwise"
 
 [project.optional-dependencies]
 test = [
-  "pytest>=6.2.4,<7.5.0",
+  "pytest>=6.2.4,<8.1.0",
   "pytest-cov>=2.12,<5.0",
   "pytest-xdist",
   "pandas",