From 97b10fff9d66acd1f58a7422ddafd71d33cca332 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Tue, 25 Jun 2024 11:42:46 -0700 Subject: [PATCH 1/2] Update deps. --- Cargo.lock | 93 +++++++++++++++++++++++---------------------- Cargo.toml | 8 ++-- rust-toolchain.toml | 2 +- src/proto.rs | 9 +---- 4 files changed, 55 insertions(+), 57 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bed9c6c..c2ef678 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -172,9 +172,9 @@ dependencies = [ [[package]] name = "binstall-tar" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01db907e07c37309ea816c183ffe548daaa66ef640a291408f232d6ca4089dbb" +checksum = "e3620d72763b5d8df3384f3b2ec47dc5885441c2abbd94dd32197167d08b014a" dependencies = [ "filetime", "libc", @@ -239,9 +239,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cached" -version = "0.51.3" +version = "0.51.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd93a9f06ec296ca66b4c26fafa9ed63f32c473d7a708a5f28563ee64c948515" +checksum = "0feb64151eed3da6107fddd2d717a6ca4b9dbd74e43784c55c841d1abfe5a295" dependencies = [ "ahash", "cached_proc_macro", @@ -856,7 +856,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "toml 0.8.13", + "toml 0.8.14", "tracing", "tracing-subscriber", "ureq", @@ -1014,9 +1014,9 @@ dependencies = [ [[package]] name = "fs4" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73969b81e8bc90a3828d913dd3973d80771bfb9d7fbe1a78a79122aad456af15" +checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8" dependencies = [ "rustix", "windows-sys 0.52.0", @@ -2056,9 +2056,9 @@ dependencies = [ [[package]] name = "proto_core" -version = "0.36.0" +version = "0.37.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b92765d89f8079e309534fe11516dd01bba1ac8e790a474db1398bbba7ee9992" +checksum = "12686907cd92fc1b09741a9973f1c33aabdb5e6ba779f4c296ed8bf6cd1ae5aa" dependencies = [ "cached", "indexmap 2.2.6", @@ -2090,9 +2090,9 @@ dependencies = [ [[package]] name = "proto_pdk" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0cdbc3e9a79af9604fcad65dc16b8478d317ab0f6acd583ebb13edc2ade7be" +checksum = "b34fac0e13aad44867798931b9f98851483d5e276190c23b200cf5b7d8fe1f88" dependencies = [ "extism-pdk", "proto_pdk_api", @@ -2103,9 +2103,9 @@ dependencies = [ [[package]] name = "proto_pdk_api" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa4b628780934f3184277dcde34e0be5a11aafa4b8a987c9b3123cb52ccdb7f" +checksum = "e4d666fea2b722e6362b05eade29ae212341bdd5b2e244aaa1613b717dc2a188" dependencies = [ "rustc-hash", "semver", @@ -2119,9 +2119,9 @@ dependencies = [ [[package]] name = "proto_pdk_test_utils" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ba0dfb99e075d567287ed748dcf45c0038bab768cfe95786828b95bf7412625" +checksum = "b6496c0f4114c65dc229aad80ce5ae120e93f52b1399b8b8c4b47e2c785b9ed5" dependencies = [ "proto_core", "proto_pdk_api", @@ -2133,9 +2133,9 @@ dependencies = [ [[package]] name = "proto_shim" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f94b19eff501db1cc93313025132d462c52cfa45c63622051dab94516de4ad84" +checksum = "88ee42b1824bc24b6a9e2d7f9744f0fda67de2c1fbd4d5acd3a12098525d4929" dependencies = [ "command-group", "dirs 5.0.1", @@ -2266,9 +2266,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -2521,7 +2521,7 @@ dependencies = [ "serde_path_to_error", "starbase_styles", "thiserror", - "toml 0.8.13", + "toml 0.8.14", "tracing", ] @@ -2546,7 +2546,7 @@ checksum = "788660c0972a2aab386e2b4b8bd304e0b21c21751e2722cead28d059597d3dad" dependencies = [ "indexmap 2.2.6", "serde_json", - "toml 0.8.13", + "toml 0.8.14", "url", ] @@ -2757,9 +2757,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "starbase_archive" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6c534fa921df0a5ee7d59029a53fa9f91db6dadfaf4e8cfd15785079e1ec7cb" +checksum = "1159e924d28043b3eb045d9a70e30312a50d31c7271ee0720865a32ba36042bf" dependencies = [ "binstall-tar", "flate2", @@ -2776,9 +2776,9 @@ dependencies = [ [[package]] name = "starbase_events" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b23db0b8074346e689895c7a18e97517c3492ed4cd1c330b3eeb765a861346" +checksum = "c96e6586ad2f10fcbc6d30fe330b7ea88709de3d55db6259a64e309937016b4e" dependencies = [ "async-trait", "miette", @@ -2788,9 +2788,9 @@ dependencies = [ [[package]] name = "starbase_macros" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e11e236b44c4d9304e1652142f6606670e540e81d0e4110e3a4897713c0aed" +checksum = "052d4a67b75ca00709992b99a332679b21d621d3aad441a11d89dc4e1d42bd14" dependencies = [ "darling", "proc-macro2", @@ -2800,9 +2800,9 @@ dependencies = [ [[package]] name = "starbase_sandbox" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e87bd5565afbfbe20f19efa79db83d714a93fc21557dbdb4ccd8b02c08b295a" +checksum = "9dc8cc21fc2c389549297a2049074bf22a34aceb8ed8d31be6e1df42648abcb8" dependencies = [ "assert_cmd", "assert_fs", @@ -2827,9 +2827,9 @@ dependencies = [ [[package]] name = "starbase_utils" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc87e39c8390c2bf72ba24c38d1776f1a77745e7c756eea3c0d5d7c5a6798b4d" +checksum = "06fac1efba629ebe53fd2363b0af2a7b4f9a2a79540e53b1f0bbdd08c3cb6fbf" dependencies = [ "dirs 5.0.1", "fs4", @@ -2843,7 +2843,7 @@ dependencies = [ "starbase_styles", "thiserror", "tokio", - "toml 0.8.13", + "toml 0.8.14", "tracing", "url", "wax", @@ -3088,14 +3088,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.13", + "toml_edit 0.22.14", ] [[package]] @@ -3120,9 +3120,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.13" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap 2.2.6", "serde", @@ -3296,9 +3296,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -3329,15 +3329,16 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "version_spec" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cb928fc92912272002d6cc0c484d345867936785dec98ee16aae18429793550" +checksum = "d8316e120cf9c849f9ca6604ac7c42cce70b363d566843025874f1ab92daaa5b" dependencies = [ "human-sort", "regex", "schematic", "semver", "serde", + "thiserror", ] [[package]] @@ -4296,11 +4297,13 @@ dependencies = [ [[package]] name = "xattr" -version = "0.2.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] @@ -4346,9 +4349,9 @@ checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zip" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098d5d7737fb0b70814faa73c17df84f047d38dd31d13bbf2ec3fb354b5abf45" +checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39" dependencies = [ "arbitrary", "crc32fast", diff --git a/Cargo.toml b/Cargo.toml index c8fb45f..8fa7295 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,13 +10,13 @@ crate-type = ['cdylib'] [dependencies] extism-pdk = { version = "1.2.0" } -proto_pdk = { version = "0.20.0" } #, path = "../../proto/crates/pdk" } -regex = { version = "1.10.4", default-features = false, features = ["std"] } +proto_pdk = { version = "0.21.0" } #, path = "../../proto/crates/pdk" } +regex = { version = "1.10.5", default-features = false, features = ["std"] } serde = "1.0.203" [dev-dependencies] -proto_pdk_test_utils = { version = "0.24.0" } #, path = "../../proto/crates/pdk-test-utils" } -starbase_sandbox = "0.6.1" +proto_pdk_test_utils = { version = "0.25.0" } #, path = "../../proto/crates/pdk-test-utils" } +starbase_sandbox = "0.6.2" tokio = { version = "1.38.0", features = ["full"] } [features] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f92c249..d5ce77e 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] profile = "default" -channel = "1.78.0" +channel = "1.79.0" diff --git a/src/proto.rs b/src/proto.rs index 698cec0..3a3d9b8 100644 --- a/src/proto.rs +++ b/src/proto.rs @@ -111,12 +111,7 @@ pub fn download_prebuilt( let releases: BTreeMap> = fetch_url("https://raw.githubusercontent.com/moonrepo/python-plugin/master/releases.json")?; - let release_triples = match version { - VersionSpec::Version(v) => releases.get(v), - _ => None, - }; - - let Some(release_triples) = release_triples else { + let Some(release_triples) = version.as_version().and_then(|v| releases.get(v)) else { return Err(plugin_err!( "No pre-built available for version {} (via https://github.com/indygreg/python-build-standalone)! Try installing another version for the time being.", version @@ -174,7 +169,7 @@ pub fn locate_executables( } // Otherwise this was built from source else { - if let VersionSpec::Version(version) = input.context.version { + if let Some(version) = input.context.version.as_version() { major_version = version.major.to_string(); }; } From 712a78890fac6f28fe018251f23d35b9a2f20514 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Tue, 25 Jun 2024 11:45:24 -0700 Subject: [PATCH 2/2] Update tests. --- CHANGELOG.md | 6 ++++++ Cargo.lock | 2 +- Cargo.toml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8c6096..27330f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.10.3 + +#### 🚀 Updates + +- Updated dependencies. + ## 0.10.2 #### 🚀 Updates diff --git a/Cargo.lock b/Cargo.lock index c2ef678..139d2f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2152,7 +2152,7 @@ dependencies = [ [[package]] name = "python_plugin" -version = "0.10.2" +version = "0.10.3" dependencies = [ "extism-pdk", "proto_pdk", diff --git a/Cargo.toml b/Cargo.toml index 8fa7295..d3899fb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "python_plugin" -version = "0.10.2" +version = "0.10.3" edition = "2021" license = "MIT" publish = false