-
Notifications
You must be signed in to change notification settings - Fork 13.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Local config no longer fails to import silently #8006
Merged
Merged
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,7 +23,9 @@ | |
""" | ||
from collections import OrderedDict | ||
import imp | ||
import importlib.util | ||
import json | ||
import logging | ||
import os | ||
import sys | ||
|
||
|
@@ -622,29 +624,31 @@ class CeleryConfig(object): | |
# SQLALCHEMY_DATABASE_URI by default if set to `None` | ||
SQLALCHEMY_EXAMPLES_URI = None | ||
|
||
try: | ||
if CONFIG_PATH_ENV_VAR in os.environ: | ||
# Explicitly import config module that is not in pythonpath; useful | ||
# for case where app is being executed via pex. | ||
print( | ||
"Loaded your LOCAL configuration at [{}]".format( | ||
os.environ[CONFIG_PATH_ENV_VAR] | ||
) | ||
) | ||
if CONFIG_PATH_ENV_VAR in os.environ: | ||
# Explicitly import config module that is not necessarily in pythonpath; useful | ||
# for case where app is being executed via pex. | ||
try: | ||
cfg_path = os.environ[CONFIG_PATH_ENV_VAR] | ||
module = sys.modules[__name__] | ||
override_conf = imp.load_source( | ||
"superset_config", os.environ[CONFIG_PATH_ENV_VAR] | ||
) | ||
override_conf = imp.load_source("superset_config", cfg_path) | ||
for key in dir(override_conf): | ||
if key.isupper(): | ||
setattr(module, key, getattr(override_conf, key)) | ||
|
||
else: | ||
print("Loaded your LOCAL configuration at [{}]".format(cfg_path)) | ||
except Exception: | ||
logging.exception( | ||
"Failed to import config for {}={}".format(CONFIG_PATH_ENV_VAR, cfg_path) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: same here, using f-strings. |
||
) | ||
raise | ||
elif importlib.util.find_spec("superset_config"): | ||
try: | ||
from superset_config import * # noqa | ||
import superset_config | ||
|
||
print( | ||
"Loaded your LOCAL configuration at [{}]".format(superset_config.__file__) | ||
) | ||
except ImportError: | ||
pass | ||
except Exception: | ||
logging.exception("Failed to import local superset_confg") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Typo: "superset_config" |
||
raise | ||
betodealmeida marked this conversation as resolved.
Show resolved
Hide resolved
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: can you update this to use f-strings? Superset no longer supports Python < 3.6.