From c0d1f95f58fefefbc39801eb87874d3952a6fdf9 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Fri, 20 Apr 2018 10:45:46 -0500 Subject: [PATCH] Revert "show commands and output together" This reverts commit 6829f9175d1837d539fa7dd5bc0f60d431544c4f. Change-Id: I2ec9e766993c12e3609a57117ece457e4425a9d8 --- openstack_requirements/cmds/generate.py | 26 ++++++++++--------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/openstack_requirements/cmds/generate.py b/openstack_requirements/cmds/generate.py index 6609bb14c5..183a8061ca 100644 --- a/openstack_requirements/cmds/generate.py +++ b/openstack_requirements/cmds/generate.py @@ -45,16 +45,6 @@ def _parse_freeze(text): return result -def _do_cmd(cmd, return_output=False, **kwds): - print(' '.join(cmd)) - if return_output: - out = subprocess.check_output(cmd, **kwds).decode('utf-8') - print(out) - return out - else: - subprocess.check_call(cmd) - - def _freeze(requirements, python): """Generate a frozen install from requirements. @@ -77,16 +67,20 @@ def _freeze(requirements, python): :param python: A Python binary to use. E.g. /usr/bin/python3 :return: A tuple (python_version, list of (package, version)'s) """ - version_out = _do_cmd([python, "--version"], return_output=True, - stderr=subprocess.STDOUT) + version_out = subprocess.check_output( + [python, "--version"], stderr=subprocess.STDOUT).decode('utf-8') version_all = version_out.split()[1] version = '.'.join(version_all.split('.')[:2]) with fixtures.TempDir() as temp: - _do_cmd(['virtualenv', '-p', python, temp.path]) + subprocess.check_call( + ['virtualenv', '-p', python, temp.path]) pip_bin = os.path.join(temp.path, 'bin', 'pip') - _do_cmd([pip_bin, 'install', '-U', 'pip', 'setuptools', 'wheel']) - _do_cmd([pip_bin, 'install', '-r', requirements]) - freeze = _do_cmd([pip_bin, 'freeze'], return_output=True) + subprocess.check_call( + [pip_bin, 'install', '-U', 'pip', 'setuptools', 'wheel']) + subprocess.check_call( + [pip_bin, 'install', '-r', requirements]) + freeze = subprocess.check_output( + [pip_bin, 'freeze']).decode('utf-8') return (version, _parse_freeze(freeze))