iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove pydash merge (#15435)

This commit is contained in:
Beto Dealmeida 2021-06-28 15:40:44 -07:00 committed by GitHub
parent 21d1fb55c6
commit ed6d10e283
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.cfg
View File

@ -30,7 +30,7 @@ combine_as_imports = true
include_trailing_comma = true include_trailing_comma = true
line_length = 88 line_length = 88
known_first_party = superset known_first_party = superset
known_third_party =alembic,apispec,backoff,bleach,cachelib,celery,click,colorama,contextlib2,cron_descriptor,croniter,cryptography,dateutil,deprecation,flask,flask_appbuilder,flask_babel,flask_caching,flask_compress,flask_jwt_extended,flask_login,flask_migrate,flask_sqlalchemy,flask_talisman,flask_testing,flask_wtf,freezegun,geohash,geopy,graphlib,holidays,humanize,isodate,jinja2,jwt,markdown,markupsafe,marshmallow,marshmallow_enum,msgpack,numpy,pandas,parameterized,parsedatetime,pathlib2,pgsanity,pkg_resources,polyline,prison,pyarrow,pydash,pyhive,pyparsing,pytest,pytz,redis,requests,retry,selenium,setuptools,simplejson,slack,sqlalchemy,sqlalchemy_utils,sqlparse,typing_extensions,werkzeug,wtforms,wtforms_json,yaml known_third_party =alembic,apispec,backoff,bleach,cachelib,celery,click,colorama,contextlib2,cron_descriptor,croniter,cryptography,dateutil,deprecation,flask,flask_appbuilder,flask_babel,flask_caching,flask_compress,flask_jwt_extended,flask_login,flask_migrate,flask_sqlalchemy,flask_talisman,flask_testing,flask_wtf,freezegun,geohash,geopy,graphlib,holidays,humanize,isodate,jinja2,jwt,markdown,markupsafe,marshmallow,marshmallow_enum,msgpack,numpy,pandas,parameterized,parsedatetime,pathlib2,pgsanity,pkg_resources,polyline,prison,pyarrow,pyhive,pyparsing,pytest,pytz,redis,requests,retry,selenium,setuptools,simplejson,slack,sqlalchemy,sqlalchemy_utils,sqlparse,typing_extensions,werkzeug,wtforms,wtforms_json,yaml
multi_line_output = 3 multi_line_output = 3
order_by_type = false order_by_type = false

1
setup.py
View File

@ -112,7 +112,6 @@ setup(
"wtforms-json", "wtforms-json",
"pyparsing>=2.4.7, <3.0.0", "pyparsing>=2.4.7, <3.0.0",
"holidays==0.10.3", # PINNED! https://github.com/dr-prodigy/python-holidays/issues/406 "holidays==0.10.3", # PINNED! https://github.com/dr-prodigy/python-holidays/issues/406
"pydash>=5.0.0, <5.1.0",
"deprecation>=2.1.0, <2.2.0", "deprecation>=2.1.0, <2.2.0",
], ],
extras_require={ extras_require={

4
superset/app.py
View File

@ -24,7 +24,6 @@ from types import ModuleType
from typing import Any, Dict, Union from typing import Any, Dict, Union
from flask import Flask from flask import Flask
from pydash.objects import merge
from werkzeug.utils import import_string from werkzeug.utils import import_string
from superset.initialization import SupersetAppInitializer from superset.initialization import SupersetAppInitializer
@ -55,7 +54,8 @@ def create_app() -> Flask:
def init_config() -> Dict[Any, Any]: def init_config() -> Dict[Any, Any]:
config = convert_to_dict(load_default_config()) config = convert_to_dict(load_default_config())
override_conf = convert_to_dict(load_override_config()) override_conf = convert_to_dict(load_override_config())
return merge(config, override_conf) config.update(override_conf)
return config
def convert_to_dict(module: Union[ModuleType, Dict[Any, Any]]) -> Dict[Any, Any]: def convert_to_dict(module: Union[ModuleType, Dict[Any, Any]]) -> Dict[Any, Any]: