From 7c646106d64b9dc451ad84f5feb09bd3afcc6d7a Mon Sep 17 00:00:00 2001 From: Timur Gordon <31495328+timurgordon@users.noreply.github.com> Date: Wed, 6 Aug 2025 15:06:54 +0200 Subject: [PATCH] remove local deps paths --- Cargo.lock | 94 ++++++++++++++++++++++++++++++++++++++-------- src/dsl/Cargo.toml | 6 +-- 2 files changed, 81 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7b503f7..66d9247 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -914,10 +914,10 @@ version = "0.1.0" dependencies = [ "bincode", "chrono", - "heromodels-derive", - "heromodels_core", + "heromodels-derive 0.1.0", + "heromodels_core 0.1.0", "jsonb", - "ourdb", + "ourdb 0.1.0", "postgres", "r2d2", "r2d2_postgres", @@ -926,7 +926,30 @@ dependencies = [ "serde_json", "strum", "strum_macros", - "tst", + "tst 0.1.0", + "uuid", +] + +[[package]] +name = "heromodels" +version = "0.1.0" +source = "git+https://git.ourworld.tf/herocode/db.git#453e86edd24d6009f0b154ac777cc66dc5f3bf76" +dependencies = [ + "bincode", + "chrono", + "heromodels-derive 0.1.0 (git+https://git.ourworld.tf/herocode/db.git)", + "heromodels_core 0.1.0 (git+https://git.ourworld.tf/herocode/db.git)", + "jsonb", + "ourdb 0.1.0 (git+https://git.ourworld.tf/herocode/db.git)", + "postgres", + "r2d2", + "r2d2_postgres", + "rhai", + "serde", + "serde_json", + "strum", + "strum_macros", + "tst 0.1.0 (git+https://git.ourworld.tf/herocode/db.git)", "uuid", ] @@ -939,6 +962,16 @@ dependencies = [ "syn 2.0.101", ] +[[package]] +name = "heromodels-derive" +version = "0.1.0" +source = "git+https://git.ourworld.tf/herocode/db.git#453e86edd24d6009f0b154ac777cc66dc5f3bf76" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + [[package]] name = "heromodels_core" version = "0.1.0" @@ -947,6 +980,15 @@ dependencies = [ "serde", ] +[[package]] +name = "heromodels_core" +version = "0.1.0" +source = "git+https://git.ourworld.tf/herocode/db.git#453e86edd24d6009f0b154ac777cc66dc5f3bf76" +dependencies = [ + "chrono", + "serde", +] + [[package]] name = "hmac" version = "0.12.1" @@ -1361,8 +1403,8 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" name = "macros" version = "0.1.0" dependencies = [ - "heromodels", - "heromodels_core", + "heromodels 0.1.0", + "heromodels_core 0.1.0", "rhai", "serde", ] @@ -1588,8 +1630,8 @@ dependencies = [ "chrono", "futures", "futures-util", - "heromodels", - "heromodels_core", + "heromodels 0.1.0", + "heromodels_core 0.1.0", "log", "reqwest", "rhai", @@ -1625,6 +1667,17 @@ dependencies = [ "thiserror", ] +[[package]] +name = "ourdb" +version = "0.1.0" +source = "git+https://git.ourworld.tf/herocode/db.git#453e86edd24d6009f0b154ac777cc66dc5f3bf76" +dependencies = [ + "crc32fast", + "log", + "rand 0.8.5", + "thiserror", +] + [[package]] name = "overload" version = "0.1.1" @@ -2146,9 +2199,9 @@ dependencies = [ "chrono", "derive", "dotenv", - "heromodels", - "heromodels-derive", - "heromodels_core", + "heromodels 0.1.0 (git+https://git.ourworld.tf/herocode/db.git)", + "heromodels-derive 0.1.0 (git+https://git.ourworld.tf/herocode/db.git)", + "heromodels_core 0.1.0 (git+https://git.ourworld.tf/herocode/db.git)", "macros", "reqwest", "rhai", @@ -2165,9 +2218,9 @@ name = "rhailib_engine" version = "0.1.0" dependencies = [ "chrono", - "heromodels", - "heromodels-derive", - "heromodels_core", + "heromodels 0.1.0", + "heromodels-derive 0.1.0", + "heromodels_core 0.1.0", "rhai", "rhailib_dsl", ] @@ -2179,7 +2232,7 @@ dependencies = [ "chrono", "clap", "env_logger", - "heromodels", + "heromodels 0.1.0", "log", "redis", "rhai", @@ -2882,7 +2935,16 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" name = "tst" version = "0.1.0" dependencies = [ - "ourdb", + "ourdb 0.1.0", + "thiserror", +] + +[[package]] +name = "tst" +version = "0.1.0" +source = "git+https://git.ourworld.tf/herocode/db.git#453e86edd24d6009f0b154ac777cc66dc5f3bf76" +dependencies = [ + "ourdb 0.1.0 (git+https://git.ourworld.tf/herocode/db.git)", "thiserror", ] diff --git a/src/dsl/Cargo.toml b/src/dsl/Cargo.toml index 2482441..cb2eff5 100644 --- a/src/dsl/Cargo.toml +++ b/src/dsl/Cargo.toml @@ -6,10 +6,10 @@ description = "Central Rhai engine for heromodels" [dependencies] rhai = { version = "=1.21.0", features = ["std", "sync", "decimal", "internals"] } -heromodels = { path = "../../../db/heromodels", features = ["rhai"] } -heromodels_core = { path = "../../../db/heromodels_core" } +heromodels = { git = "https://git.ourworld.tf/herocode/db.git", features = ["rhai"] } +heromodels_core = { git = "https://git.ourworld.tf/herocode/db.git" } chrono = "0.4" -heromodels-derive = { path = "../../../db/heromodels-derive" } +heromodels-derive = { git = "https://git.ourworld.tf/herocode/db.git" } macros = { path = "../macros"} derive = { path = "../derive"} serde = { version = "1.0", features = ["derive"] }