Merge pull request #399 from zowe/chore/update-py03

Update pyo3 dependency in Secrets SDK

Author: zFernand0

CHANGELOG.md

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

src/core/zowe/core_for_zowe_sdk/config_file.py

@@ -16,7 +16,7 @@
 import warnings
 from copy import deepcopy
 from dataclasses import dataclass, field
-from typing import NamedTuple, Optional, Any, Union
+from typing import Any, NamedTuple, Optional, Union
 
 import json5
 import requests
@@ -50,12 +50,11 @@ class ConfigFile:
     """
     Class used to represent a single config file.
 
-    Mainly it will have the following details :
+    Mainly it will have the following details:
         1. Type ("User Config" or "Team Config")
-            -------
-            User Configs override Team Configs.
-            User Configs are used to have personalised config details
-            that the user don't want to have in the Team Config.
+            - User Configs override Team Configs.
+            - User Configs are used to have personalised config details
+            - that the user don't want to have in the Team Config.
         2. Directory in which the file is located.
         3. Name (excluding .config.json or .config.user.json)
         4. Contents of the file.
@@ -75,7 +74,7 @@ class ConfigFile:
     jsonc: Optional[dict[str, Any]] = None
     _missing_secure_props: list[str] = field(default_factory=list)
 
-    __suppress_config_file_warnings: Optional[bool] = True,
+    __suppress_config_file_warnings: Optional[bool] = True
     __logger = Log.register_logger(__name__)
 
     @property
@@ -111,10 +110,7 @@ def location(self, dirname: str) -> None:
             self.__logger.error(f"given path {dirname} is not valid")
             raise FileNotFoundError(f"given path {dirname} is not valid")
 
-    def init_from_file(
-        self,
-        validate_schema: Optional[bool] = True
-    ) -> None:
+    def init_from_file(self, validate_schema: Optional[bool] = True) -> None:
         """
         Initialize the class variable after setting filepath (or if not set, autodiscover the file).
 
@@ -276,7 +272,7 @@ def get_profile(
 
         if profile_name is None:
             profile_name = self.get_profilename_from_profiletype(profile_type=profile_type or "")
-        
+
         props: dict[str, Any] = self.load_profile_properties(profile_name=profile_name)
 
         return Profile(props, profile_name, self._missing_secure_props)
@@ -387,7 +383,7 @@ def find_profile(self, path: str, profiles: dict[str, Any]) -> Optional[dict[str
         for k, v in profiles.items():
             if not isinstance(v, dict):  # Ensure v is a dictionary
                 if not self.__suppress_config_file_warnings:
-                        self.__logger.warning("Invalid profile passed when schame validation is off")
+                    self.__logger.warning("Invalid profile passed when schame validation is off")
                 continue  # Skip invalid entries
 
             if segments[0] == k:
@@ -666,15 +662,14 @@ def get_profile_path_from_name(self, short_path: str) -> str:
             Returns the full profile path
         """
         return re.sub(r"(^|\.)", r"\1profiles.", short_path)
-    
+
     def suppress_config_warnings(self, value: bool) -> None:
         """
         Suppress warnings in config files.
 
         Parameters
         ----------
         value: bool
-            Warnings are shown or not 
+            Warnings are shown or not
         """
         self.__suppress_config_file_warnings = value
-        

src/core/zowe/core_for_zowe_sdk/zosmf_profile.py

@@ -12,7 +12,7 @@
 
 import base64
 import os.path
-from typing import Tuple, Optional
+from typing import Optional, Tuple
 
 import yaml
 
@@ -32,8 +32,6 @@ class ZosmfProfile:
     """
     Class used to represent a Zowe z/OSMF profile.
 
-    Description
-    -----------
     This class is only used when there is already a Zowe z/OSMF profile created
     and the user opted to use the profile instead of passing the credentials directly
     in the object constructor.

src/secrets/Cargo.lock

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

src/secrets/Cargo.toml

@@ -56,21 +56,23 @@ def test_all_loggers(self):
     def test_console_handler(self):
         Log.close_console_output()
         test = Log.register_logger("test")
-        self.assertEqual(test.handlers[0], Log.file_handler)
+        self.assertIn(Log.file_handler, test.handlers)
+        self.assertNotIn(Log.console_handler, test.handlers)
 
         Log.open_console_output()
-        self.assertEqual(test.handlers[1], Log.console_handler)
+        self.assertIn(Log.console_handler, test.handlers)
 
         Log.set_console_output_level(logging.ERROR)
-        self.assertEqual(logging.ERROR, test.handlers[1].level)
+        self.assertEqual(logging.ERROR, Log.console_handler.level)
 
     def test_file_handler(self):
         Log.close_file_output()
         test = Log.register_logger("test")
-        self.assertEqual(test.handlers[0], Log.console_handler)
+        self.assertIn(Log.console_handler, test.handlers)
+        self.assertNotIn(Log.file_handler, test.handlers)
 
         Log.open_file_output()
-        self.assertEqual(test.handlers[1], Log.file_handler)
+        self.assertIn(Log.file_handler, test.handlers)
 
         Log.set_file_output_level(logging.ERROR)
-        self.assertEqual(logging.ERROR, test.handlers[1].level)
+        self.assertEqual(logging.ERROR, Log.file_handler.level)