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.

Sign up for GitHub

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

Jump to bottom

chore: bump wtforms and add missing flask-limiter #23680

Merged
merged 10 commits into from
Apr 28, 2023
Merged

chore: bump wtforms and add missing flask-limiter #23680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
799efd0
deps: bump wtforms and add missing flask-limiter
dpgaspar Apr 13, 2023
dad9640
deps: bump wtforms and add missing flask-limiter
dpgaspar Apr 13, 2023
854e08a
fix testing dependency on wrapt
dpgaspar Apr 13, 2023
9f3a41b
fix testing dependency on wrapt
dpgaspar Apr 13, 2023
8f29db6
fix removed QuerySelectField
dpgaspar Apr 13, 2023
df7c243
fix removed QuerySelectField
dpgaspar Apr 13, 2023
d65641d
Merge branch 'master' into bump/wtforms
dpgaspar Apr 26, 2023
adc9f75
small fixes caused by rebasing
dpgaspar Apr 26, 2023
6422e54
bump wtforms_json to fix incompatibility
dpgaspar Apr 26, 2023
2c0493a
fix QuerySelectField migration
dpgaspar Apr 26, 2023
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
19 changes: 12 additions & 7 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,10 @@ humanize==3.11.0
# via apache-superset
idna==3.2
# via email-validator
importlib-metadata==6.0.0
importlib-metadata==6.3.0
# via flask
importlib-resources==5.12.0
# via limits
isodate==0.6.0
# via apache-superset
itsdangerous==2.1.1
Expand All @@ -154,7 +156,7 @@ kombu==5.2.4
# via celery
korean-lunar-calendar==0.2.1
# via holidays
limits==3.2.0
limits==3.3.1
# via flask-limiter
mako==1.1.4
# via alembic
Expand Down Expand Up @@ -210,7 +212,7 @@ pyarrow==10.0.1
# via apache-superset
pycparser==2.20
# via cffi
pygments==2.14.0
pygments==2.15.0
# via rich
pyjwt==2.4.0
# via
Expand Down Expand Up @@ -253,7 +255,7 @@ pyyaml==5.4.1
# apispec
redis==3.5.3
# via apache-superset
rich==13.3.1
rich==13.3.4
# via flask-limiter
selenium==3.141.0
# via apache-superset
Expand Down Expand Up @@ -298,6 +300,7 @@ typing-extensions==4.4.0
# apache-superset
# flask-limiter
# limits
# rich
urllib3==1.26.6
# via selenium
vine==5.0.0
Expand All @@ -316,18 +319,20 @@ werkzeug==2.1.2
# flask-login
wrapt==1.12.1
# via deprecated
wtforms==2.3.3
wtforms==3.0.1
# via
# apache-superset
# flask-appbuilder
# flask-wtf
# wtforms-json
wtforms-json==0.3.3
wtforms-json==0.3.5
# via apache-superset
xlsxwriter==3.0.7
# via apache-superset
zipp==3.15.0
# via importlib-metadata
# via
# importlib-metadata
# importlib-resources

# The following packages are considered to be unsafe in a requirements file:
# setuptools
1 change: 0 additions & 1 deletion requirements/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ websocket-client==1.2.0
# via docker
wrapt==1.12.1
# via astroid

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def get_git_sha() -> str:
"tabulate>=0.8.9, <0.9",
"typing-extensions>=4, <5",
"waitress; sys_platform == 'win32'",
"wtforms>=2.3.3, <2.4",
"wtforms>=2.3.3, <4",
"wtforms-json",
"xlsxwriter>=3.0.7, <3.1",
],
Expand Down
8 changes: 4 additions & 4 deletions superset/connectors/sqla/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

from flask import flash, Markup, redirect
from flask_appbuilder import CompactCRUDMixin, expose, permission_name
from flask_appbuilder.fields import QuerySelectField
from flask_appbuilder.fieldwidgets import Select2Widget
from flask_appbuilder.models.sqla.interface import SQLAInterface
from flask_appbuilder.security.decorators import has_access
from flask_babel import lazy_gettext as _
from wtforms.ext.sqlalchemy.fields import QuerySelectField
from wtforms.validators import DataRequired, Regexp

