From 349e183c771ba4df93e8c6037c24d13c48636a83 Mon Sep 17 00:00:00 2001 From: Alex Ivliev Date: Wed, 2 Oct 2024 17:10:20 +0200 Subject: [PATCH 1/4] Bump nemo version --- CITATION.cff | 2 +- Cargo.lock | 44 +++++++++++++++++++++++++------------------- Cargo.toml | 5 +++-- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 8adf4540e..cebb37cad 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -56,7 +56,7 @@ keywords: - Existential Rules license: Apache-2.0 commit: 6ccd3fcc12d57fbac5e3d7e5c5547e72a610d7f7 -version: 0.5.1 +version: 0.6.0 date-released: '2024-06-06' preferred-citation: authors: diff --git a/Cargo.lock b/Cargo.lock index 7c78f089a..37fcde69b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -330,9 +330,9 @@ checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "cc" -version = "1.1.23" +version = "1.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bbb537bb4a30b90362caddba8f360c0a56bc13d3a5570028e7197204cb54a17" +checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" dependencies = [ "shlex", ] @@ -380,9 +380,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.18" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" +checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" dependencies = [ "clap_builder", "clap_derive", @@ -390,9 +390,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.18" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" +checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" dependencies = [ "anstream", "anstyle", @@ -542,7 +542,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -961,6 +961,12 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "heck" version = "0.4.1" @@ -1161,12 +1167,12 @@ checksum = "0cfe9645a18782869361d9c8732246be7b410ad4e919d3609ebabdac00ba12c3" [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.0", ] [[package]] @@ -1291,7 +1297,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -1402,7 +1408,7 @@ dependencies = [ [[package]] name = "nemo" -version = "0.5.2-dev" +version = "0.6.0" dependencies = [ "ariadne", "ascii_tree", @@ -1448,12 +1454,12 @@ dependencies = [ [[package]] name = "nemo-cli" -version = "0.5.2-dev" +version = "0.6.0" dependencies = [ "ariadne", "assert_cmd", "assert_fs", - "clap 4.5.18", + "clap 4.5.19", "colored", "dir-test", "env_logger 0.11.5", @@ -1467,7 +1473,7 @@ dependencies = [ [[package]] name = "nemo-language-server" -version = "0.5.2-dev" +version = "0.6.0" dependencies = [ "anyhow", "futures", @@ -1482,7 +1488,7 @@ dependencies = [ [[package]] name = "nemo-physical" -version = "0.5.2-dev" +version = "0.6.0" dependencies = [ "arbitrary", "ascii_tree", @@ -1491,7 +1497,7 @@ dependencies = [ "enum_dispatch", "env_logger 0.11.5", "flate2", - "hashbrown", + "hashbrown 0.14.5", "howlong", "linked-hash-map", "log", @@ -1512,7 +1518,7 @@ dependencies = [ [[package]] name = "nemo-python" -version = "0.5.2-dev" +version = "0.6.0" dependencies = [ "nemo", "pyo3", @@ -1520,7 +1526,7 @@ dependencies = [ [[package]] name = "nemo-wasm" -version = "0.5.2-dev" +version = "0.6.0" dependencies = [ "console_error_panic_hook", "futures", diff --git a/Cargo.toml b/Cargo.toml index 2b98272e6..e05e7ccb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,15 +17,16 @@ members = [ [workspace.package] description = "Nemo, a datalog-based rule engine for fast and scalable analytic data processing in memory" -version = "0.5.2-dev" +version = "0.6.0" authors = [ "Alex Ivliev ", +"Aidan Bailey ", +"Jakob Steinberg ", "Lukas Gerlach ", "Larry González ", "Markus Krötzsch ", "Matthias Meissner ", "Maximilian Marx ", -"Philipp Hanisch ", "Simon Meusel ", "Stefan Ellmauthaler ", ] From 8044739653f99404a17a32d9222f7ddebc9ff109 Mon Sep 17 00:00:00 2001 From: Alex Ivliev Date: Wed, 2 Oct 2024 17:25:01 +0200 Subject: [PATCH 2/4] Bump nemo version --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 37fcde69b..1d95c73a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1408,7 +1408,7 @@ dependencies = [ [[package]] name = "nemo" -version = "0.6.0" +version = "0.6.1-dev" dependencies = [ "ariadne", "ascii_tree", @@ -1454,7 +1454,7 @@ dependencies = [ [[package]] name = "nemo-cli" -version = "0.6.0" +version = "0.6.1-dev" dependencies = [ "ariadne", "assert_cmd", @@ -1473,7 +1473,7 @@ dependencies = [ [[package]] name = "nemo-language-server" -version = "0.6.0" +version = "0.6.1-dev" dependencies = [ "anyhow", "futures", @@ -1488,7 +1488,7 @@ dependencies = [ [[package]] name = "nemo-physical" -version = "0.6.0" +version = "0.6.1-dev" dependencies = [ "arbitrary", "ascii_tree", @@ -1518,7 +1518,7 @@ dependencies = [ [[package]] name = "nemo-python" -version = "0.6.0" +version = "0.6.1-dev" dependencies = [ "nemo", "pyo3", @@ -1526,7 +1526,7 @@ dependencies = [ [[package]] name = "nemo-wasm" -version = "0.6.0" +version = "0.6.1-dev" dependencies = [ "console_error_panic_hook", "futures", diff --git a/Cargo.toml b/Cargo.toml index e05e7ccb3..d7565bab2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ members = [ [workspace.package] description = "Nemo, a datalog-based rule engine for fast and scalable analytic data processing in memory" -version = "0.6.0" +version = "0.6.1-dev" authors = [ "Alex Ivliev ", "Aidan Bailey ", From c793acdbd60d10429815d199e046aeb07fe86450 Mon Sep 17 00:00:00 2001 From: Alex Ivliev Date: Wed, 2 Oct 2024 19:39:07 +0200 Subject: [PATCH 3/4] cargo update --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1d95c73a1..c93045fb1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2863,9 +2863,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" From 1670c921a3a399e64665ff39e4093b29e4d884d5 Mon Sep 17 00:00:00 2001 From: Alex Ivliev Date: Wed, 2 Oct 2024 19:39:13 +0200 Subject: [PATCH 4/4] Update commit in citation file --- CITATION.cff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CITATION.cff b/CITATION.cff index cebb37cad..0ca8eb8da 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -55,7 +55,7 @@ keywords: - Datalog - Existential Rules license: Apache-2.0 -commit: 6ccd3fcc12d57fbac5e3d7e5c5547e72a610d7f7 +commit: 349e183c771ba4df93e8c6037c24d13c48636a83 version: 0.6.0 date-released: '2024-06-06' preferred-citation: