diff --git a/src/azure-cli/azure/cli/command_modules/feedback/custom.py b/src/azure-cli/azure/cli/command_modules/feedback/custom.py index 7a2bc0baed1..173f8885234 100644 --- a/src/azure-cli/azure/cli/command_modules/feedback/custom.py +++ b/src/azure-cli/azure/cli/command_modules/feedback/custom.py @@ -92,7 +92,6 @@ ``` {platform} {python_info} -{shell} {cli_version} ``` @@ -484,18 +483,6 @@ def __str__(self): def _build_issue_info_tup(command_log_file=None): - def _get_parent_proc_name(): - import psutil - parent = psutil.Process(os.getpid()).parent() - if parent: - # powershell.exe launches cmd.exe to launch the cli. - grandparent = parent.parent() - if grandparent and grandparent.name().lower().startswith("powershell"): - return grandparent.name() - # if powershell is not the grandparent, simply return the parent's name. - return parent.name() - return None - format_dict = {"command_name": "", "errors_string": "", "executed_command": ""} @@ -526,7 +513,6 @@ def _get_parent_proc_name(): format_dict["cli_version"] = _get_az_version_summary() format_dict["python_info"] = "Python {}".format(platform.python_version()) format_dict["platform"] = "{}".format(platform.platform()) - format_dict["shell"] = "Shell: {}".format(_get_parent_proc_name()) format_dict["auto_gen_comment"] = _AUTO_GEN_COMMENT pretty_url_name = _get_extension_repo_url(ext_name) if is_ext else _CLI_ISSUES_URL diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index a0698d67f29..845f94313cc 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -108,7 +108,6 @@ oauthlib==3.0.1 paramiko==2.6.0 pbr==5.3.1 portalocker==1.4.0 -psutil==5.6.3 pycparser==2.19 Pygments==2.4.2 PyJWT==1.7.1 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index a0698d67f29..845f94313cc 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -108,7 +108,6 @@ oauthlib==3.0.1 paramiko==2.6.0 pbr==5.3.1 portalocker==1.4.0 -psutil==5.6.3 pycparser==2.19 Pygments==2.4.2 PyJWT==1.7.1 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index 8c87eedcbcf..824b5ef5a40 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -105,7 +105,6 @@ oauthlib==3.0.1 paramiko==2.6.0 pbr==5.3.1 portalocker==1.2.1 -psutil==5.6.3 pycparser==2.19 Pygments==2.4.2 PyJWT==1.7.1 diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index f59628a1593..db2cdd0a2cb 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -137,7 +137,6 @@ 'pyOpenSSL>=17.1.0', 'pytz==2019.1', 'pyyaml~=5.1', - 'psutil~=5.6', 'requests~=2.22', 'scp~=0.13.2', 'six~=1.12',