Use pkg_resources instead of pip internal methods

src/azure-cli-core/azure/cli/core/util.py

@@ -47,13 +47,17 @@ def truncate_text(str_to_shorten, width=70, placeholder=' [...]'):
     return str_to_shorten[:s_len] + (str_to_shorten[s_len:] and placeholder)
 
 
+def get_installed_cli_distributions():
+    from pkg_resources import working_set
+    return [d for d in list(working_set) if d.key == CLI_PACKAGE_NAME or d.key.startswith(COMPONENT_PREFIX)]
+
+
 def get_az_version_string():
     import platform
-    from pip import get_installed_distributions
     from azure.cli.core.extension import get_extensions, EXTENSIONS_DIR
 
     output = six.StringIO()
-    installed_dists = get_installed_distributions(local_only=True)
+    installed_dists = get_installed_cli_distributions()
 
     cli_info = None
     for dist in installed_dists:

src/command_modules/azure-cli-feedback/HISTORY.rst

@@ -3,6 +3,10 @@
 Release History
 ===============
 
+2.0.8
++++++
+* Minor fixes.
+
 2.0.7
 ++++++
 * Update for CLI core changes.

src/command_modules/azure-cli-feedback/azure/cli/command_modules/feedback/custom.py

@@ -11,7 +11,7 @@
 from knack.util import CLIError
 
 from azure.cli.core import __version__ as core_version
-from azure.cli.core.util import COMPONENT_PREFIX
+from azure.cli.core.util import COMPONENT_PREFIX, get_installed_cli_distributions
 
 logger = get_logger(__name__)
 
@@ -47,8 +47,7 @@ def _prompt_net_promoter_score():
 
 
 def _get_version_info():
-    from pip import get_installed_distributions
-    installed_dists = get_installed_distributions(local_only=True)
+    installed_dists = get_installed_cli_distributions()
 
     component_version_info = sorted([{'name': dist.key.replace(COMPONENT_PREFIX, ''),
                                       'version': dist.version}

src/command_modules/azure-cli-feedback/setup.py

@@ -15,7 +15,7 @@
     cmdclass = {}
 
 
-VERSION = "2.0.7"
+VERSION = "2.0.8"
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',

tools/automation/verify/verify_packages.py

@@ -7,12 +7,12 @@
 
 import os.path
 import subprocess
-import pip
 import imp
 import glob
 import zipfile
 import logging
 import unittest
+from pkg_resources import working_set
 
 import automation.utilities.path as automation_path
 from automation.utilities.const import COMMAND_MODULE_PREFIX
@@ -43,10 +43,7 @@ def test_azure_cli_installation(self):
     def test_azure_cli_module_installation(self):
         expected_modules = set([n for n, _ in automation_path.get_command_modules_paths(include_prefix=True)])
 
-        pip.utils.pkg_resources = imp.reload(pip.utils.pkg_resources)
-        installed_command_modules = [dist.key for dist in
-                                     pip.get_installed_distributions(local_only=True)
-                                     if dist.key.startswith(COMMAND_MODULE_PREFIX)]
+        installed_command_modules = [dist.key for dist in list(working_set) if dist.key.startswith(COMMAND_MODULE_PREFIX)]
 
         logger.info('Installed command modules %s', installed_command_modules)