From f1d9fa08bece9ccaebd343d0f3047a0d5706dd6d Mon Sep 17 00:00:00 2001 From: Marina Samuel Date: Tue, 27 Nov 2018 10:18:34 -0500 Subject: [PATCH] Use entry_point.module_name instead of entry_point.name for looking up the bundles. --- bin/bundle-extensions | 9 ++++++--- requirements.txt | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bin/bundle-extensions b/bin/bundle-extensions index 8416aab776..56173f4c5f 100755 --- a/bin/bundle-extensions +++ b/bin/bundle-extensions @@ -22,9 +22,12 @@ os.environ["EXTENSIONS_DIRECTORY"] = EXTENSIONS_RELATIVE_PATH for entry_point in iter_entry_points('redash.extensions'): # This is where the frontend code for an extension lives # inside of its package. - content_folder_relative = os.path.join( - entry_point.name, 'bundle') - (root_module, _) = os.path.splitext(entry_point.module_name) + + split_module_path = entry_point.module_name.split(os.extsep) + root_module = split_module_path.pop(0) + + content_folder_relative = os.path.join(os.path.join( + *split_module_path), 'bundle') if not resource_isdir(root_module, content_folder_relative): continue diff --git a/requirements.txt b/requirements.txt index 5c8eb4effb..e0e6cfb668 100644 --- a/requirements.txt +++ b/requirements.txt @@ -61,4 +61,4 @@ disposable-email-domains # It is not included by default because of the GPL license conflict. # ldap3==2.2.4 gevent==1.4.0 -redash-stmo>=2018.9.1 +redash-stmo>=2018.12.0