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

Temporary disable support for external drivers #3961

Merged
merged 1 commit into from
Jul 10, 2023
Merged
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
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ changelog = "https://github.com/ansible-community/molecule/releases"
[project.scripts]
molecule = "molecule.__main__:main"

[project.entry-points."molecule.driver"]
[project.entry-points."molecule.driver.next"]
delegated = "molecule.driver.delegated:Delegated"

[project.entry-points."molecule.verifier"]
[project.entry-points."molecule.verifier.next"]
testinfra = "molecule.verifier.testinfra:Testinfra"
ansible = "molecule.verifier.ansible:Ansible"

Expand Down
8 changes: 4 additions & 4 deletions src/molecule/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ class IncompatibleMoleculeRuntimeWarning(MoleculeRuntimeWarning):
def drivers(config=None) -> UserListMap:
"""Return list of active drivers."""
plugins = UserListMap()
pm = pluggy.PluginManager("molecule.driver")
pm = pluggy.PluginManager("molecule.driver.next")
try:
pm.load_setuptools_entrypoints("molecule.driver")
pm.load_setuptools_entrypoints("molecule.driver.next")
except (Exception, SystemExit):
# These are not fatal because a broken driver should not make the entire
# tool unusable.
Expand All @@ -68,9 +68,9 @@ def drivers(config=None) -> UserListMap:
def verifiers(config=None) -> UserListMap:
"""Return list of active verifiers."""
plugins = UserListMap()
pm = pluggy.PluginManager("molecule.verifier")
pm = pluggy.PluginManager("molecule.verifier.next")
try:
pm.load_setuptools_entrypoints("molecule.verifier")
pm.load_setuptools_entrypoints("molecule.verifier.next")
except Exception:
# These are not fatal because a broken verifier should not make the entire
# tool unusable.
Expand Down