From 8b5cd2fe2d7681a6b7d5e11c0861e81e53889fab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 10:37:22 +0000 Subject: [PATCH 1/2] build(deps): bump pyo3 from 0.17.3 to 0.20.0 Bumps [pyo3](https://github.com/pyo3/pyo3) from 0.17.3 to 0.20.0. - [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.17.3...v0.20.0) --- updated-dependencies: - dependency-name: pyo3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 58 ++++++++++++++++++++++++++++++++++----------------- py/Cargo.toml | 2 +- 2 files changed, 40 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2bf20e0b..69571a9e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -222,7 +222,7 @@ dependencies = [ "cfg-if", "crossbeam-utils", "lazy_static", - "memoffset", + "memoffset 0.6.5", "scopeguard", ] @@ -405,9 +405,9 @@ dependencies = [ [[package]] name = "indoc" -version = "1.0.7" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "instant" @@ -541,6 +541,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -847,16 +856,16 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.17.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543" +checksum = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b" dependencies = [ "cfg-if", "indoc", "libc", - "memoffset", + "memoffset 0.9.0", "parking_lot 0.12.0", - "pyo3-build-config", + "pyo3-build-config 0.20.0", "pyo3-ffi", "pyo3-macros", "unindent", @@ -872,37 +881,48 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "pyo3-build-config" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5" +dependencies = [ + "once_cell", + "target-lexicon", +] + [[package]] name = "pyo3-ffi" -version = "0.17.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc" +checksum = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b" dependencies = [ "libc", - "pyo3-build-config", + "pyo3-build-config 0.20.0", ] [[package]] name = "pyo3-macros" -version = "0.17.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" +checksum = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 1.0.94", + "syn 2.0.39", ] [[package]] name = "pyo3-macros-backend" -version = "0.17.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" +checksum = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424" dependencies = [ + "heck 0.4.0", "proc-macro2", "quote", - "syn 1.0.94", + "syn 2.0.39", ] [[package]] @@ -1162,7 +1182,7 @@ dependencies = [ "dunce", "prost-build", "pyo3", - "pyo3-build-config", + "pyo3-build-config 0.17.3", "substrait-validator", "walkdir", ] @@ -1349,9 +1369,9 @@ checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "unindent" -version = "0.1.8" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514672a55d7380da379785a4d70ca8386c8883ff7eaae877be4d2081cebe73d8" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "unsafe-libyaml" diff --git a/py/Cargo.toml b/py/Cargo.toml index 49f69ca8..ed25e55d 100644 --- a/py/Cargo.toml +++ b/py/Cargo.toml @@ -30,7 +30,7 @@ doc = false [dependencies] substrait-validator = { path = "../rs", version = "0.0.11" } -pyo3 = { version = "0.17.3", features = ["extension-module"] } +pyo3 = { version = "0.20.0", features = ["extension-module"] } [build-dependencies] prost-build = "0.10" From 2a2528bccbfd9cf846ab7cb5e5f61927269c043f Mon Sep 17 00:00:00 2001 From: Matthijs Brobbel Date: Mon, 4 Dec 2023 12:46:09 +0100 Subject: [PATCH 2/2] fix: fix patch --- ci/version-diff-template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/version-diff-template b/ci/version-diff-template index 26471f4a..3e9e68fb 100644 --- a/ci/version-diff-template +++ b/ci/version-diff-template @@ -49,7 +49,7 @@ index c095a2d..32108ad 100644 [dependencies] -substrait-validator = {{ path = "../rs", version = "{frm}" }} +substrait-validator = {{ path = "../rs", version = "{to}" }} - pyo3 = {{ version = "0.17.3", features = ["extension-module"] }} + pyo3 = {{ version = "0.20.0", features = ["extension-module"] }} [build-dependencies] diff --git a/py/pyproject.toml b/py/pyproject.toml