Merge branch 'main' into type_annotation

Author: zFernand0

.github/workflows/audit.yml

@@ -27,5 +27,8 @@ jobs:
         inputs: requirements.txt docs/requirements.txt
 
     - name: Check Secrets SDK Vulnerabilities
-      working-directory: src/secrets
-      run: cargo audit --deny warnings --ignore RUSTSEC-2024-0370 --ignore RUSTSEC-2024-0429
+      uses: actions-rust-lang/audit@v1
+      with:
+        denyWarnings: true
+        ignore: RUSTSEC-2024-0370,RUSTSEC-2024-0429
+        workingDirectory: src/secrets

.github/workflows/sdk-build.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-22.04, macos-latest, windows-latest]
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     env:
       OS: ${{ matrix.os }}
@@ -33,7 +33,7 @@ jobs:
       - name: Lint with pydoclint
         run: pydoclint --exclude='.*/(build|response)/.*' src
       - name: Lint with pylint
-        run: | 
+        run: |
           # check for Python errors
           pylint src --errors-only --disable=E0401,E0611 --ignore=build
           # check for lint

.github/workflows/sdk-release.yaml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: write
       issues: write

.github/workflows/secrets-sdk.yml

@@ -7,14 +7,15 @@ name: Secrets SDK CI
 
 on:
   push:
-    branches: ["**"]
+    branches: ["main"]
     paths:
       - "src/secrets/**"
       - ".github/workflows/secrets-sdk.yml"
     tags: ["**"]
   pull_request:
     paths:
       - "src/secrets/**"
+      - ".github/workflows/secrets-sdk.yml"
   workflow_dispatch:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -71,10 +72,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
-        if: ${{ matrix.target != 'aarch64' }}
         with:
           python-version: "3.10"
-          architecture: ${{ matrix.target }}
+          architecture: ${{ matrix.target == 'aarch64' && 'x64' || matrix.target }}
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to the Zowe Client Python SDK will be documented in this file.
 
+## Recent Changes
+
+### Bug Fixes
+
+- Updated the `pyo3` dependency of the Secrets SDK for technical currency. [#355](https://github.com/zowe/zowe-client-python-sdk/pull/355)
+
 ## `1.0.0-dev22`
 
 ## Recent Changes

pyproject.toml

@@ -1,3 +1,7 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
+
 [tool.black]
 line-length = 120
 

requirements.txt

@@ -5,6 +5,7 @@ PyYAML==6.0.1
 requests==2.32.0
 
 # Dev deps
+setuptools
 black
 coverage
 isort

src/secrets/Cargo.lock

@@ -11,5 +11,5 @@ name = "keyring"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.20.0", features = ["abi3-py37"] }
+pyo3 = { version = "0.24.1", features = ["abi3-py37", "generate-import-lib"] }
 secrets_core = { git = "https://github.com/zowe/zowe-cli.git", branch = "master" }

src/secrets/Cargo.toml

@@ -40,14 +40,14 @@ fn find_password(service: String) -> PyResult<Option<String>> {
 fn find_credentials(service: String) -> PyResult<Vec<(String, String)>> {
     let mut creds: Vec<(String, String)> = vec![];
     match os::find_credentials(&service, &mut creds) {
-        Ok(res) => Ok(creds),
+        Ok(_res) => Ok(creds),
         Err(e) => Err(PyValueError::new_err(format!("{:#?}", e))),
     }
 }
 
 /// A Python module implemented in Rust.
 #[pymodule]
-fn keyring(_py: Python, m: &PyModule) -> PyResult<()> {
+fn keyring(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(get_password, m)?)?;
     m.add_function(wrap_pyfunction!(set_password, m)?)?;
     m.add_function(wrap_pyfunction!(delete_password, m)?)?;