From cba2767272d1e53cb8c016b4596bedcec6d2c469 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 17 Apr 2024 16:29:59 +0200 Subject: [PATCH 1/3] use released dependencies --- Cargo.lock | 26 +++++++++++++++++++------- Cargo.toml | 6 +++--- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e4e16ac..586f0d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -166,7 +166,8 @@ dependencies = [ [[package]] name = "cobs" version = "0.2.3" -source = "git+https://github.com/robamu/cobs.rs.git?branch=all_features#c70a7f30fd00a7cbdb7666dec12b437977385d40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" [[package]] name = "colorchoice" @@ -590,8 +591,9 @@ checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "satrs" -version = "0.2.0-rc.0" -source = "git+https://egit.irs.uni-stuttgart.de/rust/sat-rs.git?branch=main#786671bbd785ecee4282985c730f9655134a87f9" +version = "0.2.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d6f3286d35464fdc75dc846b663aaad4a81437a50e623053b1b4d481d782cd0" dependencies = [ "bus", "cobs", @@ -605,7 +607,7 @@ dependencies = [ "num-traits", "num_enum", "paste", - "satrs-shared", + "satrs-shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde", "smallvec 1.13.2", "socket2", @@ -620,7 +622,7 @@ source = "git+https://egit.irs.uni-stuttgart.de/rust/sat-rs.git?branch=main#7866 dependencies = [ "csv", "satrs-mib-codegen", - "satrs-shared", + "satrs-shared 0.1.3 (git+https://egit.irs.uni-stuttgart.de/rust/sat-rs.git?branch=main)", "serde", "serde-hex", ] @@ -635,6 +637,16 @@ dependencies = [ "syn 2.0.59", ] +[[package]] +name = "satrs-shared" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f01df804b902334a23c539db5e37f11bf41ecb86596292e7cc091628bf2c4f67" +dependencies = [ + "serde", + "spacepackets", +] + [[package]] name = "satrs-shared" version = "0.1.3" @@ -702,9 +714,9 @@ dependencies = [ [[package]] name = "spacepackets" -version = "0.11.0-rc.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2cfd5f9a4c7f10714d21f9bc61f2d176cb7ae092cdd687e7ade2d4e6f7d7125" +checksum = "08e05169d37db5d0f8527f4abcacb72f6d178654879892c0e37ab5f04df85e3e" dependencies = [ "chrono", "crc", diff --git a/Cargo.toml b/Cargo.toml index 50d51a2..b403fa7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,9 +18,9 @@ num_enum = "0.7" mio = "0.8" [dependencies.satrs] -version = "0.2.0-rc.0" -git = "https://egit.irs.uni-stuttgart.de/rust/sat-rs.git" -branch = "main" +version = "0.2.0-rc.1" +# git = "https://egit.irs.uni-stuttgart.de/rust/sat-rs.git" +# branch = "main" features = ["test_util"] [dependencies.satrs-mib] From f18ae0e165eb359da5ba3a992a73e6b16e60dd06 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 17 Apr 2024 16:40:13 +0200 Subject: [PATCH 2/3] this works --- Cargo.lock | 35 ++++++++++++++--------------------- Cargo.toml | 4 +--- 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 586f0d1..7772ac0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -523,9 +523,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -607,7 +607,7 @@ dependencies = [ "num-traits", "num_enum", "paste", - "satrs-shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "satrs-shared", "serde", "smallvec 1.13.2", "socket2", @@ -617,20 +617,22 @@ dependencies = [ [[package]] name = "satrs-mib" -version = "0.1.1" -source = "git+https://egit.irs.uni-stuttgart.de/rust/sat-rs.git?branch=main#786671bbd785ecee4282985c730f9655134a87f9" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "170db5f618bb76aa1d0078def1929ff5f62a20db602955fd8e1f9920424d33a8" dependencies = [ "csv", "satrs-mib-codegen", - "satrs-shared 0.1.3 (git+https://egit.irs.uni-stuttgart.de/rust/sat-rs.git?branch=main)", + "satrs-shared", "serde", "serde-hex", ] [[package]] name = "satrs-mib-codegen" -version = "0.1.1" -source = "git+https://egit.irs.uni-stuttgart.de/rust/sat-rs.git?branch=main#786671bbd785ecee4282985c730f9655134a87f9" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "474b583ffa521fbc362ae71da11c9fe29a6b60af47744e067550b6eef4f60d43" dependencies = [ "proc-macro2", "quote", @@ -647,20 +649,11 @@ dependencies = [ "spacepackets", ] -[[package]] -name = "satrs-shared" -version = "0.1.3" -source = "git+https://egit.irs.uni-stuttgart.de/rust/sat-rs.git?branch=main#786671bbd785ecee4282985c730f9655134a87f9" -dependencies = [ - "serde", - "spacepackets", -] - [[package]] name = "serde" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] @@ -678,9 +671,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index b403fa7..faeb635 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,9 +24,7 @@ version = "0.2.0-rc.1" features = ["test_util"] [dependencies.satrs-mib] -version = "0.1.1" -git = "https://egit.irs.uni-stuttgart.de/rust/sat-rs.git" -branch = "main" +version = ">=0.1.2, <0.2" [dev-dependencies] env_logger = "0.11" From 8ecd6f28479c56ab5d69a7461864e49063fb6059 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 18 Apr 2024 14:08:03 +0200 Subject: [PATCH 3/3] bump version again --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index faeb635..f724140 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ num_enum = "0.7" mio = "0.8" [dependencies.satrs] -version = "0.2.0-rc.1" +version = "0.2.0-rc.3" # git = "https://egit.irs.uni-stuttgart.de/rust/sat-rs.git" # branch = "main" features = ["test_util"]