From 1952f4c55dabf3bd9197426a967d075f3806aad9 Mon Sep 17 00:00:00 2001 From: hodasemi Date: Wed, 10 Apr 2024 08:14:53 +0200 Subject: [PATCH] Fix renovate and project links --- cepitodb-master/.gitmodules | 3 --- cepitodb-master/Cargo.toml | 2 +- cepitodb-master/src/main.rs | 4 ++-- renovate.json | 8 +++++--- rust-database-master/Cargo.toml | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 cepitodb-master/.gitmodules diff --git a/cepitodb-master/.gitmodules b/cepitodb-master/.gitmodules deleted file mode 100644 index f11563d..0000000 --- a/cepitodb-master/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "python-cepi"] - path = python-cepi - url = git@gitlab.ptspaper.de:scs/phoenix/python-cepi.git diff --git a/cepitodb-master/Cargo.toml b/cepitodb-master/Cargo.toml index 6819f8a..e7ba415 100644 --- a/cepitodb-master/Cargo.toml +++ b/cepitodb-master/Cargo.toml @@ -12,7 +12,7 @@ mysql = "23.0.1" serde = { version = "1.0.160", features = ["derive"] } serde_json = "1.0.96" chrono = { version = "0.4.24" } -rust-database = { git = "ssh://git@gitlab.ptspaper.de/scs/phoenix/rust-database" } +rust-database = { path = "../rust-database-master" } clap = { version = "4.3.2", features = ["derive"] } [dev-dependencies] diff --git a/cepitodb-master/src/main.rs b/cepitodb-master/src/main.rs index d17ba54..2cbb8e6 100644 --- a/cepitodb-master/src/main.rs +++ b/cepitodb-master/src/main.rs @@ -29,7 +29,7 @@ fn main() -> Result<()> { let file = args.file; - let cepi_reader = PythonObject::new("python-cepi/cepi_read_function.py")?; + let cepi_reader = PythonObject::new("../python-cepi-master/cepi_read_function.py")?; let cepi_data = cepi_reader.execute_script( "read", @@ -78,7 +78,7 @@ fn main() -> Result<()> { "%Y-%m-%d %H:%M:%S", )?; - let unix_time_stamp = dt.timestamp(); + let unix_time_stamp = dt.and_utc().timestamp(); let (config_id, result_id) = db.write_measurement(&meta_info, unix_time_stamp, "Ok", &measurements)?; diff --git a/renovate.json b/renovate.json index c02e8c6..4f93891 100644 --- a/renovate.json +++ b/renovate.json @@ -4,11 +4,13 @@ "config:base" ], "prHourlyLimit": 0, - "baseBranches": ["dev"], "packageRules": [ { - "matchUpdateTypes": ["minor", "patch"], + "matchUpdateTypes": [ + "minor", + "patch" + ], "automerge": true } ] -} +} \ No newline at end of file diff --git a/rust-database-master/Cargo.toml b/rust-database-master/Cargo.toml index 3719176..4882f31 100644 --- a/rust-database-master/Cargo.toml +++ b/rust-database-master/Cargo.toml @@ -7,6 +7,6 @@ edition = "2021" [dependencies] anyhow = { version = "1.0.70", features = ["backtrace"] } -mysql = "23.0.1" +mysql = "25.0.0" serde = { version = "1.0.160", features = ["derive"] } serde_json = "1.0.96" \ No newline at end of file