From 875f5deec42ba219aa0aeea17ac5b63285eae213 Mon Sep 17 00:00:00 2001 From: Ajinkya Udgirkar Date: Tue, 25 Jul 2023 14:21:48 +0530 Subject: [PATCH] Revert "Temporary disable support for external drivers" (#3974) Revert: #3961 --- pyproject.toml | 4 ++-- src/molecule/api.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7f62b2035..21bbd38d2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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" diff --git a/src/molecule/api.py b/src/molecule/api.py index 6b14a6bab..3f7e0908b 100644 --- a/src/molecule/api.py +++ b/src/molecule/api.py @@ -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. @@ -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.