From 681a5c5f8029b92996bcecbb2fa34cf82c048fb8 Mon Sep 17 00:00:00 2001 From: Daniel Boline Date: Mon, 18 Mar 2024 22:58:24 -0400 Subject: [PATCH] version bumps --- Cargo.toml | 6 +++--- fitbit_bot/Cargo.toml | 4 ++-- fitbit_lib/Cargo.toml | 8 ++++---- fitbit_lib/src/fitbit_archive.rs | 2 +- fitbit_lib/src/fitbit_heartrate.rs | 2 +- fitbit_lib/src/scale_measurement.rs | 2 +- garmin_cli/Cargo.toml | 4 ++-- garmin_connect_lib/Cargo.toml | 4 ++-- garmin_http/Cargo.toml | 8 ++++---- garmin_http/src/garmin_rust_routes.rs | 2 +- garmin_lib/Cargo.toml | 2 +- garmin_models/Cargo.toml | 4 ++-- garmin_models/src/garmin_sync.rs | 1 - garmin_parser/Cargo.toml | 2 +- garmin_reports/Cargo.toml | 2 +- garmin_utils/Cargo.toml | 6 +++--- garmin_utils/src/garmin_util.rs | 1 - garmin_utils/src/sport_types.rs | 2 +- race_result_analysis/Cargo.toml | 2 +- strava_lib/Cargo.toml | 6 +++--- 20 files changed, 34 insertions(+), 36 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6c85573c..23a44681 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garmin_rust" -version = "0.14.14" +version = "0.14.15" authors = ["Daniel Boline "] edition = "2018" @@ -15,7 +15,7 @@ Process and display info about gps activity files.""" [dependencies] anyhow = "1.0" clap = {version="4.0", features=["derive"]} -env_logger = "0.11" +env_logger = {version="0.11", features=["color", "humantime", "regex"], default_features = false} fitbit_bot = {path="fitbit_bot"} fitbit_lib = {path="fitbit_lib"} garmin_cli = {path="garmin_cli"} @@ -26,7 +26,7 @@ garmin_utils = {path="garmin_utils"} log = "0.4" stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types"], tag="0.9.2" } tempdir = "0.3" -tokio = {version="1.35", features=["rt", "macros", "rt-multi-thread"]} +tokio = {version="1.36", features=["rt", "macros", "rt-multi-thread"]} [workspace] members = [ diff --git a/fitbit_bot/Cargo.toml b/fitbit_bot/Cargo.toml index 25f40698..d369fe09 100644 --- a/fitbit_bot/Cargo.toml +++ b/fitbit_bot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fitbit_bot" -version = "0.14.14" +version = "0.14.15" authors = ["Daniel Boline "] edition = "2018" @@ -19,7 +19,7 @@ once_cell = "1.0" parking_lot = "0.12" stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types"], tag="0.9.2" } telegram-bot = {git = "https://github.com/ddboline/telegram-bot.git", tag="0.9.0-4", default_features=false} -tokio = {version="1.35", features=["rt", "macros", "rt-multi-thread"]} +tokio = {version="1.36", features=["rt", "macros", "rt-multi-thread"]} [dev-dependencies] maplit = "1.0" diff --git a/fitbit_lib/Cargo.toml b/fitbit_lib/Cargo.toml index cdbfd8ff..b3a298c0 100644 --- a/fitbit_lib/Cargo.toml +++ b/fitbit_lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fitbit_lib" -version = "0.14.14" +version = "0.14.15" authors = ["Daniel Boline "] edition = "2018" @@ -9,7 +9,7 @@ edition = "2018" [dependencies] anyhow = "1.0" avro-rs = {version = "0.13", features = ["snappy"]} -base64 = "0.21" +base64 = "0.22" bytes = "1.0" crossbeam-utils = "0.8" derive_more = "0.99" @@ -23,7 +23,7 @@ itertools = "0.12" log = "0.4" maplit = "1.0" once_cell = "1.0" -polars = {version="0.37", features=["temporal", "parquet", "lazy"]} +polars = {version="0.38", features=["temporal", "parquet", "lazy"]} postgres_query = {git = "https://github.com/ddboline/rust-postgres-query", tag = "0.3.6", features=["deadpool"]} rand = "0.8" rayon = "1.5" @@ -35,7 +35,7 @@ stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", featur statistical = "1.0" time = {version="0.3", features=["serde-human-readable", "macros", "formatting", "parsing"]} time-tz = {version="2.0", features=["system"]} -tokio = {version="1.35", features=["rt", "macros", "rt-multi-thread"]} +tokio = {version="1.36", features=["rt", "macros", "rt-multi-thread"]} uuid = { version = "1.0", features = ["serde", "v4"] } [dev-dependencies] diff --git a/fitbit_lib/src/fitbit_archive.rs b/fitbit_lib/src/fitbit_archive.rs index 002eb595..098df8bd 100644 --- a/fitbit_lib/src/fitbit_archive.rs +++ b/fitbit_lib/src/fitbit_archive.rs @@ -4,7 +4,7 @@ use log::info; use polars::{ df as dataframe, prelude::{ - col, ChunkAgg, IntoLazy, NamedFrom, ParquetReader, ParquetWriter, SerReader, + col, ChunkAgg, IntoLazy, ParquetReader, ParquetWriter, SerReader, UniqueKeepStrategy, }, }; diff --git a/fitbit_lib/src/fitbit_heartrate.rs b/fitbit_lib/src/fitbit_heartrate.rs index 71f8abac..77e9d664 100644 --- a/fitbit_lib/src/fitbit_heartrate.rs +++ b/fitbit_lib/src/fitbit_heartrate.rs @@ -8,7 +8,7 @@ use rayon::{ iter::{IntoParallelIterator, ParallelExtend, ParallelIterator}, slice::ParallelSliceMut, }; -use serde::{self, Deserialize, Deserializer, Serialize}; +use serde::{Deserialize, Deserializer, Serialize}; use smallvec::SmallVec; use stack_string::{format_sstr, StackString}; use std::{ diff --git a/fitbit_lib/src/scale_measurement.rs b/fitbit_lib/src/scale_measurement.rs index cd7d4898..a531b49f 100644 --- a/fitbit_lib/src/scale_measurement.rs +++ b/fitbit_lib/src/scale_measurement.rs @@ -3,7 +3,7 @@ use futures::{stream::FuturesUnordered, TryStreamExt}; use log::debug; use postgres_query::{query, query_dyn, FromSqlRow, Parameter}; use rayon::iter::{IntoParallelIterator, ParallelIterator}; -use serde::{self, Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use smallvec::SmallVec; use stack_string::format_sstr; use std::{collections::HashSet, fmt, sync::Arc}; diff --git a/garmin_cli/Cargo.toml b/garmin_cli/Cargo.toml index 742080f6..6357ec8b 100644 --- a/garmin_cli/Cargo.toml +++ b/garmin_cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garmin_cli" -version = "0.14.14" +version = "0.14.15" authors = ["Daniel Boline "] edition = "2018" @@ -30,7 +30,7 @@ strava_lib = {path="../strava_lib"} tempdir = "0.3" time = {version="0.3", features=["serde-human-readable", "macros", "formatting", "parsing"]} time-tz = {version="2.0", features=["system"]} -tokio = {version="1.35", features=["rt", "macros", "rt-multi-thread"]} +tokio = {version="1.36", features=["rt", "macros", "rt-multi-thread"]} tokio-postgres = {version = "0.7", features = ["with-time-0_3"]} stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types"], tag="0.9.2" } stdout-channel = "0.6" diff --git a/garmin_connect_lib/Cargo.toml b/garmin_connect_lib/Cargo.toml index 77f606a4..0e6c7fd1 100644 --- a/garmin_connect_lib/Cargo.toml +++ b/garmin_connect_lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garmin_connect_lib" -version = "0.14.14" +version = "0.14.15" authors = ["Daniel Boline "] edition = "2018" @@ -22,5 +22,5 @@ smallvec = "1.6" stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types"], tag="0.9.2" } time = {version="0.3", features=["serde-human-readable", "macros", "formatting", "parsing"]} time-tz = {version="2.0", features=["system"]} -tokio = {version="1.35", features=["rt", "macros", "rt-multi-thread"]} +tokio = {version="1.36", features=["rt", "macros", "rt-multi-thread"]} url = "2.3" diff --git a/garmin_http/Cargo.toml b/garmin_http/Cargo.toml index 05872e06..128f787c 100644 --- a/garmin_http/Cargo.toml +++ b/garmin_http/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "garmin_http" -version = "0.14.14" +version = "0.14.15" authors = ["Daniel Boline "] edition = "2018" [dependencies] anyhow = "1.0" -authorized_users = { git = "https://github.com/ddboline/auth_server_rust.git", tag="0.11.9"} -base64 = "0.21" +authorized_users = { git = "https://github.com/ddboline/auth_server_rust.git", tag="0.11.12"} +base64 = "0.22" cookie = {version="0.18", features=["percent-encode"]} derive_more = "0.99" dioxus = "0.4" @@ -40,7 +40,7 @@ tempdir = "0.3" thiserror = "1.0" time = {version="0.3", features=["serde-human-readable", "macros", "formatting", "parsing"]} time-tz = {version="2.0", features=["system"]} -tokio = {version="1.35", features=["rt", "macros", "rt-multi-thread"]} +tokio = {version="1.36", features=["rt", "macros", "rt-multi-thread"]} tokio-stream = "0.1" url = "2.3" uuid = "1.0" diff --git a/garmin_http/src/garmin_rust_routes.rs b/garmin_http/src/garmin_rust_routes.rs index b752e5ff..4793e7ec 100644 --- a/garmin_http/src/garmin_rust_routes.rs +++ b/garmin_http/src/garmin_rust_routes.rs @@ -14,7 +14,7 @@ use rweb_helper::{ }; use serde::{Deserialize, Serialize}; use stack_string::{format_sstr, StackString}; -use std::{convert::Infallible, string::ToString}; +use std::convert::Infallible; use tempdir::TempDir; use tokio::{fs::File, io::AsyncWriteExt, task::spawn_blocking}; use tokio_stream::StreamExt; diff --git a/garmin_lib/Cargo.toml b/garmin_lib/Cargo.toml index 8aadb4d1..4514621e 100644 --- a/garmin_lib/Cargo.toml +++ b/garmin_lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garmin_lib" -version = "0.14.14" +version = "0.14.15" authors = ["Daniel Boline "] edition = "2018" diff --git a/garmin_models/Cargo.toml b/garmin_models/Cargo.toml index 2721b021..28a035c7 100644 --- a/garmin_models/Cargo.toml +++ b/garmin_models/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garmin_models" -version = "0.14.14" +version = "0.14.15" authors = ["Daniel Boline "] edition = "2021" @@ -27,7 +27,7 @@ serde_json = "1.0" stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types"], tag="0.9.2" } time = {version="0.3", features=["serde-human-readable", "macros", "formatting", "parsing"]} time-tz = {version="2.0", features=["system"]} -tokio = {version="1.35", features=["rt", "macros", "rt-multi-thread"]} +tokio = {version="1.36", features=["rt", "macros", "rt-multi-thread"]} uuid = { version = "1.0", features = ["serde", "v4"] } url = "2.3" diff --git a/garmin_models/src/garmin_sync.rs b/garmin_models/src/garmin_sync.rs index 2b4c0b48..e1717aa3 100644 --- a/garmin_models/src/garmin_sync.rs +++ b/garmin_models/src/garmin_sync.rs @@ -16,7 +16,6 @@ use stack_string::{format_sstr, StackString}; use std::{ borrow::Borrow, collections::{HashMap, HashSet}, - convert::TryInto, ffi::OsStr, fmt::Write, fs, diff --git a/garmin_parser/Cargo.toml b/garmin_parser/Cargo.toml index 9df19b01..edaa63e4 100644 --- a/garmin_parser/Cargo.toml +++ b/garmin_parser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garmin_parser" -version = "0.14.14" +version = "0.14.15" authors = ["Daniel Boline "] edition = "2021" diff --git a/garmin_reports/Cargo.toml b/garmin_reports/Cargo.toml index 355b8e84..a5d54502 100644 --- a/garmin_reports/Cargo.toml +++ b/garmin_reports/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garmin_reports" -version = "0.14.14" +version = "0.14.15" authors = ["Daniel Boline "] edition = "2018" diff --git a/garmin_utils/Cargo.toml b/garmin_utils/Cargo.toml index 6c946253..bc57ea6b 100644 --- a/garmin_utils/Cargo.toml +++ b/garmin_utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garmin_utils" -version = "0.14.14" +version = "0.14.15" authors = ["Daniel Boline "] edition = "2021" @@ -8,7 +8,7 @@ edition = "2021" [dependencies] anyhow = "1.0" -base64 = "0.21" +base64 = "0.22" bytes = "1.0" deadpool-postgres = "0.12" fitparser = {git="https://github.com/ddboline/fitparse-rs.git", branch="time-0.3-0.5.2"} @@ -25,7 +25,7 @@ stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", featur subprocess = "0.2" time = {version="0.3", features=["serde-human-readable", "macros", "formatting", "parsing"]} time-tz = {version="2.0", features=["system"]} -tokio = {version="1.35", features=["rt", "macros", "rt-multi-thread"]} +tokio = {version="1.36", features=["rt", "macros", "rt-multi-thread"]} tokio-postgres = {version = "0.7", features = ["with-time-0_3", "with-uuid-1"]} url = "2.3" uuid = { version = "1.0", features = ["serde", "v4"] } diff --git a/garmin_utils/src/garmin_util.rs b/garmin_utils/src/garmin_util.rs index 631e7984..21a564e6 100644 --- a/garmin_utils/src/garmin_util.rs +++ b/garmin_utils/src/garmin_util.rs @@ -14,7 +14,6 @@ use smallvec::SmallVec; use stack_string::{format_sstr, StackString}; use std::{ collections::HashSet, - convert::TryInto, fs::{remove_file, File}, future::Future, io::{BufRead, BufReader, Read}, diff --git a/garmin_utils/src/sport_types.rs b/garmin_utils/src/sport_types.rs index 5dde3cbb..2d4a6895 100644 --- a/garmin_utils/src/sport_types.rs +++ b/garmin_utils/src/sport_types.rs @@ -3,7 +3,7 @@ use bytes::BytesMut; use once_cell::sync::Lazy; use serde::{Deserialize, Deserializer, Serialize, Serializer}; use stack_string::StackString; -use std::{collections::HashMap, convert::TryFrom, fmt, str::FromStr}; +use std::{collections::HashMap, fmt, str::FromStr}; use tokio_postgres::types::{FromSql, IsNull, ToSql, Type}; static SPORT_TYPE_MAP: Lazy> = Lazy::new(init_sport_type_map); diff --git a/race_result_analysis/Cargo.toml b/race_result_analysis/Cargo.toml index 6a8f42c4..100eb8a9 100644 --- a/race_result_analysis/Cargo.toml +++ b/race_result_analysis/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "race_result_analysis" -version = "0.14.14" +version = "0.14.15" authors = ["Daniel Boline "] edition = "2018" diff --git a/strava_lib/Cargo.toml b/strava_lib/Cargo.toml index 4f8ad748..cba9f6d3 100644 --- a/strava_lib/Cargo.toml +++ b/strava_lib/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "strava_lib" -version = "0.14.14" +version = "0.14.15" authors = ["Daniel Boline "] edition = "2018" [dependencies] anyhow = "1.0" -base64 = "0.21" +base64 = "0.22" crossbeam-utils = "0.8" futures = "0.3" garmin_lib = { path = "../garmin_lib" } @@ -24,6 +24,6 @@ stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", featur tempfile = "3.1" time = {version="0.3", features=["serde-human-readable", "macros", "formatting", "parsing"]} time-tz = {version="2.0", features=["system"]} -tokio = {version="1.35", features=["rt", "macros", "rt-multi-thread"]} +tokio = {version="1.36", features=["rt", "macros", "rt-multi-thread"]} tokio-stream = "0.1" uuid = "1.0"