Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A few setup.py improvements, removing future lib #6219

Merged
merged 1 commit into from
Oct 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions contrib/docker/superset_config.py
Original file line number Diff line number Diff line change
@@ -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


Expand Down
7 changes: 3 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 0 additions & 2 deletions superset/models/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 0 additions & 3 deletions superset/models/sql_lab.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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"""
Expand Down
5 changes: 0 additions & 5 deletions superset/utils/dashboard_import_export.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down