Skip to content

Commit

Permalink
Merge pull request #287 from shachlanAmazon/update-deps
Browse files Browse the repository at this point in the history
Update dependencies and remove unused.
  • Loading branch information
shachlanAmazon committed Jun 22, 2023
2 parents fc1c028 + e4e4996 commit 23f8eb7
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 22 deletions.
17 changes: 5 additions & 12 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@
"node/rust-client/Cargo.toml",
"logger_core/Cargo.toml",
"csharp/lib/Cargo.toml",
"submodules/redis-rs/Cargo.toml"
"submodules/redis-rs/Cargo.toml",
"rust-benchmark/Cargo.toml"
],
"rust-analyzer.runnableEnv": {
"REDISRS_SERVER_TYPE": "tcp"
},
"python.testing.pytestArgs": [
"python"
],
"python.testing.pytestArgs": ["python"],
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true,
"[yaml]": {
Expand All @@ -33,12 +32,6 @@
"--extend-ignore=E203",
"--max-line-length=127"
],
"python.formatting.blackArgs": [
"--target-version",
"py36"
],
"isort.args": [
"--profile",
"black"
],
"python.formatting.blackArgs": ["--target-version", "py36"],
"isort.args": ["--profile", "black"]
}
9 changes: 3 additions & 6 deletions babushka-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@ license = "Apache-2.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
byteorder = "^1.4"
bytes = "^1.3"
futures = "^0.3"
lifeguard = "^0.6"
num-derive = "^0.3"
num-traits = "^0.2"
redis = { path = "../submodules/redis-rs/redis", features = ["aio", "tokio-comp", "tls", "tokio-rustls-comp", "connection-manager","cluster", "cluster-async"] }
signal-hook = "^0.3"
Expand All @@ -30,10 +27,10 @@ futures-intrusive = "0.5.0"

[dev-dependencies]
rsevents = "0.3.1"
socket2 = "0.4.7"
socket2 = "^0.5"
tempfile = "3.3.0"
rstest = "0.16.0"
criterion = { version = "0.4", features = ["html_reports", "async_tokio"] }
rstest = "^0.17"
criterion = { version = "^0.5", features = ["html_reports", "async_tokio"] }
which = "4.4.0"
ctor = "0.2.2"
redis = { path = "../submodules/redis-rs/redis", features = ["tls-rustls-insecure"] }
Expand Down
1 change: 0 additions & 1 deletion logger_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ license = "Apache-2.0"
tracing = "0.1"
tracing-appender = "0.2.2"
once_cell = "1.16.0"
file-rotate = "0.7.1"
tracing-subscriber = "0.3.16"
4 changes: 2 additions & 2 deletions python/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ name = "pybushka"
crate-type = ["cdylib"]

[dependencies]
pyo3 = { version = "0.17", features = ["extension-module"] }
pyo3-asyncio = { version = "0.17", features = ["tokio-runtime"] }
pyo3 = { version = "^0.18", features = ["extension-module"] }
pyo3-asyncio = { version = "^0.18", features = ["tokio-runtime"] }
redis = { path = "../submodules/redis-rs/redis", features = ["aio", "tokio-comp", "connection-manager", "tls", "tokio-rustls-comp"] }
babushka = { path = "../babushka-core" }
tokio = { version = "^1", features = ["rt", "macros", "rt-multi-thread", "time"] }
Expand Down
2 changes: 1 addition & 1 deletion python/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ impl AsyncPipeline {
this
}

#[args(ignore_result = false)]
#[pyo3(signature = (key, value, ignore_result = false))]
fn set(this: &PyCell<Self>, key: String, value: String, ignore_result: bool) -> &PyCell<Self> {
let mut pipeline = this.borrow_mut();
pipeline.internal_pipeline.set(key, value);
Expand Down

0 comments on commit 23f8eb7

Please sign in to comment.