Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport fixes from devel #3251

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ install_requires =
Jinja2 >= 2.11.3
packaging
paramiko >= 2.5.0, < 3
pluggy >= 0.7.1, < 1.0
pluggy >= 0.7.1, < 2.0
PyYAML >= 5.1, < 6
rich >= 9.5.1
subprocess-tee >= 0.3.2
Expand Down
4 changes: 2 additions & 2 deletions src/molecule/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ def drivers(config=None) -> UserListMap:
pm = pluggy.PluginManager("molecule.driver")
try:
pm.load_setuptools_entrypoints("molecule.driver")
except Exception:
except (Exception, SystemExit):
# These are not fatal because a broken driver should not make the entire
# tool unusable.
LOG.error("Failed to load driver entry point %s", traceback.format_exc())
for p in pm.get_plugins():
try:
plugins.append(p(config))
except Exception as e:
except (Exception, SystemExit) as e:
LOG.error("Failed to load %s driver: %s", pm.get_name(p), str(e))
plugins.sort()
return plugins
Expand Down
2 changes: 1 addition & 1 deletion src/molecule/dependency/ansible_galaxy/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ def bake(self):
)

def execute(self):
super().execute()
if not self.enabled:
msg = "Skipping, dependency is disabled."
LOG.warning(msg)
return
super().execute()

if not self._has_requirements_file():
msg = "Skipping, missing the requirements file."
Expand Down
2 changes: 1 addition & 1 deletion src/molecule/dependency/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ def bake(self) -> None:
self._sh_command = BakedCommand(cmd=self.command, env=self.env)

def execute(self):
super().execute()
if not self.enabled:
msg = "Skipping, dependency is disabled."
LOG.warning(msg)
return
super().execute()

if self._sh_command is None:
self.bake()
Expand Down