From 5432bc5332dc4fff9bbfd9f663415ffc0ca0841c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 04:58:59 +0000 Subject: [PATCH 1/4] Update pyo3 requirement from 0.19.0 to 0.20.0 Updates the requirements on [pyo3](https://github.com/pyo3/pyo3) to permit the latest version. - [Release notes](https://github.com/pyo3/pyo3/releases) - [Changelog](https://github.com/PyO3/pyo3/blob/main/CHANGELOG.md) - [Commits](https://github.com/pyo3/pyo3/compare/v0.19.0...v0.19.2) --- updated-dependencies: - dependency-name: pyo3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index e9beedff..d4429cbd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,7 +56,7 @@ rayon = "1.6" lazy_static = "1.4.0" approx = "0.5" rand_pcg = "0.3" -pyo3 = { version = "0.19.0", optional = true, features = ["extension-module"] } +pyo3 = { version = "0.20.0", optional = true, features = ["extension-module"] } pyo3-log = { version = "0.9.0", optional = true } numpy = { version = "0.19", optional = true } indicatif = { version = "0.17", features = ["rayon"] } From 55e0f04f2cf1357dbda52a0e2070fc9e796aefc7 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 21 Nov 2023 14:08:39 -0700 Subject: [PATCH 2/4] Update to hifitime 3.8.5 for pyo3 0.20 --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d4429cbd..b2b95b1e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ gitlab = { repository = "nyx-space/nyx", branch = "master" } [dependencies] nalgebra = "=0.32" log = "0.4" -hifitime = { version = "3.8.3", features = ["std"] } +hifitime = "3.8.5" flate2 = { version = "1.0", features = [ "rust_backend", ], default-features = false } @@ -58,7 +58,7 @@ approx = "0.5" rand_pcg = "0.3" pyo3 = { version = "0.20.0", optional = true, features = ["extension-module"] } pyo3-log = { version = "0.9.0", optional = true } -numpy = { version = "0.19", optional = true } +numpy = { version = "0.20", optional = true } indicatif = { version = "0.17", features = ["rayon"] } rstats = "2.0.1" thiserror = "1.0" @@ -75,7 +75,7 @@ num = "0.4.0" enum-iterator = "1.4.0" getrandom = { version = "0.2", features = ["js"] } typed-builder = "0.17.0" -pythonize = { version = "0.19", optional = true } +pythonize = { version = "0.20", optional = true } [dev-dependencies] polars = { version = "0.34.2", features = ["parquet"] } From b01c7e5050f3d390efc107b86902371b64c65da3 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 21 Nov 2023 14:10:38 -0700 Subject: [PATCH 3/4] Update Cargo.toml for conflicts --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b2b95b1e..77d1b9c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ gitlab = { repository = "nyx-space/nyx", branch = "master" } [dependencies] nalgebra = "=0.32" log = "0.4" -hifitime = "3.8.5" +hifitime = { version = "3.8.5", features = [ "std" ] } flate2 = { version = "1.0", features = [ "rust_backend", ], default-features = false } @@ -74,7 +74,7 @@ either = { version = "1.8.1", features = ["serde"] } num = "0.4.0" enum-iterator = "1.4.0" getrandom = { version = "0.2", features = ["js"] } -typed-builder = "0.17.0" +typed-builder = "0.18.0" pythonize = { version = "0.20", optional = true } [dev-dependencies] From e911822a1d9fdcf587ccb16478af7898cfd9de18 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 21 Nov 2023 14:11:39 -0700 Subject: [PATCH 4/4] Update Cargo.toml again --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 77d1b9c2..7391feed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ gitlab = { repository = "nyx-space/nyx", branch = "master" } [dependencies] nalgebra = "=0.32" log = "0.4" -hifitime = { version = "3.8.5", features = [ "std" ] } +hifitime = { version = "3.8.5", features = ["std"] } flate2 = { version = "1.0", features = [ "rust_backend", ], default-features = false }