summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kraft <george.kraft@calxeda.com>2013-11-12 03:32:55 -0600
committerGeorge Kraft <george.kraft@calxeda.com>2013-11-12 03:32:55 -0600
commitee5d497e3fdde077b721279375e729d278c8c536 (patch)
tree87dbd666f6d23eceb49fe61cc1d621459a377fba
parenta68b90e5c412d414776177bb6c2fdc01d6223f84 (diff)
downloadcxmanage-ee5d497e3fdde077b721279375e729d278c8c536.tar.gz
CXMAN-254: Remove pkg_resources usage in tspackage.py
-rw-r--r--cxmanage_api/cli/commands/tspackage.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/cxmanage_api/cli/commands/tspackage.py b/cxmanage_api/cli/commands/tspackage.py
index 2cbfef8..a5ebf15 100644
--- a/cxmanage_api/cli/commands/tspackage.py
+++ b/cxmanage_api/cli/commands/tspackage.py
@@ -41,7 +41,6 @@
import os
-import pkg_resources
import shutil
import subprocess
import sys
@@ -49,6 +48,8 @@ import tarfile
import tempfile
import time
+import pyipmi
+import cxmanage_api
from cxmanage_api.cli import get_tftp, get_nodes, run_command, COMPONENTS
@@ -154,10 +155,8 @@ def write_client_info():
fout.write("\n[ Tool versions ]\n")
fout.write("Python %s\n" % sys.version.replace("\n", ""))
- cxmanage_version = pkg_resources.require("cxmanage")[0].version
- fout.write("cxmanage version %s\n" % cxmanage_version)
- pyipmi_version = pkg_resources.require("pyipmi")[0].version
- fout.write("pyipmi version %s\n" % pyipmi_version)
+ fout.write("cxmanage version %s\n" % cxmanage_api.__version__)
+ fout.write("pyipmi version %s\n" % pyipmi.__version__)
ipmitool_path = os.environ.get('IPMITOOL_PATH', 'ipmitool')
write_command("%s -V" % ipmitool_path)