from superset import db
Expand Down Expand Up @@ -185,7 +185,7 @@ class TableColumnInlineView( # pylint: disable=too-many-ancestors
add_form_extra_fields = {
"table": QuerySelectField(
"Table",
query_factory=lambda: db.session.query(models.SqlaTable),
query_func=lambda: db.session.query(models.SqlaTable),
allow_blank=True,
widget=Select2Widget(extra_classes="readonly"),
)
Expand Down Expand Up @@ -260,7 +260,7 @@ class SqlMetricInlineView( # pylint: disable=too-many-ancestors
add_form_extra_fields = {
"table": QuerySelectField(
"Table",
query_factory=lambda: db.session.query(models.SqlaTable),
query_func=lambda: db.session.query(models.SqlaTable),
allow_blank=True,
widget=Select2Widget(extra_classes="readonly"),
)
Expand Down Expand Up @@ -404,7 +404,7 @@ class TableModelView( # pylint: disable=too-many-ancestors
edit_form_extra_fields = {
"database": QuerySelectField(
"Database",
query_factory=lambda: db.session.query(models.Database),
query_func=lambda: db.session.query(models.Database),
widget=Select2Widget(extra_classes="readonly"),
)
}
Expand Down
18 changes: 9 additions & 9 deletions superset/views/database/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"""Contains the logic to create cohesive forms on the explore view"""
from typing import List

from flask_appbuilder.fields import QuerySelectField
from flask_appbuilder.fieldwidgets import BS3TextFieldWidget
from flask_appbuilder.forms import DynamicForm
from flask_babel import lazy_gettext as _
Expand All @@ -28,7 +29,6 @@
SelectField,
StringField,
)
from wtforms.ext.sqlalchemy.fields import QuerySelectField
from wtforms.validators import DataRequired, Length, NumberRange, Optional, Regexp

from superset import app, db, security_manager
Expand All @@ -43,8 +43,8 @@


class UploadToDatabaseForm(DynamicForm):
# pylint: disable=E0211
def file_allowed_dbs() -> List[Database]: # type: ignore
@staticmethod
def file_allowed_dbs() -> List[Database]:
file_enabled_dbs = (
db.session.query(Database).filter_by(allow_file_upload=True).all()
)
Expand Down Expand Up @@ -136,8 +136,8 @@ class CsvToDatabaseForm(UploadToDatabaseForm):
database = QuerySelectField(
_("Database"),
description=_("Select a database to upload the file to"),
query_factory=UploadToDatabaseForm.file_allowed_dbs,
get_pk=lambda a: a.id,
query_func=UploadToDatabaseForm.file_allowed_dbs,
get_pk_func=lambda a: a.id,
get_label=lambda a: a.database_name,
)
dtype = StringField(
Expand Down Expand Up @@ -313,8 +313,8 @@ class ExcelToDatabaseForm(UploadToDatabaseForm):

database = QuerySelectField(
_("Database"),
query_factory=UploadToDatabaseForm.file_allowed_dbs,
get_pk=lambda a: a.id,
query_func=UploadToDatabaseForm.file_allowed_dbs,
get_pk_func=lambda a: a.id,
get_label=lambda a: a.database_name,
)
schema = StringField(
Expand Down Expand Up @@ -444,8 +444,8 @@ class ColumnarToDatabaseForm(UploadToDatabaseForm):

database = QuerySelectField(
_("Database"),
query_factory=UploadToDatabaseForm.file_allowed_dbs,
get_pk=lambda a: a.id,
query_func=UploadToDatabaseForm.file_allowed_dbs,
get_pk_func=lambda a: a.id,
get_label=lambda a: a.database_name,
)
schema = StringField(
Expand Down