From ed9b8f5a47507376ca1917ba2e54d8f4ee683947 Mon Sep 17 00:00:00 2001 From: Beto Dealmeida Date: Mon, 28 Jun 2021 15:18:37 -0700 Subject: [PATCH] Remove pydash merge --- setup.cfg | 2 +- setup.py | 1 - superset/app.py | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 09f07931b792..afb034b3f129 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,7 @@ combine_as_imports = true include_trailing_comma = true line_length = 88 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 order_by_type = false diff --git a/setup.py b/setup.py index c38fe4ccd841..31cadf2b3bdb 100644 --- a/setup.py +++ b/setup.py @@ -112,7 +112,6 @@ def get_git_sha(): "wtforms-json", "pyparsing>=2.4.7, <3.0.0", "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", ], extras_require={ diff --git a/superset/app.py b/superset/app.py index 76ae4318b710..31787be0055d 100644 --- a/superset/app.py +++ b/superset/app.py @@ -24,7 +24,6 @@ from typing import Any, Dict, Union from flask import Flask -from pydash.objects import merge from werkzeug.utils import import_string from superset.initialization import SupersetAppInitializer @@ -55,7 +54,8 @@ def create_app() -> Flask: def init_config() -> Dict[Any, Any]: config = convert_to_dict(load_default_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]: