diff --git a/superset/charts/commands/export.py b/superset/charts/commands/export.py index f4aaa6328..12ca90722 100644 --- a/superset/charts/commands/export.py +++ b/superset/charts/commands/export.py @@ -28,7 +28,7 @@ from superset.charts.dao import ChartDAO from superset.datasets.commands.export import ExportDatasetsCommand from superset.commands.export import ExportModelsCommand from superset.models.slice import Slice -from superset.utils.dict_import_export import IMPORT_EXPORT_VERSION +from superset.utils.dict_import_export import EXPORT_VERSION logger = logging.getLogger(__name__) @@ -63,7 +63,7 @@ class ExportChartsCommand(ExportModelsCommand): except json.decoder.JSONDecodeError: logger.info("Unable to decode `params` field: %s", payload["params"]) - payload["version"] = IMPORT_EXPORT_VERSION + payload["version"] = EXPORT_VERSION if model.table: payload["dataset_uuid"] = str(model.table.uuid) diff --git a/superset/commands/export.py b/superset/commands/export.py index 1c687fbea..05f126ec7 100644 --- a/superset/commands/export.py +++ b/superset/commands/export.py @@ -26,7 +26,7 @@ from flask_appbuilder import Model from superset.commands.base import BaseCommand from superset.commands.exceptions import CommandException from superset.dao.base import BaseDAO -from superset.utils.dict_import_export import IMPORT_EXPORT_VERSION +from superset.utils.dict_import_export import EXPORT_VERSION METADATA_FILE_NAME = "metadata.yaml" @@ -50,7 +50,7 @@ class ExportModelsCommand(BaseCommand): self.validate() metadata = { - "version": IMPORT_EXPORT_VERSION, + "version": EXPORT_VERSION, "type": self.dao.model_cls.__name__, # type: ignore "timestamp": datetime.now(tz=timezone.utc).isoformat(), } diff --git a/superset/dashboards/commands/export.py b/superset/dashboards/commands/export.py index fb058272f..7db4b624a 100644 --- a/superset/dashboards/commands/export.py +++ b/superset/dashboards/commands/export.py @@ -28,7 +28,7 @@ from superset.dashboards.commands.exceptions import DashboardNotFoundError from superset.dashboards.dao import DashboardDAO from superset.commands.export import ExportModelsCommand from superset.models.dashboard import Dashboard -from superset.utils.dict_import_export import IMPORT_EXPORT_VERSION +from superset.utils.dict_import_export import EXPORT_VERSION logger = logging.getLogger(__name__) @@ -63,7 +63,7 @@ class ExportDashboardsCommand(ExportModelsCommand): except json.decoder.JSONDecodeError: logger.info("Unable to decode `%s` field: %s", key, value) - payload["version"] = IMPORT_EXPORT_VERSION + payload["version"] = EXPORT_VERSION file_content = yaml.safe_dump(payload, sort_keys=False) yield file_name, file_content diff --git a/superset/databases/commands/export.py b/superset/databases/commands/export.py index 0ce1de103..9fc2e5e51 100644 --- a/superset/databases/commands/export.py +++ b/superset/databases/commands/export.py @@ -27,7 +27,7 @@ from superset.databases.commands.exceptions import DatabaseNotFoundError from superset.databases.dao import DatabaseDAO from superset.commands.export import ExportModelsCommand from superset.models.core import Database -from superset.utils.dict_import_export import IMPORT_EXPORT_VERSION +from superset.utils.dict_import_export import EXPORT_VERSION logger = logging.getLogger(__name__) @@ -56,7 +56,7 @@ class ExportDatabasesCommand(ExportModelsCommand): except json.decoder.JSONDecodeError: logger.info("Unable to decode `extra` field: %s", payload["extra"]) - payload["version"] = IMPORT_EXPORT_VERSION + payload["version"] = EXPORT_VERSION file_content = yaml.safe_dump(payload, sort_keys=False) yield file_name, file_content @@ -71,7 +71,7 @@ class ExportDatabasesCommand(ExportModelsCommand): include_defaults=True, export_uuids=True, ) - payload["version"] = IMPORT_EXPORT_VERSION + payload["version"] = EXPORT_VERSION payload["database_uuid"] = str(model.uuid) file_content = yaml.safe_dump(payload, sort_keys=False) diff --git a/superset/datasets/commands/export.py b/superset/datasets/commands/export.py index a45a35f91..72e417098 100644 --- a/superset/datasets/commands/export.py +++ b/superset/datasets/commands/export.py @@ -27,7 +27,7 @@ from superset.commands.export import ExportModelsCommand from superset.connectors.sqla.models import SqlaTable from superset.datasets.commands.exceptions import DatasetNotFoundError from superset.datasets.dao import DatasetDAO -from superset.utils.dict_import_export import IMPORT_EXPORT_VERSION +from superset.utils.dict_import_export import EXPORT_VERSION logger = logging.getLogger(__name__) @@ -50,7 +50,7 @@ class ExportDatasetsCommand(ExportModelsCommand): export_uuids=True, ) - payload["version"] = IMPORT_EXPORT_VERSION + payload["version"] = EXPORT_VERSION payload["database_uuid"] = str(model.database.uuid) file_content = yaml.safe_dump(payload, sort_keys=False) @@ -73,7 +73,7 @@ class ExportDatasetsCommand(ExportModelsCommand): except json.decoder.JSONDecodeError: logger.info("Unable to decode `extra` field: %s", payload["extra"]) - payload["version"] = IMPORT_EXPORT_VERSION + payload["version"] = EXPORT_VERSION file_content = yaml.safe_dump(payload, sort_keys=False) yield file_name, file_content diff --git a/superset/queries/saved_queries/commands/export.py b/superset/queries/saved_queries/commands/export.py index 2733cd1ba..c22155ea8 100644 --- a/superset/queries/saved_queries/commands/export.py +++ b/superset/queries/saved_queries/commands/export.py @@ -27,7 +27,7 @@ from superset.commands.export import ExportModelsCommand from superset.models.sql_lab import SavedQuery from superset.queries.saved_queries.commands.exceptions import SavedQueryNotFoundError from superset.queries.saved_queries.dao import SavedQueryDAO -from superset.utils.dict_import_export import IMPORT_EXPORT_VERSION +from superset.utils.dict_import_export import EXPORT_VERSION logger = logging.getLogger(__name__) @@ -51,7 +51,7 @@ class ExportSavedQueriesCommand(ExportModelsCommand): include_defaults=True, export_uuids=True, ) - payload["version"] = IMPORT_EXPORT_VERSION + payload["version"] = EXPORT_VERSION payload["database_uuid"] = str(model.database.uuid) file_content = yaml.safe_dump(payload, sort_keys=False) @@ -74,7 +74,7 @@ class ExportSavedQueriesCommand(ExportModelsCommand): except json.decoder.JSONDecodeError: logger.info("Unable to decode `extra` field: %s", payload["extra"]) - payload["version"] = IMPORT_EXPORT_VERSION + payload["version"] = EXPORT_VERSION file_content = yaml.safe_dump(payload, sort_keys=False) yield file_name, file_content diff --git a/superset/utils/dict_import_export.py b/superset/utils/dict_import_export.py index c2606f4f5..3a37e91c8 100644 --- a/superset/utils/dict_import_export.py +++ b/superset/utils/dict_import_export.py @@ -22,7 +22,7 @@ from sqlalchemy.orm import Session from superset.connectors.druid.models import DruidCluster from superset.models.core import Database -IMPORT_EXPORT_VERSION = "1.0.0" +EXPORT_VERSION = "1.0.0" DATABASES_KEY = "databases" DRUID_CLUSTERS_KEY = "druid_clusters" logger = logging.getLogger(__name__)