Skip to content

Commit

Permalink
version bumps
Browse files Browse the repository at this point in the history
  • Loading branch information
ddboline committed Apr 28, 2024
1 parent 681a5c5 commit b922896
Show file tree
Hide file tree
Showing 24 changed files with 296 additions and 236 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "garmin_rust"
version = "0.14.15"
version = "0.14.16"
authors = ["Daniel Boline <[email protected]>"]
edition = "2018"

Expand All @@ -24,9 +24,9 @@ garmin_lib = { path = "garmin_lib" }
garmin_models = {path="garmin_models"}
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" }
stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types"], tag="0.9.3" }
tempdir = "0.3"
tokio = {version="1.36", features=["rt", "macros", "rt-multi-thread"]}
tokio = {version="1.37", features=["rt", "macros", "rt-multi-thread"]}

[workspace]
members = [
Expand Down
8 changes: 4 additions & 4 deletions fitbit_bot/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fitbit_bot"
version = "0.14.15"
version = "0.14.16"
authors = ["Daniel Boline <[email protected]>"]
edition = "2018"

Expand All @@ -17,12 +17,12 @@ futures = "0.3"
log = "0.4"
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" }
stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types"], tag="0.9.3" }
telegram-bot = {git = "https://github.com/ddboline/telegram-bot.git", tag="0.9.0-4", default_features=false}
tokio = {version="1.36", features=["rt", "macros", "rt-multi-thread"]}
tokio = {version="1.37", features=["rt", "macros", "rt-multi-thread"]}

[dev-dependencies]
maplit = "1.0"
rand = "0.8"
postgres_query = {git = "https://github.com/ddboline/rust-postgres-query", tag = "0.3.6", features=["deadpool"]}
postgres_query = {git = "https://github.com/ddboline/rust-postgres-query", tag = "0.3.7", features=["deadpool"]}
uuid = { version = "1.0", features = ["serde", "v4"] }
6 changes: 3 additions & 3 deletions fitbit_bot/src/telegram_bot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,18 @@ impl TelegramBot {
let bot = self.clone();
spawn(async move { bot.fill_telegram_user_ids().await })
};
self.telegram_loop().await?;
Box::pin(self.telegram_loop()).await?;
fill_user_ids.await?
}

