diff --git a/src/rez/plugin_managers.py b/src/rez/plugin_managers.py index 6cd3af1b6..e561f8087 100644 --- a/src/rez/plugin_managers.py +++ b/src/rez/plugin_managers.py @@ -210,9 +210,11 @@ def register_plugin_module(self, plugin_name, plugin_module, plugin_path): plugin_class = plugin_module.register_plugin() if plugin_class is not None: - self.register_plugin(plugin_name, - plugin_class, - plugin_module) + self.register_plugin( + plugin_name, + plugin_class, + plugin_module + ) else: if config.debug("plugins"): print_warning( diff --git a/src/rez/tests/util.py b/src/rez/tests/util.py index fca272282..3a497e65f 100644 --- a/src/rez/tests/util.py +++ b/src/rez/tests/util.py @@ -301,7 +301,6 @@ def wrapper(self, *args, **kwargs): return decorator - _restore_sys_path_lock = threading.Lock() _restore_os_environ_lock = threading.Lock() _restore_pip_lock = threading.Lock() @@ -365,13 +364,14 @@ def restore_os_environ(): os.environ.clear() os.environ.update(original) + @contextmanager def restore_pip(package_name, package_path): from pip._internal import main as pipmain - + with _restore_pip_lock: pipmain(['install', package_path]) - + yield True - pipmain(['uninstall', package_name, "-y"]) \ No newline at end of file + pipmain(['uninstall', package_name, "-y"])