[SWDEV-514609] Added setuptools & wheel dependencies (#143)

[SWDEV-514609] Added setuptools & wheel dependencies

Change-Id: Iada4e85b37181a0fd67f625b49fda090f1447d13

Signed-off-by: Williams, Justin <Justin.Williams@amd.com>

.github/workflows/amdsmi-build.yml

@@ -206,12 +206,12 @@ jobs:
         if: matrix.os == 'Mariner2'
         run: |
           echo "DOCKER_IMAGE=${{ secrets.MARINER2_DOCKER_IMAGE }}" >> $GITHUB_ENV
-          echo "PACKAGE_MANAGER=dnf" >> $GITHUB_ENV
+          echo "PACKAGE_MANAGER=tdnf" >> $GITHUB_ENV
       - name: Set Docker Image and Package Manager for AzureLinux3
         if: matrix.os == 'AzureLinux3'
         run: |
           echo "DOCKER_IMAGE=${{ secrets.AZURELINUX3_DOCKER_IMAGE }}" >> $GITHUB_ENV
-          echo "PACKAGE_MANAGER=dnf" >> $GITHUB_ENV
+          echo "PACKAGE_MANAGER=tdnf" >> $GITHUB_ENV
       - name: Set Docker Image and Package Manager for AlmaLinux8
         if: matrix.os == 'AlmaLinux8'
         run: |
@@ -253,8 +253,14 @@ jobs:
                 timeout 10m sudo zypper --no-refresh --no-gpg-checks install -y \$BUILD_FOLDER/\$RPM_BUILD
                 ;;
               dnf)
+                dnf install python3-setuptools python3-wheel -y
                 timeout 10m dnf install -y --skip-broken --disablerepo=* \$BUILD_FOLDER/\$RPM_BUILD
                 ;;
+              tdnf)
+                tdnf install python3-setuptools python3-wheel -y
+                python3 -m pip install more_itertools
+                timeout 10m tdnf install -y --skip-broken --disablerepo=* \$BUILD_FOLDER/\$RPM_BUILD
+                ;;
               *)
                 echo 'Unsupported package manager: $PACKAGE_MANAGER'
                 exit 1
@@ -324,6 +330,9 @@ jobs:
               dnf)
                 dnf remove -y amd-smi-lib
                 ;;
+              tdnf)
+                tdnf remove -y amd-smi-lib
+                ;;
               *)
                 echo 'Unsupported package manager: $PACKAGE_MANAGER'
                 exit 1

CMakeLists.txt

@@ -327,7 +327,7 @@ set(CPACK_RPM_PACKAGE_SUGGESTS "python3-argcomplete")
 set(CPACK_RPM_DEV_PACKAGE_SUGGESTS ${CPACK_RPM_PACKAGE_SUGGESTS})
 set(CPACK_RPM_ASAN_PACKAGE_SUGGESTS ${CPACK_RPM_PACKAGE_SUGGESTS})
 # python version gated by rhel8 :(
-set(CPACK_RPM_PACKAGE_REQUIRES "sudo, python3 >= 3.6.8, python3-pip")
+set(CPACK_RPM_PACKAGE_REQUIRES "sudo, python3 >= 3.6.8, python3-pip, python3-wheel, python3-setuptools")
 set(CPACK_RPM_DEV_PACKAGE_REQUIRES ${CPACK_RPM_PACKAGE_REQUIRES})
 set(CPACK_RPM_ASAN_PACKAGE_REQUIRES ${CPACK_RPM_PACKAGE_REQUIRES})
 

README.md

@@ -29,9 +29,6 @@ for more information.
 The following are required to install and use the AMD SMI libraries and CLI tool.
 
 * Python 3.6.8+ (64-bit)
-  * prerequisite modules:
-    * python3-wheel
-    * python3-setuptools
 * `amdgpu` driver must be loaded for [`amdsmi_init()`](./docs/how-to/amdsmi-cpp-lib#hello-amd-smi) to work.
 
 ## Install amdgpu driver and AMD SMI with ROCm
@@ -135,9 +132,6 @@ during development; earlier versions are not guaranteed to work.
 In order to build the AMD SMI Python package, the following components are required:
 
 * Python (3.6.8 or later)
-  * prerequisite modules:
-    * python3-wheel
-    * python3-setuptools
 * virtualenv -- `python3 -m pip install virtualenv`
 
 ### Build steps

docs/install/build.md

@@ -25,9 +25,6 @@ In order to build the AMD SMI Python package, the following components are
 required:
 
 * Python (3.6.8 or later)
-  * prerequisite modules:
-    * python3-wheel
-    * python3-setuptools
 * virtualenv -- `python3 -m pip install virtualenv`
 
 ## Build steps