Skip to content
This repository has been archived by the owner on Jul 17, 2024. It is now read-only.

deps: Audit 06/25 #30

Merged
merged 2 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 0.10.3

#### 🚀 Updates

- Updated dependencies.

## 0.10.2

#### 🚀 Updates
Expand Down
95 changes: 49 additions & 46 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "python_plugin"
version = "0.10.2"
version = "0.10.3"
edition = "2021"
license = "MIT"
publish = false
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
profile = "default"
channel = "1.78.0"
channel = "1.79.0"
9 changes: 2 additions & 7 deletions src/proto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,7 @@ pub fn download_prebuilt(
let releases: BTreeMap<Version, BTreeMap<String, ReleaseEntry>> =
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 <hash>{}</hash> (via <url>https://github.com/indygreg/python-build-standalone</url>)! Try installing another version for the time being.",
version
Expand Down Expand Up @@ -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();
};
}
Expand Down