From cb809d3984d86a5ef4adb0f6f452d7a4442bf10b Mon Sep 17 00:00:00 2001 From: Jose Celano Date: Mon, 23 Sep 2024 17:48:40 +0100 Subject: [PATCH 1/4] develop: bump to version 3.0.0-develop --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 16 ++++++++-------- packages/clock/Cargo.toml | 2 +- packages/configuration/Cargo.toml | 2 +- packages/test-helpers/Cargo.toml | 2 +- packages/torrent-repository/Cargo.toml | 6 +++--- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 56978738..d43356ca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3774,7 +3774,7 @@ dependencies = [ [[package]] name = "torrust-tracker" -version = "3.0.0-rc.1" +version = "3.0.0-develop" dependencies = [ "anyhow", "aquatic_udp_protocol", @@ -3836,7 +3836,7 @@ dependencies = [ [[package]] name = "torrust-tracker-clock" -version = "3.0.0-rc.1" +version = "3.0.0-develop" dependencies = [ "chrono", "lazy_static", @@ -3845,7 +3845,7 @@ dependencies = [ [[package]] name = "torrust-tracker-configuration" -version = "3.0.0-rc.1" +version = "3.0.0-develop" dependencies = [ "camino", "derive_more", @@ -3862,7 +3862,7 @@ dependencies = [ [[package]] name = "torrust-tracker-contrib-bencode" -version = "3.0.0-rc.1" +version = "3.0.0-develop" dependencies = [ "criterion", "thiserror", @@ -3870,7 +3870,7 @@ dependencies = [ [[package]] name = "torrust-tracker-located-error" -version = "3.0.0-rc.1" +version = "3.0.0-develop" dependencies = [ "thiserror", "tracing", @@ -3878,7 +3878,7 @@ dependencies = [ [[package]] name = "torrust-tracker-primitives" -version = "3.0.0-rc.1" +version = "3.0.0-develop" dependencies = [ "aquatic_udp_protocol", "binascii", @@ -3892,7 +3892,7 @@ dependencies = [ [[package]] name = "torrust-tracker-test-helpers" -version = "3.0.0-rc.1" +version = "3.0.0-develop" dependencies = [ "rand", "torrust-tracker-configuration", @@ -3900,7 +3900,7 @@ dependencies = [ [[package]] name = "torrust-tracker-torrent-repository" -version = "3.0.0-rc.1" +version = "3.0.0-develop" dependencies = [ "aquatic_udp_protocol", "async-std", diff --git a/Cargo.toml b/Cargo.toml index 4aa87e6e..47102a34 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ license = "AGPL-3.0-only" publish = true repository = "https://github.com/torrust/torrust-tracker" rust-version = "1.72" -version = "3.0.0-rc.1" +version = "3.0.0-develop" [dependencies] anyhow = "1" @@ -69,12 +69,12 @@ serde_repr = "0" serde_with = { version = "3", features = ["json"] } thiserror = "1" tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] } -torrust-tracker-clock = { version = "3.0.0-rc.1", path = "packages/clock" } -torrust-tracker-configuration = { version = "3.0.0-rc.1", path = "packages/configuration" } -torrust-tracker-contrib-bencode = { version = "3.0.0-rc.1", path = "contrib/bencode" } -torrust-tracker-located-error = { version = "3.0.0-rc.1", path = "packages/located-error" } -torrust-tracker-primitives = { version = "3.0.0-rc.1", path = "packages/primitives" } -torrust-tracker-torrent-repository = { version = "3.0.0-rc.1", path = "packages/torrent-repository" } +torrust-tracker-clock = { version = "3.0.0-develop", path = "packages/clock" } +torrust-tracker-configuration = { version = "3.0.0-develop", path = "packages/configuration" } +torrust-tracker-contrib-bencode = { version = "3.0.0-develop", path = "contrib/bencode" } +torrust-tracker-located-error = { version = "3.0.0-develop", path = "packages/located-error" } +torrust-tracker-primitives = { version = "3.0.0-develop", path = "packages/primitives" } +torrust-tracker-torrent-repository = { version = "3.0.0-develop", path = "packages/torrent-repository" } tower = { version = "0", features = ["timeout"] } tower-http = { version = "0", features = ["compression-full", "cors", "propagate-header", "request-id", "trace"] } trace = "0" @@ -90,7 +90,7 @@ ignored = ["crossbeam-skiplist", "dashmap", "figment", "parking_lot", "serde_byt [dev-dependencies] local-ip-address = "0" mockall = "0" -torrust-tracker-test-helpers = { version = "3.0.0-rc.1", path = "packages/test-helpers" } +torrust-tracker-test-helpers = { version = "3.0.0-develop", path = "packages/test-helpers" } [workspace] members = [ diff --git a/packages/clock/Cargo.toml b/packages/clock/Cargo.toml index f95c12a0..2ede678d 100644 --- a/packages/clock/Cargo.toml +++ b/packages/clock/Cargo.toml @@ -19,6 +19,6 @@ version.workspace = true chrono = { version = "0", default-features = false, features = ["clock"] } lazy_static = "1" -torrust-tracker-primitives = { version = "3.0.0-rc.1", path = "../primitives" } +torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" } [dev-dependencies] diff --git a/packages/configuration/Cargo.toml b/packages/configuration/Cargo.toml index 7b8b3c3b..8706679f 100644 --- a/packages/configuration/Cargo.toml +++ b/packages/configuration/Cargo.toml @@ -23,7 +23,7 @@ serde_json = { version = "1", features = ["preserve_order"] } serde_with = "3" thiserror = "1" toml = "0" -torrust-tracker-located-error = { version = "3.0.0-rc.1", path = "../located-error" } +torrust-tracker-located-error = { version = "3.0.0-develop", path = "../located-error" } url = "2" [dev-dependencies] diff --git a/packages/test-helpers/Cargo.toml b/packages/test-helpers/Cargo.toml index ccf08b57..ad291d20 100644 --- a/packages/test-helpers/Cargo.toml +++ b/packages/test-helpers/Cargo.toml @@ -16,4 +16,4 @@ version.workspace = true [dependencies] rand = "0" -torrust-tracker-configuration = { version = "3.0.0-rc.1", path = "../configuration" } +torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" } diff --git a/packages/torrent-repository/Cargo.toml b/packages/torrent-repository/Cargo.toml index 0650d608..32c32453 100644 --- a/packages/torrent-repository/Cargo.toml +++ b/packages/torrent-repository/Cargo.toml @@ -22,9 +22,9 @@ dashmap = "6" futures = "0" parking_lot = "0" tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] } -torrust-tracker-clock = { version = "3.0.0-rc.1", path = "../clock" } -torrust-tracker-configuration = { version = "3.0.0-rc.1", path = "../configuration" } -torrust-tracker-primitives = { version = "3.0.0-rc.1", path = "../primitives" } +torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" } +torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" } +torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" } zerocopy = "0" [dev-dependencies] From ae5ea1ea0dfe2c1a9a9d2277affee78912a8c815 Mon Sep 17 00:00:00 2001 From: Jose Celano Date: Wed, 2 Oct 2024 08:28:07 +0100 Subject: [PATCH 2/4] docs: fix link to containers docs --- src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index d242ac80..5d7c92ae 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -155,7 +155,7 @@ //! ## Run with docker //! //! You can run the tracker with a pre-built docker image. Please refer to the -//! [tracker docker documentation](https://github.com/torrust/torrust-tracker/tree/develop/docker). +//! [tracker docker documentation](https://github.com/torrust/torrust-tracker/blob/develop/docs/containers.md). //! //! # Configuration //! @@ -214,7 +214,7 @@ //! of the `tracker.toml` file. //! //! The env var contains the same data as the `tracker.toml`. It's particularly -//! useful in you are [running the tracker with docker](https://github.com/torrust/torrust-tracker/tree/develop/docker). +//! useful in you are [running the tracker with docker](https://github.com/torrust/torrust-tracker/blob/develop/docs/containers.md). //! //! > NOTICE: The `TORRUST_TRACKER_CONFIG_TOML` env var has priority over the `tracker.toml` file. //! From 6b2d8e8372b002cf501f244f4d1b8ffeda8983d9 Mon Sep 17 00:00:00 2001 From: Jose Celano Date: Wed, 2 Oct 2024 09:00:27 +0100 Subject: [PATCH 3/4] fix: clippy errors --- packages/clock/src/clock/stopped/mod.rs | 1 - packages/clock/src/conv/mod.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/clock/src/clock/stopped/mod.rs b/packages/clock/src/clock/stopped/mod.rs index 57655ab7..5d0b2ec4 100644 --- a/packages/clock/src/clock/stopped/mod.rs +++ b/packages/clock/src/clock/stopped/mod.rs @@ -1,6 +1,5 @@ /// Trait for types that can be used as a timestamp clock stopped /// at a given time. - #[allow(clippy::module_name_repetitions)] pub struct StoppedClock {} diff --git a/packages/clock/src/conv/mod.rs b/packages/clock/src/conv/mod.rs index 89408306..0ac27817 100644 --- a/packages/clock/src/conv/mod.rs +++ b/packages/clock/src/conv/mod.rs @@ -48,7 +48,6 @@ pub fn convert_from_timestamp_to_datetime_utc(duration: DurationSinceUnixEpoch) } #[cfg(test)] - mod tests { use chrono::DateTime; use torrust_tracker_primitives::DurationSinceUnixEpoch; From ba14fa3e7f9bba0fe2fc037568580c711269bd38 Mon Sep 17 00:00:00 2001 From: Jose Celano Date: Wed, 2 Oct 2024 13:33:08 +0100 Subject: [PATCH 4/4] release: version 3.0.0 --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 16 ++++++++-------- packages/clock/Cargo.toml | 2 +- packages/configuration/Cargo.toml | 2 +- packages/test-helpers/Cargo.toml | 2 +- packages/torrent-repository/Cargo.toml | 6 +++--- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d43356ca..050e2241 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3774,7 +3774,7 @@ dependencies = [ [[package]] name = "torrust-tracker" -version = "3.0.0-develop" +version = "3.0.0" dependencies = [ "anyhow", "aquatic_udp_protocol", @@ -3836,7 +3836,7 @@ dependencies = [ [[package]] name = "torrust-tracker-clock" -version = "3.0.0-develop" +version = "3.0.0" dependencies = [ "chrono", "lazy_static", @@ -3845,7 +3845,7 @@ dependencies = [ [[package]] name = "torrust-tracker-configuration" -version = "3.0.0-develop" +version = "3.0.0" dependencies = [ "camino", "derive_more", @@ -3862,7 +3862,7 @@ dependencies = [ [[package]] name = "torrust-tracker-contrib-bencode" -version = "3.0.0-develop" +version = "3.0.0" dependencies = [ "criterion", "thiserror", @@ -3870,7 +3870,7 @@ dependencies = [ [[package]] name = "torrust-tracker-located-error" -version = "3.0.0-develop" +version = "3.0.0" dependencies = [ "thiserror", "tracing", @@ -3878,7 +3878,7 @@ dependencies = [ [[package]] name = "torrust-tracker-primitives" -version = "3.0.0-develop" +version = "3.0.0" dependencies = [ "aquatic_udp_protocol", "binascii", @@ -3892,7 +3892,7 @@ dependencies = [ [[package]] name = "torrust-tracker-test-helpers" -version = "3.0.0-develop" +version = "3.0.0" dependencies = [ "rand", "torrust-tracker-configuration", @@ -3900,7 +3900,7 @@ dependencies = [ [[package]] name = "torrust-tracker-torrent-repository" -version = "3.0.0-develop" +version = "3.0.0" dependencies = [ "aquatic_udp_protocol", "async-std", diff --git a/Cargo.toml b/Cargo.toml index 47102a34..e362dafe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ license = "AGPL-3.0-only" publish = true repository = "https://github.com/torrust/torrust-tracker" rust-version = "1.72" -version = "3.0.0-develop" +version = "3.0.0" [dependencies] anyhow = "1" @@ -69,12 +69,12 @@ serde_repr = "0" serde_with = { version = "3", features = ["json"] } thiserror = "1" tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] } -torrust-tracker-clock = { version = "3.0.0-develop", path = "packages/clock" } -torrust-tracker-configuration = { version = "3.0.0-develop", path = "packages/configuration" } -torrust-tracker-contrib-bencode = { version = "3.0.0-develop", path = "contrib/bencode" } -torrust-tracker-located-error = { version = "3.0.0-develop", path = "packages/located-error" } -torrust-tracker-primitives = { version = "3.0.0-develop", path = "packages/primitives" } -torrust-tracker-torrent-repository = { version = "3.0.0-develop", path = "packages/torrent-repository" } +torrust-tracker-clock = { version = "3.0.0", path = "packages/clock" } +torrust-tracker-configuration = { version = "3.0.0", path = "packages/configuration" } +torrust-tracker-contrib-bencode = { version = "3.0.0", path = "contrib/bencode" } +torrust-tracker-located-error = { version = "3.0.0", path = "packages/located-error" } +torrust-tracker-primitives = { version = "3.0.0", path = "packages/primitives" } +torrust-tracker-torrent-repository = { version = "3.0.0", path = "packages/torrent-repository" } tower = { version = "0", features = ["timeout"] } tower-http = { version = "0", features = ["compression-full", "cors", "propagate-header", "request-id", "trace"] } trace = "0" @@ -90,7 +90,7 @@ ignored = ["crossbeam-skiplist", "dashmap", "figment", "parking_lot", "serde_byt [dev-dependencies] local-ip-address = "0" mockall = "0" -torrust-tracker-test-helpers = { version = "3.0.0-develop", path = "packages/test-helpers" } +torrust-tracker-test-helpers = { version = "3.0.0", path = "packages/test-helpers" } [workspace] members = [ diff --git a/packages/clock/Cargo.toml b/packages/clock/Cargo.toml index 2ede678d..ffb75fb7 100644 --- a/packages/clock/Cargo.toml +++ b/packages/clock/Cargo.toml @@ -19,6 +19,6 @@ version.workspace = true chrono = { version = "0", default-features = false, features = ["clock"] } lazy_static = "1" -torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" } +torrust-tracker-primitives = { version = "3.0.0", path = "../primitives" } [dev-dependencies] diff --git a/packages/configuration/Cargo.toml b/packages/configuration/Cargo.toml index 8706679f..1ba4830c 100644 --- a/packages/configuration/Cargo.toml +++ b/packages/configuration/Cargo.toml @@ -23,7 +23,7 @@ serde_json = { version = "1", features = ["preserve_order"] } serde_with = "3" thiserror = "1" toml = "0" -torrust-tracker-located-error = { version = "3.0.0-develop", path = "../located-error" } +torrust-tracker-located-error = { version = "3.0.0", path = "../located-error" } url = "2" [dev-dependencies] diff --git a/packages/test-helpers/Cargo.toml b/packages/test-helpers/Cargo.toml index ad291d20..b080c19d 100644 --- a/packages/test-helpers/Cargo.toml +++ b/packages/test-helpers/Cargo.toml @@ -16,4 +16,4 @@ version.workspace = true [dependencies] rand = "0" -torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" } +torrust-tracker-configuration = { version = "3.0.0", path = "../configuration" } diff --git a/packages/torrent-repository/Cargo.toml b/packages/torrent-repository/Cargo.toml index 32c32453..ba6a76f2 100644 --- a/packages/torrent-repository/Cargo.toml +++ b/packages/torrent-repository/Cargo.toml @@ -22,9 +22,9 @@ dashmap = "6" futures = "0" parking_lot = "0" tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] } -torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" } -torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" } -torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" } +torrust-tracker-clock = { version = "3.0.0", path = "../clock" } +torrust-tracker-configuration = { version = "3.0.0", path = "../configuration" } +torrust-tracker-primitives = { version = "3.0.0", path = "../primitives" } zerocopy = "0" [dev-dependencies]