Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies & stricter clippy #1

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Update dependencies & stricter clippy #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e30f00b
Set workspace resolver
mladedav Aug 29, 2024
c89469e
Upgrade dependencies
mladedav Aug 29, 2024
c8ee54c
Setup stricter clippy
mladedav Aug 29, 2024
5bdb4ac
Add rust-toolchain.toml file
mladedav Aug 29, 2024
0168005
Fix new clippy lints
mladedav Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions spotflow-c/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ crate-type = ["cdylib", "staticlib"]
spotflow = { path = "../spotflow", version = "0.7.0", features = ["openssl-vendored"] }
anyhow = "1.0.57"
chrono = "0.4.20"
simple_logger = { version = "4.3.0", features = ["stderr"] }
http = "0.2.6"
simple_logger = { version = "5.0.0", features = ["stderr"] }
http = "1.1.0"
# Used because stable std does not have c_size_t
libc = "0.2.121"
log = "0.4.16"

[build-dependencies]
cbindgen = "0.21.0"
cbindgen = "0.26.0"
2 changes: 1 addition & 1 deletion spotflow-py/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ crate-type = ["cdylib"]
[dependencies]
chrono = "0.4.19"
spotflow = { path = "../spotflow", version = "0.7.0", features = ["openssl-vendored"] }
http = "0.2.8"
http = "1.1.0"
log = "0.4.17"
pyo3 = { version = "0.19.0", features = ["extension-module", "serde", "abi3-py37"] }
pyo3-log = "0.8.2"
Expand Down
14 changes: 7 additions & 7 deletions spotflow/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,33 @@ openssl-vendored = ["openssl/vendored"]
[dependencies]
anyhow = "1.0.56"
async-trait = "0.1.61"
brotli = "3.3.4"
brotli = "6.0.0"
chrono = { version = "0.4.19", features = ["serde"] }
http = "0.2.6"
json-patch = "0.2.6"
http = "1.1.0"
json-patch = "2.0.0"
log = "0.4.16"
native-tls = "0.2.8"
openssl = { version = "0.10.29", optional = true }
rumqttc = { package = "spotflow-rumqttc-fork", version = "0.12.0", features = ["use-native-tls"], default-features = false }
serde = { version = "1.0.136", features = ["derive"] }
serde_json = "1.0.79"
sqlx = { version = "0.6.2", features = ["sqlite", "chrono", "macros", "runtime-tokio-native-tls", "offline"] }
sqlx = { version = "0.7.4", features = ["sqlite", "chrono", "macros", "runtime-tokio", "tls-native-tls"] }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw that sqlx changed the format of its offline query metadata - instead of using the single file sqlx-data.json they now save the queries as individual files to the .sqlx directory. Therefore, the CI build fails now. Can you please run cargo sqlx prepare in the spotflow directory (you'll probably need to run cargo install [email protected] before that) and then commit all the generated files? And also delete sqlx-data.json?

Btw. I'd like to investigate if it wouldn't be easier to just use dev.db on CI as well so that we could get rid of calling cargo sqlx prepare altogether. Do you think it would work? Or are there any problems you encountered when working on this earlier?

thiserror = "1.0.30"
time = "0.3.36"
tokio = { version = "1.17.0", features = ["rt", "sync", "macros"] }
tokio = { version = "1.17.0", features = ["rt", "sync", "macros", "rt-multi-thread"] }
tokio-util = "0.7.1"
ureq = { version = "2.4.0", features = ["json", "native-tls"], default-features = false }
urlencoding = "2.1.0"
uuid = { version = "1.0.0", features = ["v4"] }

[build-dependencies]
tokio = { version = "1.17.0", features = ["rt"] }
sqlx = { version = "0.6.2", features = ["sqlite", "runtime-tokio-native-tls"] }
sqlx = { version = "0.7.4", features = ["sqlite", "runtime-tokio-native-tls"] }

[dev-dependencies]
azure_core = "0.1.1"
azure_identity = "0.1.1"
env_logger = "0.9.0"
env_logger = "0.11.0"
azure_storage = "0.1.0"
azure_storage_blobs = "0.1.0"
oauth2 = "4.1.0"
Expand Down