diff --git a/.github/workflows/docker-images.yaml b/.github/workflows/docker-images.yaml index 446478b5..e5bd46a1 100644 --- a/.github/workflows/docker-images.yaml +++ b/.github/workflows/docker-images.yaml @@ -24,4 +24,4 @@ jobs: context: . platforms: linux/amd64,linux/arm64 push: true - tags: izihawa/summa-server:testing \ No newline at end of file + tags: izihawa/summa-server:development \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 0fbca757..109368e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,7 @@ serde_yaml = { version = "0.8" } strfmt = "0.2" summa-proto = { version = "0.36.0", path = "./summa-proto", default_features = false } take_mut = "0.2" -tantivy = { package = "izihawa-tantivy", version = "0.22.2", default_features = false, features = ["quickwit", "zstd-compression"] } +tantivy = { package = "izihawa-tantivy", version = "0.22.5", default_features = false, features = ["quickwit", "sstable-termdict", "zstd-compression"] } tantivy-common = { package = "izihawa-tantivy-common", version = "0.6.1" } tantivy-query-grammar = { package = "izihawa-tantivy-query-grammar", version = "0.21.1" } thiserror = "1.0" diff --git a/ipfs-hamt-directory-py/pyproject.toml b/ipfs-hamt-directory-py/pyproject.toml index 6463c896..93a3eec1 100644 --- a/ipfs-hamt-directory-py/pyproject.toml +++ b/ipfs-hamt-directory-py/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["maturin>=0.14,<0.15"] +requires = ["maturin>=1.4.0,<1.5.0"] build-backend = "maturin" [project] diff --git a/summa-core/Cargo.toml b/summa-core/Cargo.toml index daacc251..2b1a5a5b 100644 --- a/summa-core/Cargo.toml +++ b/summa-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "summa-core" -version = "0.22.9" +version = "0.23.0" authors = ["Pasha Podolsky "] edition = "2021" license-file = "LICENSE" diff --git a/summa-core/src/components/segment_attributes.rs b/summa-core/src/components/segment_attributes.rs index 6a212e2d..d6e00339 100644 --- a/summa-core/src/components/segment_attributes.rs +++ b/summa-core/src/components/segment_attributes.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use serde::de::DeserializeOwned; use serde::{Deserialize, Serialize}; -use tantivy::SegmentAttributesMerger; +use tantivy::index::SegmentAttributesMerger; use crate::utils::current_time; diff --git a/summa-embed-py/Cargo.toml b/summa-embed-py/Cargo.toml index fe0c2500..4f36f2bd 100644 --- a/summa-embed-py/Cargo.toml +++ b/summa-embed-py/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "summa-embed-py" -version = "0.22.9" +version = "0.23.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -17,8 +17,8 @@ pyo3-asyncio = { version = "0.19", features = ["attributes", "tokio-runtime"] } pyo3-log = "0.8" pythonize = "0.19" serde_json = "1.0" -summa-core = { version = "0.22.9", path = "../summa-core", default_features = false, features = ["fs", "hyper-external-request", "tokio-rt"] } -summa-server = { version = "0.22.9", path = "../summa-server", default_features = false } +summa-core = { version = "0.23.0", path = "../summa-core", default_features = false, features = ["fs", "hyper-external-request", "tokio-rt"] } +summa-server = { version = "0.23.0", path = "../summa-server", default_features = false } summa-proto = { workspace = true } tantivy = { workspace = true } tokio = { workspace = true } \ No newline at end of file diff --git a/summa-embed-py/pyproject.toml b/summa-embed-py/pyproject.toml index 5297fd33..84198bbf 100644 --- a/summa-embed-py/pyproject.toml +++ b/summa-embed-py/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["maturin>=0.14,<0.15"] +requires = ["maturin>=1.4.0,<1.5.0"] build-backend = "maturin" [project] diff --git a/summa-server/Cargo.toml b/summa-server/Cargo.toml index e6bd05c5..881a0b89 100644 --- a/summa-server/Cargo.toml +++ b/summa-server/Cargo.toml @@ -1,7 +1,7 @@ [package] edition = "2021" name = "summa-server" -version = "0.22.9" +version = "0.23.0" license-file = "LICENSE" description = "Fast full-text search server" homepage = "https://github.com/izihawa/summa" @@ -30,7 +30,7 @@ maintenance = { status = "actively-developed" } tonic-build = { version = "0.10", default-features = false, features = ["prost", "transport"] } [dev-dependencies] -summa-core = { version = "0.22.9", path = "../summa-core", features = ["fs", "hyper-external-request", "tokio-rt"] } +summa-core = { version = "0.23.0", path = "../summa-core", features = ["fs", "hyper-external-request", "tokio-rt"] } tempdir = "0.3.7" [dependencies] @@ -59,7 +59,7 @@ serde = { workspace = true } serde_derive = "1.0" serde_json = { workspace = true } serde_yaml = { workspace = true } -summa-core = { version = "0.22.9", path = "../summa-core", features = ["fs", "hyper-external-request", "tokio-rt"] } +summa-core = { version = "0.23.0", path = "../summa-core", features = ["fs", "hyper-external-request", "tokio-rt"] } summa-proto = { workspace = true, features = ["grpc"] } take_mut = { workspace = true } tantivy = { workspace = true } diff --git a/summa-wasm/Cargo.toml b/summa-wasm/Cargo.toml index efb26cc3..51775e18 100644 --- a/summa-wasm/Cargo.toml +++ b/summa-wasm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "summa-wasm" -version = "0.135.7" +version = "0.136.0" authors = ["Pasha Podolsky "] edition = "2021" license-file = "LICENSE" @@ -26,7 +26,7 @@ prost = { workspace = true } serde = { workspace = true } serde-wasm-bindgen = "0.6" strfmt = { workspace = true } -summa-core = { version = "0.22.9", path = "../summa-core", default_features = false } +summa-core = { version = "0.23.0", path = "../summa-core", default_features = false } summa-proto = { workspace = true } tantivy = { workspace = true, features = ["wasm"] } thiserror = { workspace = true } diff --git a/summa-wasm/package.json b/summa-wasm/package.json index 9adb34f2..9aa31635 100644 --- a/summa-wasm/package.json +++ b/summa-wasm/package.json @@ -1,7 +1,7 @@ { "name": "summa-wasm", "description": "WASM-bindings for Summa", - "version": "0.135.7", + "version": "0.136.0", "keywords": [ "search", "database",