This is an automated email from the ASF dual-hosted git repository. maximebeauchemin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push: new 280ade8 fix: dashboard export raises schema issues (#10060) 280ade8 is described below commit 280ade826c038d7e1172e3291e9dc14ebbce0dc2 Author: Maxime Beauchemin <maximebeauche...@gmail.com> AuthorDate: Mon Jun 15 21:43:05 2020 -0700 fix: dashboard export raises schema issues (#10060) * fix: dashboard export raises schema issues * Fix isort --- setup.cfg | 2 +- superset-frontend/src/views/dashboardList/DashboardList.tsx | 2 +- superset/db_engine_specs/base.py | 2 +- superset/errors.py | 3 +-- superset/sql_parse.py | 2 +- superset/views/base.py | 2 +- superset/viz.py | 2 +- superset/viz_sip38.py | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/setup.cfg b/setup.cfg index 93e33af..7c13f5e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -45,7 +45,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,croniter,cryptography,dataclasses,dateutil,flask,flask_appbuilder,flask_babel,flask_caching,flask_compress,flask_login,flask_migrate,flask_sqlalchemy,flask_talisman,flask_testing,flask_wtf,geohash,geopy,humanize,isodate,jinja2,markdown,markupsafe,marshmallow,msgpack,numpy,pandas,parsedatetime,pathlib2,polyline,prison,pyarrow,pyhive,pytz,retry,selenium,setuptools,simplejson,sphinx_rtd_theme,sqlalc [...] +known_third_party =alembic,apispec,backoff,bleach,cachelib,celery,click,colorama,contextlib2,croniter,cryptography,dateutil,flask,flask_appbuilder,flask_babel,flask_caching,flask_compress,flask_login,flask_migrate,flask_sqlalchemy,flask_talisman,flask_testing,flask_wtf,geohash,geopy,humanize,isodate,jinja2,markdown,markupsafe,marshmallow,msgpack,numpy,pandas,parsedatetime,pathlib2,polyline,prison,pyarrow,pyhive,pytz,retry,selenium,setuptools,simplejson,sphinx_rtd_theme,sqlalchemy,sqlalch [...] multi_line_output = 3 order_by_type = false diff --git a/superset-frontend/src/views/dashboardList/DashboardList.tsx b/superset-frontend/src/views/dashboardList/DashboardList.tsx index 0260895..3bdea84 100644 --- a/superset-frontend/src/views/dashboardList/DashboardList.tsx +++ b/superset-frontend/src/views/dashboardList/DashboardList.tsx @@ -343,7 +343,7 @@ class DashboardList extends React.PureComponent<Props, State> { handleBulkDashboardExport = (dashboards: Dashboard[]) => { return window.location.assign( `/api/v1/dashboard/export/?q=${rison.encode( - dashboards.map(({ id }) => id).join(','), + dashboards.map(({ id }) => id), )}`, ); }; diff --git a/superset/db_engine_specs/base.py b/superset/db_engine_specs/base.py index 7b0d537..86bbd11 100644 --- a/superset/db_engine_specs/base.py +++ b/superset/db_engine_specs/base.py @@ -15,6 +15,7 @@ # specific language governing permissions and limitations # under the License. # pylint: disable=unused-argument +import dataclasses import hashlib import json import logging @@ -33,7 +34,6 @@ from typing import ( Union, ) -import dataclasses import pandas as pd import sqlparse from flask import g diff --git a/superset/errors.py b/superset/errors.py index 54eb0ed..66e2e2f 100644 --- a/superset/errors.py +++ b/superset/errors.py @@ -15,11 +15,10 @@ # specific language governing permissions and limitations # under the License. # pylint: disable=too-few-public-methods,invalid-name +from dataclasses import dataclass from enum import Enum from typing import Any, Dict, Optional -from dataclasses import dataclass - class SupersetErrorType(str, Enum): """ diff --git a/superset/sql_parse.py b/superset/sql_parse.py index d87db83..b43b113 100644 --- a/superset/sql_parse.py +++ b/superset/sql_parse.py @@ -15,11 +15,11 @@ # specific language governing permissions and limitations # under the License. import logging +from dataclasses import dataclass from typing import List, Optional, Set from urllib import parse import sqlparse -from dataclasses import dataclass from sqlparse.sql import Identifier, IdentifierList, remove_quotes, Token, TokenList from sqlparse.tokens import Keyword, Name, Punctuation, String, Whitespace from sqlparse.utils import imt diff --git a/superset/views/base.py b/superset/views/base.py index 6c54baf..e9dab54 100644 --- a/superset/views/base.py +++ b/superset/views/base.py @@ -14,13 +14,13 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +import dataclasses import functools import logging import traceback from datetime import datetime from typing import Any, Callable, cast, Dict, List, Optional, TYPE_CHECKING, Union -import dataclasses import simplejson as json import yaml from flask import abort, flash, g, get_flashed_messages, redirect, Response, session diff --git a/superset/viz.py b/superset/viz.py index 93e840c..2496a5c 100644 --- a/superset/viz.py +++ b/superset/viz.py @@ -21,6 +21,7 @@ These objects represent the backend of all the visualizations that Superset can render. """ import copy +import dataclasses import hashlib import inspect import logging @@ -33,7 +34,6 @@ from datetime import datetime, timedelta from itertools import product from typing import Any, cast, Dict, List, Optional, Set, Tuple, TYPE_CHECKING, Union -import dataclasses import geohash import numpy as np import pandas as pd diff --git a/superset/viz_sip38.py b/superset/viz_sip38.py index b1a3b77..a3e00de 100644 --- a/superset/viz_sip38.py +++ b/superset/viz_sip38.py @@ -22,6 +22,7 @@ Superset can render. """ # mypy: ignore-errors import copy +import dataclasses import hashlib import inspect import logging @@ -34,7 +35,6 @@ from datetime import datetime, timedelta from itertools import product from typing import Any, Dict, List, Optional, Set, Tuple, TYPE_CHECKING -import dataclasses import geohash import numpy as np import pandas as pd