From b44a3c13d7f3c782931631d1a6104a3125edb1ad Mon Sep 17 00:00:00 2001 From: Dirk Sammel Date: Mon, 13 May 2024 15:09:01 +0200 Subject: [PATCH] changes due to new package for auditor-client --- auditor-client/Cargo.toml | 27 +++++++++++++++++++++++---- auditor/Cargo.toml | 3 +-- codecov.yaml | 4 ++++ collectors/slurm-epilog/Cargo.toml | 2 +- collectors/slurm/Cargo.toml | 2 +- plugins/priority/Cargo.toml | 2 +- 6 files changed, 31 insertions(+), 9 deletions(-) diff --git a/auditor-client/Cargo.toml b/auditor-client/Cargo.toml index 02449ae0..6515d42d 100644 --- a/auditor-client/Cargo.toml +++ b/auditor-client/Cargo.toml @@ -1,25 +1,45 @@ [package] name = "auditor-client" version = "0.5.0" +authors = ["Stefan Kroboth "] edition = "2021" license = "MIT OR Apache-2.0" +description = "Client for AUDITOR" +documentation = "https://docs.rs/auditor/" +homepage = "https://alu-schumacher.github.io/AUDITOR/" +repository = "https://github.com/alu-schumacher/AUDITOR" +readme = "../README.md" +keywords = ["accounting", "opportunistic", "grid-computing", "batch-systems"] +exclude = [ + ".cargo", + ".dockerignore", + ".git", + ".gitattributes", + ".github", + ".gitignore", + ".pytest_cache", + "target", + "nohup.out" +] + +[lib] +path = "src/lib.rs" [dependencies] auditor = { path = "../auditor", version = "0.5.0", default-features = false } -chrono = { version = "0.4.31", default-features = false, features = ["serde"] } +chrono = { version = "0.4.38", default-features = false, features = ["serde"] } reqwest = { version = "0.12.4", default-features = false, features = ["json", "rustls-tls", "blocking"] } urlencoding = "2.1.3" tracing = { version = "0.1", features = ["log"] } thiserror = "1" tokio = { version = "1", features = ["time"] } -#color-eyre = "0.6.2" serde = { version = "1", features = ["derive"] } serde_qs = { version = "0.13.0", features = ["actix4"] } anyhow = "1.0.0" bincode = "1.3.3" [dependencies.sqlx] -version = "0.7.2" +version = "0.7.4" default-features = false features = [ "runtime-tokio-rustls", @@ -31,7 +51,6 @@ features = [ ] [dev-dependencies] -#auditor = { path = "../auditor", version = "0.4.0" } claim = { package = "claims", version = "0.7" } wiremock = "0.6" fake = { version = "2.9", features = ["chrono"] } diff --git a/auditor/Cargo.toml b/auditor/Cargo.toml index 1460fccf..5a0c157f 100644 --- a/auditor/Cargo.toml +++ b/auditor/Cargo.toml @@ -82,9 +82,8 @@ features = [ ] [dev-dependencies] -auditor-client = { path = "../auditor-client" } +auditor-client = { path = "../auditor-client", version = "0.5.0" } once_cell = "1" -# claim = "0.5" claim = { package = "claims", version = "0.7" } quickcheck = "1" quickcheck_macros = "1" diff --git a/codecov.yaml b/codecov.yaml index 1566c5f6..c9990ca4 100644 --- a/codecov.yaml +++ b/codecov.yaml @@ -11,6 +11,10 @@ component_management: name: auditor paths: - auditor/** + - component_id: module_auditor_client + name: auditor_client + paths: + - auditor-client/** - component_id: module_slurm_collector name: slurm_collector paths: diff --git a/collectors/slurm-epilog/Cargo.toml b/collectors/slurm-epilog/Cargo.toml index 85499135..d5679d80 100644 --- a/collectors/slurm-epilog/Cargo.toml +++ b/collectors/slurm-epilog/Cargo.toml @@ -31,7 +31,7 @@ strip = true [dependencies] auditor = { path = "../../auditor", version = "0.5.0" } -auditor-client = { path = "../../auditor-client" } +auditor-client = { path = "../../auditor-client", version = "0.5.0" } chrono = { version = "0.4.38", default-features = false, features = ["serde"] } anyhow = "1" regex = "1" diff --git a/collectors/slurm/Cargo.toml b/collectors/slurm/Cargo.toml index 41cbf1ef..88c8407c 100644 --- a/collectors/slurm/Cargo.toml +++ b/collectors/slurm/Cargo.toml @@ -32,7 +32,7 @@ strip = true [dependencies] anyhow = "1" auditor = { path = "../../auditor", version = "0.5.0", default-features = false } -auditor-client = { path = "../../auditor-client" } +auditor-client = { path = "../../auditor-client", version = "0.5.0" } bincode = "1.3.3" color-eyre = "0.6.3" tokio = { version = "1", features = ["macros", "rt-multi-thread", "time", "process"] } diff --git a/plugins/priority/Cargo.toml b/plugins/priority/Cargo.toml index 1095fc0e..26a20150 100644 --- a/plugins/priority/Cargo.toml +++ b/plugins/priority/Cargo.toml @@ -31,7 +31,7 @@ strip = true [dependencies] auditor = { path = "../../auditor", version = "0.5.0" } -auditor-client = { path = "../../auditor-client" } +auditor-client = { path = "../../auditor-client", version = "0.5.0" } actix-web = "4.5.1" config = "0.13" tracing = { version = "0.1", features = ["log"] }