Merge branch 'application-plugins' of https://github.com/davidlatwe/rez into davidlatwe-application-plugins

Author: ajohns

src/rez/plugin_managers.py

@@ -67,15 +67,15 @@ def append_if_valid(dir_):
     for dir_ in config.plugin_path:
         append_if_valid(dir_)
     # Extend new-style plugins
-    for dir_ in plugin_manager.sys_module_paths:
+    for dir_ in plugin_manager.rezplugins_module_paths:
         append_if_valid(dir_)
 
     return path
 
 
-def uncache_sys_module_paths(instance=None):
+def uncache_rezplugins_module_paths(instance=None):
     instance = instance or plugin_manager
-    cached_property.uncache(instance, "sys_module_paths")
+    cached_property.uncache(instance, "rezplugins_module_paths")
 
 
 class RezPluginType(object):
@@ -296,11 +296,16 @@ def __init__(self):
         self._plugin_types = {}
 
     @cached_property
-    def sys_module_paths(self):
+    def rezplugins_module_paths(self):
         paths = []
         for importer, name, ispkg in pkgutil.iter_modules():
-            if ispkg:
-                paths.append(os.path.join(importer.path, name))
+            if not ispkg:
+                continue
+
+            module_path = os.path.join(importer.path, name)
+            if os.path.isdir(os.path.join(module_path, "rezplugins")):
+                paths.append(module_path)
+
         return paths
 
     # -- plugin types

src/rez/tests/test_plugin_manager.py

@@ -2,7 +2,7 @@
 test rezplugins manager behaviors
 """
 from rez.tests.util import TestBase, TempdirMixin, restore_sys_path
-from rez.plugin_managers import plugin_manager, uncache_sys_module_paths
+from rez.plugin_managers import plugin_manager, uncache_rezplugins_module_paths
 from rez.package_repository import package_repository_manager
 import sys
 import unittest
@@ -19,7 +19,7 @@ def _reset_plugin_manager(cls):
         package_repository_manager.clear_caches()
         package_repository_manager.pool.resource_classes.clear()
         # for resetting new-style plugins
-        uncache_sys_module_paths()
+        uncache_rezplugins_module_paths()
 
         plugin_types = []
         for singleton in plugin_manager._plugin_types.values():