From a0b54af1fce4f7cf5a07725914c6c8b5e807c852 Mon Sep 17 00:00:00 2001 From: Thomas Robitaille Date: Fri, 10 Jul 2015 17:35:12 +0800 Subject: [PATCH 1/2] Fix compatibility with setuptools < 11.3 --- glue/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/glue/main.py b/glue/main.py index 5b48153e2..673290f3a 100755 --- a/glue/main.py +++ b/glue/main.py @@ -255,14 +255,15 @@ def load_plugins(): # where ``setup`` is a function that does whatever is needed to set up the # plugin, such as add items to various registries. - logger.info("Loading external plugins") + import setuptools + logger.info("Loading external plugins using setuptools=={0}".format(setuptools.__version__)) from ._plugin_helpers import iter_plugin_entry_points for item in iter_plugin_entry_points(): if item.module_name in _loaded_plugins: logger.info("Plugin {0} already loaded".format(item.name)) continue try: - function = item.resolve() + function = item.load() function() except Exception as exc: logger.info("Loading plugin {0} failed (Exception: {1})".format(item.name, exc)) From 785b1045449521857be29ba833390a2fce4f1822 Mon Sep 17 00:00:00 2001 From: Thomas Robitaille Date: Fri, 10 Jul 2015 17:35:53 +0800 Subject: [PATCH 2/2] Added changelog entry --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 6d6171a27..82ac5aae6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,7 +9,7 @@ v0.6 (unreleased) v0.5.2 (unreleased) ------------------- -* No changes yet +* Fix loading of plugins with setuptools < 11.3 v0.5.1 (2015-07-06) -------------------