mistercrunch closed pull request #6219: A few setup.py improvements, removing
future lib
URL: https://github.com/apache/incubator-superset/pull/6219
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/contrib/docker/superset_config.py
b/contrib/docker/superset_config.py
index 52536d6b6c..3eda5df544 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 07983d2b38..e7d12d8884 100644
--- a/setup.py
+++ b/setup.py
@@ -56,19 +56,18 @@ def get_git_sha():
'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 818d08d830..14844d90a8 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 @@
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 b568e40a21..a13475431f 100644
--- a/superset/models/core.py
+++ b/superset/models/core.py
@@ -12,7 +12,6 @@
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.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 c6d5846b23..9d0c3317b8 100644
--- a/superset/models/sql_lab.py
+++ b/superset/models/sql_lab.py
@@ -5,7 +5,6 @@
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.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 2711289256..57f864a659 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
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
