From f2f02aa3172ff3c74b231fb905c6578981a20998 Mon Sep 17 00:00:00 2001 From: Justin Williams Date: Mon, 16 Sep 2024 18:42:37 -0500 Subject: [PATCH] [SWDEV-469278] Lowered PyYAML post install script dependency Signed-off-by: Justin Williams Change-Id: I764c8bf01e6cb6acb0b3fc1db396707099e5ed12 --- DEBIAN/postinst.in | 36 +++++++++++++++++++++++++++++----- RPM/post.in | 31 +++++++++++++++++++++++++++-- amdsmi_cli/amdsmi_logger.py | 19 ++++++++++++++++-- py-interface/pyproject.toml.in | 2 +- py-interface/setup.cfg.in | 2 +- 5 files changed, 79 insertions(+), 11 deletions(-) diff --git a/DEBIAN/postinst.in b/DEBIAN/postinst.in index 45443b55a1..97ea7a7518 100755 --- a/DEBIAN/postinst.in +++ b/DEBIAN/postinst.in @@ -149,7 +149,7 @@ do_install_amdsmi_python_lib() { return fi - # upgrade pip if it's an ancient version + # upgrade pip if it's an ancient version, typically should not execute # otherwise the amdsmi install will fail local pip_version pip_version=$(python3 -m pip --version | grep -Eo '^[^\ ]+ ([0-9]+)' | grep -Eo '[0-9]+$') @@ -159,18 +159,44 @@ do_install_amdsmi_python_lib() { fi unset pip_version - # Check PyYAML dependency - local pyyaml_version + # Check PyYAML dependency, typically should not execute pyyaml_version=$(pip show pyyaml | grep -Po '(?<=Version: )[0-9]') - if [[ "$pyyaml_version" -lt 5 ]]; then + if [[ "$pyyaml_version" -lt 3 ]]; then echo "Detected ancient pyyaml version ($pyyaml_version)... Upgrading..." python3 -m pip install 'PyYAML>=5.1' --quiet --disable-pip-version-check --ignore-installed fi unset pyyaml_version +# Install setuptools wheel (offline install) +# Function to find the tarball + find_tarball() { + find / -name "amdsmi_offline.tar.gz" 2>/dev/null | head -n 1 + } + + # Locate the tarball + tarball_path=$(find_tarball) + + if [ -z "$tarball_path" ]; then + echo "Error: amdsmi_offline.tar.gz not found." + exit 1 + fi + + # Extract directory from tarball path + base_dir=$(dirname "$tarball_path") + + # Navigate to the directory containing the tarball + cd "$base_dir" || exit + + # Unpack the tarball + tar -xzvf amdsmi_offline.tar.gz + + # Install setuptools offline (if needed) + cd offline_packages || exit + python3 -m pip install --upgrade --upgrade-strategy only-if-needed --no-index --find-links=. setuptools + # install python library at @CPACK_PACKAGING_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@/amdsmi local python_lib_path=@CPACK_PACKAGING_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@ - python3 -m pip install "$python_lib_path" --quiet --disable-pip-version-check + python3 -m pip install "$python_lib_path" --quiet --disable-pip-version-check --no-build-isolation export PIP_ROOT_USER_ACTION="$PREVIOUS_PIP_ROOT_USER_ACTION" export PIP_BREAK_SYSTEM_PACKAGES="$PREVIOUS_PIP_BREAK_SYSTEM_PACKAGES" diff --git a/RPM/post.in b/RPM/post.in index e33e9c0de7..d98316b4b8 100755 --- a/RPM/post.in +++ b/RPM/post.in @@ -161,15 +161,42 @@ do_install_amdsmi_python_lib() { # Check PyYAML dependency local pyyaml_version pyyaml_version=$(pip show pyyaml | grep -Po '(?<=Version: )[0-9]') - if [[ "$pyyaml_version" -lt 5 ]]; then + if [[ "$pyyaml_version" -lt 3 ]]; then echo "Detected ancient pyyaml version ($pyyaml_version)... Upgrading..." python3 -m pip install 'PyYAML>=5.1' --quiet --disable-pip-version-check --ignore-installed fi unset pyyaml_version +# Install setuptools wheel (offline install) +# Function to find the tarball + find_tarball() { + find / -name "amdsmi_offline.tar.gz" 2>/dev/null | head -n 1 + } + + # Locate the tarball + tarball_path=$(find_tarball) + + if [ -z "$tarball_path" ]; then + echo "Error: amdsmi_offline.tar.gz not found." + exit 1 + fi + + # Extract directory from tarball path + base_dir=$(dirname "$tarball_path") + + # Navigate to the directory containing the tarball + cd "$base_dir" || exit + + # Unpack the tarball + tar -xzvf amdsmi_offline.tar.gz + + # Install setuptools offline (if needed) + cd offline_packages || exit + python3 -m pip install --upgrade --upgrade-strategy only-if-needed --no-index --find-links=. setuptools + # install python library at @CPACK_PACKAGING_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@/amdsmi local python_lib_path=@CPACK_PACKAGING_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@ - python3 -m pip install "$python_lib_path" --quiet --disable-pip-version-check + python3 -m pip install "$python_lib_path" --quiet --disable-pip-version-check --no-build-isolation export PIP_ROOT_USER_ACTION="$PREVIOUS_PIP_ROOT_USER_ACTION" export PIP_BREAK_SYSTEM_PACKAGES="$PREVIOUS_PIP_BREAK_SYSTEM_PACKAGES" diff --git a/amdsmi_cli/amdsmi_logger.py b/amdsmi_cli/amdsmi_logger.py index a3122124a6..6fb6e5a327 100644 --- a/amdsmi_cli/amdsmi_logger.py +++ b/amdsmi_cli/amdsmi_logger.py @@ -27,10 +27,19 @@ import time from typing import Dict from enum import Enum import yaml +import inspect from amdsmi_helpers import AMDSMIHelpers import amdsmi_cli_exceptions +### Custom YAML Functions +# Dumper class to preserve order of yaml.dump +class CustomDumper(yaml.Dumper): + def represent_dict_preserve_order(self, data): + return self.represent_dict(data.items()) +def has_sort_keys_option(): # to check if sort_keys is available + return 'sort_keys' in inspect.signature(yaml.dump).parameters + class AMDSMILogger(): def __init__(self, format='human_readable', destination='stdout') -> None: self.output = {} @@ -202,9 +211,15 @@ class AMDSMILogger(): capitalized_json["AMDSMI_SPACING_REMOVAL"] = tabbed_dictionary json_string = json.dumps(capitalized_json, indent=4) - yaml_data = yaml.safe_load(json_string) - yaml_output = yaml.dump(yaml_data, sort_keys=False, allow_unicode=True) + if has_sort_keys_option(): + yaml_data = yaml.safe_load(json_string) + yaml_output = yaml.dump(yaml_data, sort_keys=False, allow_unicode=True) + else: + CustomDumper.add_representer(dict, CustomDumper.represent_dict_preserve_order) + yaml_data = yaml.safe_load(json_string) + yaml_output = yaml.dump(yaml_data, Dumper=CustomDumper, allow_unicode=True, default_flow_style=False) + # Remove a key line if it is a spacer yaml_output = yaml_output.replace("AMDSMI_SPACING_REMOVAL:\n", "") yaml_output = yaml_output.replace("'", "") # Remove '' diff --git a/py-interface/pyproject.toml.in b/py-interface/pyproject.toml.in index 149fc21a1b..e4d451aa82 100644 --- a/py-interface/pyproject.toml.in +++ b/py-interface/pyproject.toml.in @@ -16,7 +16,7 @@ readme = {file = "amdsmi/README.md", content-type = "text/markdown"} description = "AMDSMI Python LIB - AMD GPU Monitoring Library" requires-python = ">=3.6" dependencies = [ - "PyYAML >= 5.0", + "PyYAML >= 3.12", ] [project.urls] diff --git a/py-interface/setup.cfg.in b/py-interface/setup.cfg.in index 3e8b8c8732..ba56f2ac05 100644 --- a/py-interface/setup.cfg.in +++ b/py-interface/setup.cfg.in @@ -18,7 +18,7 @@ include_package_data = True packages = find: python_requires = >=3.6 install_requires= - PyYAML >= 5.0 + PyYAML >= 3.12 [options.package_data] * = *.so