Skip to content

Commit

Permalink
Revert "Temporary disable support for external drivers" (#3974)
Browse files Browse the repository at this point in the history
Revert: #3961
  • Loading branch information
audgirka authored Jul 25, 2023
1 parent f408470 commit 875f5de
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
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.next"]
[project.entry-points."molecule.driver"]
default = "molecule.driver.delegated:Delegated"

[project.entry-points."molecule.verifier.next"]
[project.entry-points."molecule.verifier"]
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.next")
pm = pluggy.PluginManager("molecule.driver")
try:
pm.load_setuptools_entrypoints("molecule.driver.next")
pm.load_setuptools_entrypoints("molecule.driver")
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.next")
pm = pluggy.PluginManager("molecule.verifier")
try:
pm.load_setuptools_entrypoints("molecule.verifier.next")
pm.load_setuptools_entrypoints("molecule.verifier")
except Exception:
# These are not fatal because a broken verifier should not make the entire
# tool unusable.
Expand Down

0 comments on commit 875f5de

Please sign in to comment.