From 7493dace891bec36d935499b8c040345e9f7b019 Mon Sep 17 00:00:00 2001 From: Matyas Horky Date: Wed, 12 Jul 2023 07:55:22 +0200 Subject: [PATCH] Drop further ethtool dependency mentions * Card ID: ENT-5099 This is a follow-up to 4c81d7c > 2215974: Collect network facts using 'ip' While the ethtool dependency was dropped from the .spec file, it was not completely removed from the rest of the build files. This commit fixes that. --- scripts/build_updates_img.sh | 4 ++-- scripts/container-pre-test.sh | 2 +- setup.py | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/build_updates_img.sh b/scripts/build_updates_img.sh index 6626cc32cf..53a9a97381 100755 --- a/scripts/build_updates_img.sh +++ b/scripts/build_updates_img.sh @@ -67,7 +67,7 @@ make -e install PYTHON_SITE_PACKAGE_DIRS=`${PYTHON_BIN} -c "import site; print(' '.join(site.getsitepackages()))"` # List of required Python packages -PY_PACKAGES="dateutil ethtool" +PY_PACKAGES="dateutil" # Copy required Python modules to updates.img too for pkg in `echo ${PY_PACKAGES}` @@ -94,7 +94,7 @@ do done # List of Python eggs (yes, names can be different from package names) -PY_PACKAGES="python_dateutil ethtool" +PY_PACKAGES="python_dateutil" # Copy required Python eggs to updates.img too for pkg in `echo ${PY_PACKAGES}` diff --git a/scripts/container-pre-test.sh b/scripts/container-pre-test.sh index 6a80a32517..28ae41968c 100644 --- a/scripts/container-pre-test.sh +++ b/scripts/container-pre-test.sh @@ -18,7 +18,7 @@ dnf --setopt install_weak_deps=False install -y \ python3-setuptools \ openssl-devel glib2-devel libdnf-devel \ python3-rpm python3-librepo python3-gobject python3-gobject python3-dbus \ - python3-dateutil python3-requests python3-iniparse python3-ethtool \ + python3-dateutil python3-requests python3-iniparse \ glibc-langpack-en glibc-langpack-de glibc-langpack-ja # Install test packages diff --git a/setup.py b/setup.py index 7f635d2d8d..e786b1f3bd 100755 --- a/setup.py +++ b/setup.py @@ -229,7 +229,6 @@ def find_py(self): install_requires = [ "iniparse", "python-dateutil", - "ethtool", "dbus-python", ]