zuul/zuul-jobs
Code Issues Proposed changes

Merge "Uninstall and reinstall siblings one at a time"

Browse Source
This commit is contained in:
Zuul 2018-03-21 15:02:59 +00:00 committed by Gerrit Code Review
commit ad683253ed
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
roles/tox/library/tox_install_sibling_packages.py
View File

@ -200,29 +200,41 @@ def main():
root=sibling_python_packages[package.name])) root=sibling_python_packages[package.name]))
changed = True changed = True
log.append("Uninstalling {name}".format(name=package.name))
uninstall_output = subprocess.check_output(
[tox_python, '-m', 'pip', 'uninstall', '-y', package.name],
stderr=subprocess.STDOUT)
log.extend(uninstall_output.decode('utf-8').split('\n'))
found_sibling_packages.append(package.name) found_sibling_packages.append(package.name)
args = [tox_python, '-m', 'pip', 'install']
if constraints: if constraints:
constraints_file = write_new_constraints_file( constraints_file = write_new_constraints_file(
constraints, found_sibling_packages) constraints, found_sibling_packages)
for sibling_package in found_sibling_packages:
log.append("Uninstalling {name}".format(name=sibling_package))
uninstall_output = subprocess.check_output(
[tox_python, '-m',
'pip', 'uninstall', '-y', sibling_package],
stderr=subprocess.STDOUT)
log.extend(uninstall_output.decode('utf-8').split('\n'))
args = [tox_python, '-m', 'pip', 'install']
if constraints:
args.extend(['-c', constraints_file]) args.extend(['-c', constraints_file])
log.append(
"Installing {name} from {root} for deps".format(
name=sibling_package,
root=sibling_python_packages[sibling_package]))
args.append(sibling_python_packages[sibling_package])
install_output = subprocess.check_output(args)
log.extend(install_output.decode('utf-8').split('\n'))
for sibling_package in found_sibling_packages: for sibling_package in found_sibling_packages:
log.append( log.append(
"Installing {name} from {root}".format( "Installing {name} from {root}".format(
name=sibling_package, name=sibling_package,
root=sibling_python_packages[sibling_package])) root=sibling_python_packages[sibling_package]))
args.append('-e')
args.append(sibling_python_packages[sibling_package])
install_output = subprocess.check_output(args) install_output = subprocess.check_output(
[tox_python, '-m', 'pip', 'install', '--no-deps',
sibling_python_packages[sibling_package]])
log.extend(install_output.decode('utf-8').split('\n')) log.extend(install_output.decode('utf-8').split('\n'))
except Exception as e: except Exception as e:
tb = traceback.format_exc() tb = traceback.format_exc()