Skip to content

Commit f7011ca

Browse files
authored
Merge pull request zowe#355 from zowe/chore/update-pyo3
Update pyo3 dependency in Secrets SDK
2 parents b62c4f8 + ae8f5e2 commit f7011ca

File tree

5 files changed

+73
-76
lines changed

5 files changed

+73
-76
lines changed

.github/workflows/secrets-sdk.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ name: Secrets SDK CI
77

88
on:
99
push:
10-
branches: ["**"]
10+
branches: ["main"]
1111
paths:
1212
- "src/secrets/**"
1313
- ".github/workflows/secrets-sdk.yml"
1414
tags: ["**"]
1515
pull_request:
1616
paths:
1717
- "src/secrets/**"
18+
- ".github/workflows/secrets-sdk.yml"
1819
workflow_dispatch:
1920
concurrency:
2021
group: ${{ github.workflow }}-${{ github.ref }}
@@ -71,10 +72,9 @@ jobs:
7172
steps:
7273
- uses: actions/checkout@v4
7374
- uses: actions/setup-python@v5
74-
if: ${{ matrix.target != 'aarch64' }}
7575
with:
7676
python-version: "3.10"
77-
architecture: ${{ matrix.target }}
77+
architecture: ${{ matrix.target == 'aarch64' && 'x64' || matrix.target }}
7878
- name: Build wheels
7979
uses: PyO3/maturin-action@v1
8080
with:

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes to the Zowe Client Python SDK will be documented in this file.
44

5+
## Recent Changes
6+
7+
### Bug Fixes
8+
9+
- Updated the `pyo3` dependency of the Secrets SDK for technical currency. [#355](https://github.com/zowe/zowe-client-python-sdk/pull/355)
10+
511
## `1.0.0-dev22`
612

713
### Enhancements

src/secrets/Cargo.lock

Lines changed: 61 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/secrets/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ name = "keyring"
1111
crate-type = ["cdylib"]
1212

1313
[dependencies]
14-
pyo3 = { version = "0.20.0", features = ["abi3-py37"] }
14+
pyo3 = { version = "0.24.1", features = ["abi3-py37", "generate-import-lib"] }
1515
secrets_core = { git = "https://github.com/zowe/zowe-cli.git", branch = "master" }

src/secrets/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ fn find_password(service: String) -> PyResult<Option<String>> {
4040
fn find_credentials(service: String) -> PyResult<Vec<(String, String)>> {
4141
let mut creds: Vec<(String, String)> = vec![];
4242
match os::find_credentials(&service, &mut creds) {
43-
Ok(res) => Ok(creds),
43+
Ok(_res) => Ok(creds),
4444
Err(e) => Err(PyValueError::new_err(format!("{:#?}", e))),
4545
}
4646
}
4747

4848
/// A Python module implemented in Rust.
4949
#[pymodule]
50-
fn keyring(_py: Python, m: &PyModule) -> PyResult<()> {
50+
fn keyring(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
5151
m.add_function(wrap_pyfunction!(get_password, m)?)?;
5252
m.add_function(wrap_pyfunction!(set_password, m)?)?;
5353
m.add_function(wrap_pyfunction!(delete_password, m)?)?;

0 commit comments

Comments
 (0)