mirror of https://github.com/apache/superset.git
Bump Flask, bleach and sync pip-compile (#6239)
* sync pip-compile * Support Flask >= 1.0.0 * pylint * Trying something else to fix pylint
This commit is contained in:
parent
7b3095d6ff
commit
e46ab4db52
|
@ -221,8 +221,8 @@ superset init
|
||||||
# Load some data to play with
|
# Load some data to play with
|
||||||
superset load_examples
|
superset load_examples
|
||||||
|
|
||||||
# Start the Flask web server (but see below for frontend asset compilation)
|
# Start the Flask dev web server (but see below for frontend asset compilation)
|
||||||
superset runserver -d
|
flask run -p 8080 --with-threads --reload --debugger
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Logging to the browser console
|
#### Logging to the browser console
|
||||||
|
|
|
@ -4,7 +4,7 @@ set -ex
|
||||||
if [ "$#" -ne 0 ]; then
|
if [ "$#" -ne 0 ]; then
|
||||||
exec "$@"
|
exec "$@"
|
||||||
elif [ "$SUPERSET_ENV" = "local" ]; then
|
elif [ "$SUPERSET_ENV" = "local" ]; then
|
||||||
superset runserver -d
|
flask run -p 8080 --with-threads --reload --debugger
|
||||||
elif [ "$SUPERSET_ENV" = "production" ]; then
|
elif [ "$SUPERSET_ENV" = "production" ]; then
|
||||||
superset runserver -a 0.0.0.0 -w $((2 * $(getconf _NPROCESSORS_ONLN) + 1))
|
superset runserver -a 0.0.0.0 -w $((2 * $(getconf _NPROCESSORS_ONLN) + 1))
|
||||||
else
|
else
|
||||||
|
|
|
@ -20,5 +20,5 @@ cd superset/assets && npm run build && cd ../../
|
||||||
# Start superset worker for SQL Lab
|
# Start superset worker for SQL Lab
|
||||||
superset worker &
|
superset worker &
|
||||||
|
|
||||||
# To start a development web server, use the -d switch
|
# Start the dev web server
|
||||||
superset runserver -d
|
flask run -p 8080 --with-threads --reload --debugger
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
console_log==0.2.10
|
console_log==0.2.10
|
||||||
|
python-dotenv
|
||||||
flake8-commas==2.0.0
|
flake8-commas==2.0.0
|
||||||
flake8-import-order==0.18
|
flake8-import-order==0.18
|
||||||
flake8-quotes==1.0.0
|
flake8-quotes==1.0.0
|
||||||
|
|
|
@ -9,7 +9,7 @@ amqp==2.3.2 # via kombu
|
||||||
asn1crypto==0.24.0 # via cryptography
|
asn1crypto==0.24.0 # via cryptography
|
||||||
babel==2.6.0 # via flask-babel, flower
|
babel==2.6.0 # via flask-babel, flower
|
||||||
billiard==3.5.0.4 # via celery
|
billiard==3.5.0.4 # via celery
|
||||||
bleach==2.1.2
|
bleach==3.0.2
|
||||||
boto3==1.4.7
|
boto3==1.4.7
|
||||||
botocore==1.7.48
|
botocore==1.7.48
|
||||||
cchardet==1.0.0 # via tabulator
|
cchardet==1.0.0 # via tabulator
|
||||||
|
@ -33,12 +33,11 @@ flask-migrate==2.1.1
|
||||||
flask-openid==1.2.5 # via flask-appbuilder
|
flask-openid==1.2.5 # via flask-appbuilder
|
||||||
flask-sqlalchemy==2.3.2 # via flask-appbuilder, flask-migrate
|
flask-sqlalchemy==2.3.2 # via flask-appbuilder, flask-migrate
|
||||||
flask-wtf==0.14.2
|
flask-wtf==0.14.2
|
||||||
flask==0.12.2
|
flask==1.0.2
|
||||||
flower==0.9.2
|
flower==0.9.2
|
||||||
future==0.16.0
|
future==0.16.0 # via pyhive
|
||||||
geopy==1.11.0
|
geopy==1.11.0
|
||||||
gunicorn==19.8.0
|
gunicorn==19.8.0
|
||||||
html5lib==1.0.1 # via bleach
|
|
||||||
humanize==0.5.1
|
humanize==0.5.1
|
||||||
idna==2.6
|
idna==2.6
|
||||||
ijson==2.3 # via tabulator
|
ijson==2.3 # via tabulator
|
||||||
|
@ -74,7 +73,7 @@ rfc3986==1.1.0 # via tableschema
|
||||||
s3transfer==0.1.13 # via boto3
|
s3transfer==0.1.13 # via boto3
|
||||||
sasl==0.2.1 # via thrift-sasl
|
sasl==0.2.1 # via thrift-sasl
|
||||||
simplejson==3.15.0
|
simplejson==3.15.0
|
||||||
six==1.11.0 # via bleach, cryptography, html5lib, isodate, jsonlines, linear-tsv, pathlib2, polyline, pydruid, python-dateutil, sasl, sqlalchemy-utils, tableschema, tabulator, thrift
|
six==1.11.0 # via bleach, cryptography, isodate, jsonlines, linear-tsv, pathlib2, polyline, pydruid, python-dateutil, sasl, sqlalchemy-utils, tableschema, tabulator, thrift
|
||||||
sqlalchemy-utils==0.32.21
|
sqlalchemy-utils==0.32.21
|
||||||
sqlalchemy==1.2.2
|
sqlalchemy==1.2.2
|
||||||
sqlparse==0.2.4
|
sqlparse==0.2.4
|
||||||
|
@ -87,7 +86,7 @@ unicodecsv==0.14.1
|
||||||
unidecode==1.0.22
|
unidecode==1.0.22
|
||||||
urllib3==1.22 # via requests
|
urllib3==1.22 # via requests
|
||||||
vine==1.1.4 # via amqp
|
vine==1.1.4 # via amqp
|
||||||
webencodings==0.5.1 # via html5lib
|
webencodings==0.5.1 # via bleach
|
||||||
werkzeug==0.14.1 # via flask
|
werkzeug==0.14.1 # via flask
|
||||||
wtforms==2.2.1 # via flask-wtf
|
wtforms==2.2.1 # via flask-wtf
|
||||||
xlrd==1.1.0 # via tabulator
|
xlrd==1.1.0 # via tabulator
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -53,7 +53,7 @@ setup(
|
||||||
zip_safe=False,
|
zip_safe=False,
|
||||||
scripts=['superset/bin/superset'],
|
scripts=['superset/bin/superset'],
|
||||||
install_requires=[
|
install_requires=[
|
||||||
'bleach',
|
'bleach>=3.0.2, <4.0.0',
|
||||||
'boto3>=1.4.7, <2.0.0',
|
'boto3>=1.4.7, <2.0.0',
|
||||||
'botocore>=1.7.0, <1.8.0',
|
'botocore>=1.7.0, <1.8.0',
|
||||||
'celery>=4.2.0, <5.0.0',
|
'celery>=4.2.0, <5.0.0',
|
||||||
|
|
|
@ -99,11 +99,11 @@ if conf.get('SILENCE_FAB'):
|
||||||
logging.getLogger('flask_appbuilder').setLevel(logging.ERROR)
|
logging.getLogger('flask_appbuilder').setLevel(logging.ERROR)
|
||||||
|
|
||||||
if app.debug:
|
if app.debug:
|
||||||
app.logger.setLevel(logging.DEBUG)
|
app.logger.setLevel(logging.DEBUG) # pylint: disable=no-member
|
||||||
else:
|
else:
|
||||||
# In production mode, add log handler to sys.stderr.
|
# In production mode, add log handler to sys.stderr.
|
||||||
app.logger.addHandler(logging.StreamHandler())
|
app.logger.addHandler(logging.StreamHandler()) # pylint: disable=no-member
|
||||||
app.logger.setLevel(logging.INFO)
|
app.logger.setLevel(logging.INFO) # pylint: disable=no-member
|
||||||
logging.getLogger('pyhive.presto').setLevel(logging.INFO)
|
logging.getLogger('pyhive.presto').setLevel(logging.INFO)
|
||||||
|
|
||||||
db = SQLA(app)
|
db = SQLA(app)
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
import warnings
|
|
||||||
import click
|
import click
|
||||||
from flask.cli import FlaskGroup
|
from flask.cli import FlaskGroup
|
||||||
from flask.exthook import ExtDeprecationWarning
|
|
||||||
from superset.cli import create_app
|
from superset.cli import create_app
|
||||||
|
|
||||||
warnings.simplefilter('ignore', ExtDeprecationWarning)
|
|
||||||
|
|
||||||
@click.group(cls=FlaskGroup, create_app=create_app)
|
@click.group(cls=FlaskGroup, create_app=create_app)
|
||||||
def cli():
|
def cli():
|
||||||
"""This is a management script for the superset application."""
|
"""This is a management script for the Superset application."""
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
cli()
|
cli()
|
||||||
|
|
|
@ -38,12 +38,17 @@ def init():
|
||||||
|
|
||||||
|
|
||||||
def debug_run(app, port, use_reloader):
|
def debug_run(app, port, use_reloader):
|
||||||
return app.run(
|
click.secho(
|
||||||
host='0.0.0.0',
|
'[DEPRECATED] As of Flask >=1.0.0, this command is no longer '
|
||||||
port=int(port),
|
'supported, please use `flask run` instead, as documented in our '
|
||||||
threaded=True,
|
'CONTRIBUTING.md',
|
||||||
debug=True,
|
fg='red',
|
||||||
use_reloader=use_reloader)
|
)
|
||||||
|
click.secho('[example]', fg='yellow')
|
||||||
|
click.secho(
|
||||||
|
'flask run -p 8080 --with-threads --reload --debugger',
|
||||||
|
fg='green',
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def console_log_run(app, port, use_reloader):
|
def console_log_run(app, port, use_reloader):
|
||||||
|
|
Loading…
Reference in New Issue