async fn telegram_loop(&self) -> Result<(), Error> {
loop {
FAILURE_COUNT.check()?;

match tokio::time::timeout(
match Box::pin(tokio::time::timeout(
tokio::time::Duration::from_secs(3600),
self._telegram_worker(),
)
))
.await
{
Err(_) | Ok(Ok(())) => FAILURE_COUNT.reset()?,
Expand Down
12 changes: 6 additions & 6 deletions fitbit_lib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fitbit_lib"
version = "0.14.15"
version = "0.14.16"
authors = ["Daniel Boline <[email protected]>"]
edition = "2018"

Expand All @@ -23,19 +23,19 @@ itertools = "0.12"
log = "0.4"
maplit = "1.0"
once_cell = "1.0"
polars = {version="0.38", features=["temporal", "parquet", "lazy"]}
postgres_query = {git = "https://github.com/ddboline/rust-postgres-query", tag = "0.3.6", features=["deadpool"]}
polars = {version="0.39", features=["temporal", "parquet", "lazy"]}
postgres_query = {git = "https://github.com/ddboline/rust-postgres-query", tag = "0.3.7", features=["deadpool"]}
rand = "0.8"
rayon = "1.5"
reqwest = {version="0.11", features=["cookies", "json", "rustls-tls", "stream"], default_features=false}
reqwest = {version="0.12", features=["cookies", "json", "rustls-tls", "stream"], default_features=false}
serde = {version="1.0", features=["derive"]}
serde_json = "1.0"
smallvec = "1.6"
stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types"], tag="0.9.2" }
stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types"], tag="0.9.3" }
statistical = "1.0"
time = {version="0.3", features=["serde-human-readable", "macros", "formatting", "parsing"]}
time-tz = {version="2.0", features=["system"]}
tokio = {version="1.36", features=["rt", "macros", "rt-multi-thread"]}
tokio = {version="1.37", features=["rt", "macros", "rt-multi-thread"]}
uuid = { version = "1.0", features = ["serde", "v4"] }

[dev-dependencies]
Expand Down
3 changes: 1 addition & 2 deletions fitbit_lib/src/fitbit_archive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ use log::info;
use polars::{
df as dataframe,
prelude::{
col, ChunkAgg, IntoLazy, ParquetReader, ParquetWriter, SerReader,
UniqueKeepStrategy,
col, ChunkAgg, IntoLazy, ParquetReader, ParquetWriter, SerReader, UniqueKeepStrategy,
},
};
use stack_string::{format_sstr, StackString};
Expand Down
2 changes: 1 addition & 1 deletion fitbit_lib/src/fitbit_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,7 @@ impl ActivityLoggingEntry {
}
}

#[derive(Serialize, Deserialize, Debug, PartialEq)]
#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
pub struct FitbitUserProfile {
#[serde(alias = "averageDailySteps")]
pub average_daily_steps: u64,
Expand Down
6 changes: 3 additions & 3 deletions garmin_cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "garmin_cli"
version = "0.14.15"
version = "0.14.16"
authors = ["Daniel Boline <[email protected]>"]
edition = "2018"

Expand Down Expand Up @@ -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.36", features=["rt", "macros", "rt-multi-thread"]}
tokio = {version="1.37", 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" }
stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types"], tag="0.9.3" }
stdout-channel = "0.6"
3 changes: 2 additions & 1 deletion garmin_cli/src/garmin_cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ impl GarminCli {
async move { gsync.sync_dir(title, local_dir, s3_bucket, &pool).await }
});
let mut results = try_join_all(futures).await?;
results.extend_from_slice(&archive_fitbit_heartrates(&self.config, &self.pool, false).await?);
results
.extend_from_slice(&archive_fitbit_heartrates(&self.config, &self.pool, false).await?);
Ok(results)
}

Expand Down
8 changes: 4 additions & 4 deletions garmin_connect_lib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "garmin_connect_lib"
version = "0.14.15"
version = "0.14.16"
authors = ["Daniel Boline <[email protected]>"]
edition = "2018"

Expand All @@ -15,12 +15,12 @@ futures = "0.3"
garmin_lib = {path="../garmin_lib"}
itertools = "0.12"
log = "0.4"
reqwest = {version="0.11", features=["cookies", "json", "rustls-tls", "stream"], default_features=false}
reqwest = {version="0.12", features=["cookies", "json", "rustls-tls", "stream"], default_features=false}
serde = {version="1.0", features=["derive"]}
serde_json = "1.0"
smallvec = "1.6"
stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types"], tag="0.9.2" }
stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types"], tag="0.9.3" }
time = {version="0.3", features=["serde-human-readable", "macros", "formatting", "parsing"]}
time-tz = {version="2.0", features=["system"]}
tokio = {version="1.36", features=["rt", "macros", "rt-multi-thread"]}
tokio = {version="1.37", features=["rt", "macros", "rt-multi-thread"]}
url = "2.3"
21 changes: 11 additions & 10 deletions garmin_http/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
[package]
name = "garmin_http"
version = "0.14.15"
version = "0.14.16"
authors = ["Daniel Boline <[email protected]>"]
edition = "2018"

[dependencies]
anyhow = "1.0"
authorized_users = { git = "https://github.com/ddboline/auth_server_rust.git", tag="0.11.12"}
authorized_users = { git = "https://github.com/ddboline/auth_server_rust.git", tag="0.11.13"}
base64 = "0.22"
cookie = {version="0.18", features=["percent-encode"]}
derive_more = "0.99"
dioxus = "0.4"
dioxus-ssr = "0.4"
dioxus = "0.5"
dioxus-core = "0.5"
dioxus-ssr = "0.5"
fitbit_lib = {path="../fitbit_lib/"}
futures = "0.3"
garmin_cli = {path = "../garmin_cli"}
Expand All @@ -25,22 +26,22 @@ itertools = "0.12"
log = "0.4"
maplit = "1.0"
parking_lot = "0.12"
postgres_query = {git = "https://github.com/ddboline/rust-postgres-query", tag = "0.3.6", features=["deadpool"]}
postgres_query = {git = "https://github.com/ddboline/rust-postgres-query", tag = "0.3.7", features=["deadpool"]}
race_result_analysis = {path="../race_result_analysis"}
reqwest = {version="0.11", features=["cookies", "json", "rustls-tls", "stream"], default_features=false}
rweb = {git = "https://github.com/ddboline/rweb.git", features=["openapi"], default-features=false, tag="0.15.1-1"}
rweb-helper = { git = "https://github.com/ddboline/rweb_helper.git", tag="0.5.1" }
reqwest = {version="0.12", features=["cookies", "json", "rustls-tls", "stream"], default_features=false}
rweb = {git = "https://github.com/ddboline/rweb.git", features=["openapi"], default-features=false, tag="0.15.2"}
rweb-helper = { git = "https://github.com/ddboline/rweb_helper.git", tag="0.5.3" }
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
serde_yaml = "0.9"
stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types", "rweb-openapi"], tag="0.9.2" }
stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types", "rweb-openapi"], tag="0.9.3" }
strava_lib = {path="../strava_lib/"}
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.36", features=["rt", "macros", "rt-multi-thread"]}
tokio = {version="1.37", features=["rt", "macros", "rt-multi-thread"]}
tokio-stream = "0.1"
url = "2.3"
uuid = "1.0"
Loading

0 comments on commit b922896

Please sign in to comment.