diff --git a/contrib/docker/superset_config.py b/contrib/docker/superset_config.py index 52536d6b6c0..3eda5df5449 100644 --- a/contrib/docker/superset_config.py +++ b/contrib/docker/superset_config.py @@ -1,9 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import os diff --git a/setup.py b/setup.py index 07983d2b381..e7d12d8884d 100644 --- a/setup.py +++ b/setup.py @@ -56,19 +56,18 @@ setup( 'bleach', 'boto3>=1.4.7, <2.0.0', 'botocore>=1.7.0, <1.8.0', - 'celery>=4.2.0', + 'celery>=4.2.0, <5.0.0', 'click>=6.0, <7.0.0', # click >=7 forces "-" instead of "_" 'colorama', 'contextlib2', 'cryptography', - 'flask<1.0.0', - 'flask-appbuilder>=1.12.1', + 'flask>=1.0.0, <2.0.0', + 'flask-appbuilder>=1.12.1, <2.0.0', 'flask-caching', 'flask-compress', 'flask-migrate', 'flask-wtf', 'flower', # deprecated - 'future>=0.16.0, <0.17', 'geopy', 'gunicorn', # deprecated 'humanize', diff --git a/superset/migrations/versions/a99f2f7c195a_rewriting_url_from_shortner_with_new_.py b/superset/migrations/versions/a99f2f7c195a_rewriting_url_from_shortner_with_new_.py index 818d08d8300..14844d90a80 100644 --- a/superset/migrations/versions/a99f2f7c195a_rewriting_url_from_shortner_with_new_.py +++ b/superset/migrations/versions/a99f2f7c195a_rewriting_url_from_shortner_with_new_.py @@ -16,8 +16,6 @@ import sqlalchemy as sa from superset import db from superset.legacy import cast_form_data from sqlalchemy.ext.declarative import declarative_base -from future.standard_library import install_aliases -install_aliases() from urllib import parse Base = declarative_base() diff --git a/superset/models/core.py b/superset/models/core.py index b568e40a210..a13475431fd 100644 --- a/superset/models/core.py +++ b/superset/models/core.py @@ -12,7 +12,6 @@ from flask import escape, g, Markup, request from flask_appbuilder import Model from flask_appbuilder.models.decorators import renders from flask_appbuilder.security.sqla.models import User -from future.standard_library import install_aliases import numpy import pandas as pd import sqlalchemy as sqla @@ -36,7 +35,6 @@ from superset.models.helpers import AuditMixinNullable, ImportMixin from superset.models.user_attributes import UserAttribute from superset.utils import core as utils from superset.viz import viz_types -install_aliases() from urllib import parse # noqa config = app.config diff --git a/superset/models/sql_lab.py b/superset/models/sql_lab.py index c6d5846b23e..9d0c3317b8c 100644 --- a/superset/models/sql_lab.py +++ b/superset/models/sql_lab.py @@ -5,7 +5,6 @@ import re from flask import Markup from flask_appbuilder import Model -from future.standard_library import install_aliases import sqlalchemy as sqla from sqlalchemy import ( Boolean, Column, DateTime, ForeignKey, Integer, Numeric, String, Text, @@ -16,8 +15,6 @@ from superset import security_manager from superset.models.helpers import AuditMixinNullable from superset.utils.core import QueryStatus, user_label -install_aliases() - class Query(Model): """ORM model for SQL query""" diff --git a/superset/utils/dashboard_import_export.py b/superset/utils/dashboard_import_export.py index 27112892561..57f864a6595 100644 --- a/superset/utils/dashboard_import_export.py +++ b/superset/utils/dashboard_import_export.py @@ -1,9 +1,4 @@ # pylint: disable=C,R,W -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import json import logging import time