From a7ad4f1f6fddc6c767549c29a77f341c2dccacbf Mon Sep 17 00:00:00 2001 From: Cory Johns Date: Mon, 6 Apr 2020 13:14:36 -0400 Subject: [PATCH] Merge pull request #163 from juju-solutions/johnsca/refactor/wh-pkgs Minor refactor to bootstrap --- lib/charms/layer/basic.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/charms/layer/basic.py b/lib/charms/layer/basic.py index d3b06ac..33eb4df 100644 --- a/lib/charms/layer/basic.py +++ b/lib/charms/layer/basic.py @@ -175,9 +175,7 @@ def bootstrap_charm_deps(): # a set so that we can ignore the pre-install packages and let pip # choose the best version in case there are multiple from layer # conflicts) - pkgs = {os.path.basename(wheel).split('-')[0].replace('_', '-') - for wheel in glob('wheelhouse/*')} - pkgs -= set(pre_install_pkgs) + pkgs = _load_wheelhouse_versions().keys() - set(pre_install_pkgs) check_call([pip, 'install', '-U', '--ignore-installed', '--no-index', '-f', 'wheelhouse'] + list(pkgs)) # re-enable installation from pypi