You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by be...@apache.org on 2023/11/09 04:47:46 UTC
(superset) branch fix-numeric updated (452491f401 -> 643211419c)
This is an automated email from the ASF dual-hosted git repository.
beto pushed a change to branch fix-numeric
in repository https://gitbox.apache.org/repos/asf/superset.git
omit 452491f401 Trigger tests
omit 02d37746a7 feat(metadb): handle decimals
new 643211419c feat(metadb): handle decimals
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (452491f401)
\
N -- N -- N refs/heads/fix-numeric (643211419c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
requirements/base.txt | 35 ++-
requirements/development.txt | 2 -
requirements/integration.txt | 2 +-
requirements/local.txt | 2 +-
requirements/testing.txt | 682 ++++++++++++++++++++++++++++++++++++++++++-
setup.py | 6 +-
6 files changed, 705 insertions(+), 24 deletions(-)
(superset) 01/01: feat(metadb): handle decimals
Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
beto pushed a commit to branch fix-numeric
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 643211419c35fe2e660a880c77dbaf64c212a45d
Author: Beto Dealmeida <ro...@dealmeida.net>
AuthorDate: Wed Nov 8 22:44:37 2023 -0500
feat(metadb): handle decimals
---
requirements/base.txt | 35 ++-
requirements/development.txt | 2 -
requirements/integration.txt | 2 +-
requirements/local.txt | 2 +-
requirements/testing.txt | 682 +++++++++++++++++++++++++++++++++++++++++-
setup.py | 6 +-
superset/extensions/metadb.py | 15 +-
7 files changed, 718 insertions(+), 26 deletions(-)
diff --git a/requirements/base.txt b/requirements/base.txt
index d056b403c3..bb73e6cf2c 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -18,7 +18,10 @@ apsw==3.42.0.1
async-timeout==4.0.2
# via redis
attrs==23.1.0
- # via jsonschema
+ # via
+ # cattrs
+ # jsonschema
+ # requests-cache
babel==2.9.1
# via flask-babel
backoff==1.11.1
@@ -35,6 +38,8 @@ cachelib==0.6.0
# via
# flask-caching
# flask-session
+cattrs==23.1.2
+ # via requests-cache
celery==5.2.2
# via apache-superset
certifi==2023.7.22
@@ -85,6 +90,8 @@ dnspython==2.1.0
# via email-validator
email-validator==1.1.3
# via flask-appbuilder
+exceptiongroup==1.1.3
+ # via cattrs
flask==2.2.5
# via
# apache-superset
@@ -136,7 +143,9 @@ geographiclib==1.52
geopy==2.2.0
# via apache-superset
greenlet==2.0.2
- # via shillelagh
+ # via
+ # shillelagh
+ # sqlalchemy
gunicorn==21.2.0
# via apache-superset
hashids==1.3.1
@@ -152,7 +161,10 @@ idna==3.2
# email-validator
# requests
importlib-metadata==6.6.0
- # via apache-superset
+ # via
+ # apache-superset
+ # flask
+ # shillelagh
importlib-resources==5.12.0
# via limits
isodate==0.6.0
@@ -232,6 +244,8 @@ parsedatetime==2.6
# via apache-superset
pgsanity==0.2.9
# via apache-superset
+platformdirs==3.11.0
+ # via requests-cache
polyline==2.0.0
# via apache-superset
prison==0.2.1
@@ -285,12 +299,16 @@ pyyaml==6.0.1
redis==4.5.4
# via apache-superset
requests==2.31.0
+ # via
+ # requests-cache
+ # shillelagh
+requests-cache==1.1.0
# via shillelagh
rich==13.3.4
# via flask-limiter
selenium==3.141.0
# via apache-superset
-shillelagh==1.2.6
+shillelagh==1.2.10
# via apache-superset
shortid==0.1.2
# via apache-superset
@@ -303,6 +321,7 @@ six==1.16.0
# paramiko
# prison
# python-dateutil
+ # url-normalize
# wtforms-json
slack-sdk==3.21.3
# via apache-superset
@@ -328,14 +347,18 @@ tabulate==0.8.9
typing-extensions==4.4.0
# via
# apache-superset
+ # cattrs
# flask-limiter
# limits
# shillelagh
tzdata==2023.3
# via pandas
+url-normalize==1.4.3
+ # via requests-cache
urllib3==1.26.6
# via
# requests
+ # requests-cache
# selenium
vine==5.0.0
# via
@@ -363,7 +386,9 @@ wtforms-json==0.3.5
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
diff --git a/requirements/development.txt b/requirements/development.txt
index 04962ae537..a73e3a70c5 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -74,8 +74,6 @@ pickleshare==0.7.5
# via ipython
pillow==9.5.0
# via apache-superset
-platformdirs==3.8.1
- # via pylint
progress==1.6
# via -r requirements/development.in
psycopg2-binary==2.9.6
diff --git a/requirements/integration.txt b/requirements/integration.txt
index 0defdfc659..51dbe9a621 100644
--- a/requirements/integration.txt
+++ b/requirements/integration.txt
@@ -38,7 +38,7 @@ pip-compile-multi==2.6.3
# via -r requirements/integration.in
pip-tools==7.3.0
# via pip-compile-multi
-platformdirs==3.8.1
+platformdirs==3.11.0
# via
# tox
# virtualenv
diff --git a/requirements/local.txt b/requirements/local.txt
index c4bd3cd599..a78dbde0d9 100644
--- a/requirements/local.txt
+++ b/requirements/local.txt
@@ -6,7 +6,7 @@
# pip-compile-multi
#
-r development.txt
--e file:.
+-e file:///Users/beto/Projects/github/superset
# via
# -r requirements/base.in
# -r requirements/development.in
diff --git a/requirements/testing.txt b/requirements/testing.txt
index 00fe734540..de2988d2f9 100644
--- a/requirements/testing.txt
+++ b/requirements/testing.txt
@@ -1,39 +1,223 @@
-# SHA1:95300275481abb1413eb98a5c79fb7cf96814cdd
-#
-# This file is autogenerated by pip-compile-multi
-# To update, run:
-#
-# pip-compile-multi
-#
--r development.txt
--r integration.txt
-e file:.
# via
# -r requirements/base.in
# -r requirements/development.in
# -r requirements/testing.in
+alembic==1.6.5
+ # via flask-migrate
+amqp==5.1.0
+ # via kombu
+apispec[yaml]==6.3.0
+ # via flask-appbuilder
+appnope==0.1.3
+ # via ipython
+apsw==3.42.0.1
+ # via shillelagh
+astroid==2.15.8
+ # via pylint
+asttokens==2.2.1
+ # via stack-data
+async-timeout==4.0.2
+ # via redis
+attrs==23.1.0
+ # via
+ # cattrs
+ # jsonlines
+ # jsonschema
+ # requests-cache
+babel==2.9.1
+ # via flask-babel
+backcall==0.2.0
+ # via ipython
+backoff==1.11.1
+ # via apache-superset
+bcrypt==4.0.1
+ # via paramiko
+billiard==3.6.4.0
+ # via celery
+boto3==1.26.130
+ # via tabulator
+botocore==1.29.130
+ # via
+ # boto3
+ # s3transfer
+bottleneck==1.3.7
+ # via pandas
+brotli==1.0.9
+ # via flask-compress
+build==0.10.0
+ # via pip-tools
+cached-property==1.5.2
+ # via tableschema
+cachelib==0.6.0
+ # via
+ # flask-caching
+ # flask-session
+cachetools==5.3.1
+ # via
+ # google-auth
+ # tox
+cattrs==23.1.2
+ # via requests-cache
+celery==5.2.2
+ # via apache-superset
+certifi==2023.7.22
+ # via requests
+cffi==1.15.1
+ # via
+ # cryptography
+ # pynacl
+cfgv==3.3.1
+ # via pre-commit
+chardet==5.1.0
+ # via
+ # tabulator
+ # tox
+charset-normalizer==3.2.0
+ # via requests
+click==8.1.3
+ # via
+ # apache-superset
+ # celery
+ # click-didyoumean
+ # click-option-group
+ # click-plugins
+ # click-repl
+ # flask
+ # flask-appbuilder
+ # pip-compile-multi
+ # pip-tools
+ # tableschema
+ # tabulator
+click-didyoumean==0.3.0
+ # via celery
+click-option-group==0.5.5
+ # via apache-superset
+click-plugins==1.1.1
+ # via celery
+click-repl==0.2.0
+ # via celery
cmdstanpy==1.1.0
# via prophet
+colorama==0.4.6
+ # via
+ # apache-superset
+ # flask-appbuilder
+ # tox
contourpy==1.0.7
# via matplotlib
+convertdate==2.4.0
+ # via
+ # holidays
+ # prophet
coverage[toml]==7.2.5
# via pytest-cov
+cron-descriptor==1.2.24
+ # via apache-superset
+croniter==1.0.15
+ # via apache-superset
+cryptography==41.0.2
+ # via
+ # apache-superset
+ # paramiko
cycler==0.11.0
# via matplotlib
db-dtypes==1.1.1
# via pandas-gbq
+decorator==5.1.1
+ # via ipython
+deprecated==1.2.13
+ # via limits
+deprecation==2.1.0
+ # via apache-superset
+dill==0.3.6
+ # via pylint
+distlib==0.3.6
+ # via virtualenv
+dnspython==2.1.0
+ # via email-validator
docker==6.1.1
# via -r requirements/testing.in
+email-validator==1.1.3
+ # via flask-appbuilder
ephem==4.1.4
# via lunarcalendar
+et-xmlfile==1.1.0
+ # via openpyxl
exceptiongroup==1.1.1
- # via pytest
+ # via
+ # cattrs
+ # pytest
+executing==1.2.0
+ # via stack-data
+filelock==3.12.2
+ # via
+ # tox
+ # virtualenv
+flask==2.2.5
+ # via
+ # apache-superset
+ # flask-appbuilder
+ # flask-babel
+ # flask-caching
+ # flask-compress
+ # flask-cors
+ # flask-jwt-extended
+ # flask-limiter
+ # flask-login
+ # flask-migrate
+ # flask-session
+ # flask-sqlalchemy
+ # flask-testing
+ # flask-wtf
+flask-appbuilder==4.3.9
+ # via apache-superset
+flask-babel==1.0.0
+ # via flask-appbuilder
+flask-caching==1.11.1
+ # via apache-superset
+flask-compress==1.13
+ # via apache-superset
+flask-cors==3.0.10
+ # via apache-superset
+flask-jwt-extended==4.3.1
+ # via flask-appbuilder
+flask-limiter==3.3.1
+ # via flask-appbuilder
+flask-login==0.6.0
+ # via
+ # apache-superset
+ # flask-appbuilder
+flask-migrate==3.1.0
+ # via apache-superset
+flask-session==0.5.0
+ # via apache-superset
+flask-sqlalchemy==2.5.1
+ # via
+ # flask-appbuilder
+ # flask-migrate
+flask-talisman==1.0.0
+ # via apache-superset
flask-testing==0.8.1
# via -r requirements/testing.in
+flask-wtf==1.1.1
+ # via
+ # apache-superset
+ # flask-appbuilder
fonttools==4.39.4
# via matplotlib
freezegun==1.2.2
# via -r requirements/testing.in
+func-timeout==4.3.5
+ # via apache-superset
+future==0.18.3
+ # via
+ # pyhive
+ # sqlalchemy-bigquery
+geographiclib==1.52
+ # via geopy
+geopy==2.2.0
+ # via apache-superset
google-api-core[grpc]==2.11.0
# via
# google-cloud-bigquery
@@ -72,6 +256,11 @@ googleapis-common-protos==1.59.0
# via
# google-api-core
# grpcio-status
+greenlet==2.0.2
+ # via
+ # playwright
+ # shillelagh
+ # sqlalchemy
grpcio==1.54.0
# via
# google-api-core
@@ -79,30 +268,227 @@ grpcio==1.54.0
# grpcio-status
grpcio-status==1.54.0
# via google-api-core
+gunicorn==21.2.0
+ # via apache-superset
+hashids==1.3.1
+ # via apache-superset
+hijri-converter==2.3.1
+ # via holidays
+holidays==0.23
+ # via
+ # apache-superset
+ # prophet
+humanize==3.11.0
+ # via apache-superset
+identify==2.5.24
+ # via pre-commit
+idna==3.2
+ # via
+ # email-validator
+ # requests
+ijson==3.2.0.post0
+ # via tabulator
+importlib-metadata==6.6.0
+ # via
+ # apache-superset
+ # flask
+ # shillelagh
+importlib-resources==5.12.0
+ # via
+ # limits
+ # matplotlib
iniconfig==2.0.0
# via pytest
+ipython==8.12.2
+ # via -r requirements/development.in
+isodate==0.6.0
+ # via
+ # apache-superset
+ # tableschema
+isort==5.12.0
+ # via pylint
+itsdangerous==2.1.2
+ # via
+ # flask
+ # flask-wtf
+jedi==0.18.2
+ # via ipython
+jinja2==3.1.2
+ # via
+ # flask
+ # flask-babel
+jmespath==1.0.1
+ # via
+ # boto3
+ # botocore
+jsonlines==3.1.0
+ # via tabulator
+jsonschema==4.17.3
+ # via
+ # flask-appbuilder
+ # jsonschema-spec
+ # openapi-schema-validator
+ # openapi-spec-validator
+ # tableschema
jsonschema-spec==0.1.4
# via openapi-spec-validator
kiwisolver==1.4.4
# via matplotlib
+kombu==5.2.4
+ # via celery
+korean-lunar-calendar==0.3.1
+ # via holidays
+lazy-object-proxy==1.9.0
+ # via
+ # astroid
+ # openapi-spec-validator
+limits==3.4.0
+ # via flask-limiter
+linear-tsv==1.1.0
+ # via tabulator
+llvmlite==0.40.1
+ # via numba
lunarcalendar==0.0.9
# via prophet
+mako==1.2.4
+ # via
+ # alembic
+ # apache-superset
+markdown==3.3.4
+ # via apache-superset
+markdown-it-py==2.2.0
+ # via rich
+markupsafe==2.1.1
+ # via
+ # jinja2
+ # mako
+ # werkzeug
+ # wtforms
+marshmallow==3.19.0
+ # via
+ # flask-appbuilder
+ # marshmallow-sqlalchemy
+marshmallow-sqlalchemy==0.23.1
+ # via flask-appbuilder
matplotlib==3.7.1
# via prophet
+matplotlib-inline==0.1.6
+ # via ipython
+mccabe==0.7.0
+ # via pylint
+mdurl==0.1.2
+ # via markdown-it-py
+msgpack==1.0.2
+ # via apache-superset
+mysqlclient==2.1.0
+ # via apache-superset
+nh3==0.2.11
+ # via apache-superset
+nodeenv==1.7.0
+ # via pre-commit
+numba==0.57.1
+ # via pandas
+numexpr==2.8.4
+ # via pandas
+numpy==1.23.5
+ # via
+ # apache-superset
+ # bottleneck
+ # cmdstanpy
+ # contourpy
+ # db-dtypes
+ # matplotlib
+ # numba
+ # numexpr
+ # pandas
+ # pandas-gbq
+ # prophet
+ # pyarrow
oauthlib==3.2.2
# via requests-oauthlib
openapi-schema-validator==0.4.4
# via openapi-spec-validator
openapi-spec-validator==0.5.6
# via -r requirements/testing.in
+openpyxl==3.1.2
+ # via tabulator
+ordered-set==4.1.0
+ # via flask-limiter
+packaging==23.1
+ # via
+ # apache-superset
+ # apispec
+ # build
+ # db-dtypes
+ # deprecation
+ # docker
+ # google-cloud-bigquery
+ # gunicorn
+ # limits
+ # marshmallow
+ # matplotlib
+ # pyproject-api
+ # pytest
+ # shillelagh
+ # sqlalchemy-bigquery
+ # tox
+pandas[performance]==2.0.3
+ # via
+ # apache-superset
+ # cmdstanpy
+ # db-dtypes
+ # pandas-gbq
+ # prophet
pandas-gbq==0.19.1
# via apache-superset
parameterized==0.9.0
# via -r requirements/testing.in
+paramiko==2.11.0
+ # via sshtunnel
+parsedatetime==2.6
+ # via apache-superset
+parso==0.8.3
+ # via jedi
pathable==0.4.3
# via jsonschema-spec
+pexpect==4.8.0
+ # via ipython
+pgsanity==0.2.9
+ # via apache-superset
+pickleshare==0.7.5
+ # via ipython
+pillow==9.5.0
+ # via
+ # apache-superset
+ # matplotlib
+pip-compile-multi==2.6.3
+ # via -r requirements/integration.in
+pip-tools==7.3.0
+ # via pip-compile-multi
+platformdirs==3.11.0
+ # via
+ # pylint
+ # requests-cache
+ # tox
+ # virtualenv
playwright==1.37.0
# via apache-superset
+pluggy==1.2.0
+ # via
+ # pytest
+ # tox
+polyline==2.0.0
+ # via apache-superset
+pre-commit==3.3.3
+ # via -r requirements/integration.in
+prison==0.2.1
+ # via flask-appbuilder
+progress==1.6
+ # via -r requirements/development.in
+prompt-toolkit==3.0.38
+ # via
+ # click-repl
+ # ipython
prophet==1.1.1
# via apache-superset
proto-plus==1.22.2
@@ -117,14 +503,72 @@ protobuf==4.23.0
# googleapis-common-protos
# grpcio-status
# proto-plus
+psycopg2-binary==2.9.6
+ # via apache-superset
+ptyprocess==0.7.0
+ # via pexpect
+pure-eval==0.2.2
+ # via stack-data
+pure-sasl==0.6.2
+ # via
+ # pyhive
+ # thrift-sasl
+pyarrow==12.0.0
+ # via
+ # apache-superset
+ # db-dtypes
+ # pandas-gbq
+ # sqlalchemy-bigquery
+pyasn1==0.5.0
+ # via
+ # pyasn1-modules
+ # python-ldap
+ # rsa
+pyasn1-modules==0.3.0
+ # via
+ # google-auth
+ # python-ldap
+pycparser==2.20
+ # via cffi
pydata-google-auth==1.7.0
# via pandas-gbq
+pydruid==0.6.5
+ # via apache-superset
pyee==9.0.4
# via playwright
pyfakefs==5.2.2
# via -r requirements/testing.in
-pyhive[presto]==0.7.0
+pygments==2.15.0
+ # via
+ # ipython
+ # rich
+pyhive[hive_pure_sasl]==0.7.0
# via apache-superset
+pyinstrument==4.4.0
+ # via -r requirements/development.in
+pyjwt==2.4.0
+ # via
+ # apache-superset
+ # flask-appbuilder
+ # flask-jwt-extended
+pylint==2.17.7
+ # via
+ # -r requirements/development.in
+ # -r requirements/testing.in
+pymeeus==0.5.12
+ # via convertdate
+pynacl==1.5.0
+ # via paramiko
+pyparsing==3.0.6
+ # via
+ # apache-superset
+ # matplotlib
+pyproject-api==1.5.2
+ # via tox
+pyproject-hooks==1.0.0
+ # via build
+pyrsistent==0.19.3
+ # via jsonschema
pytest==7.3.1
# via
# -r requirements/testing.in
@@ -134,32 +578,246 @@ pytest-cov==4.0.0
# via -r requirements/testing.in
pytest-mock==3.10.0
# via -r requirements/testing.in
+python-dateutil==2.8.2
+ # via
+ # alembic
+ # apache-superset
+ # botocore
+ # croniter
+ # flask-appbuilder
+ # freezegun
+ # google-cloud-bigquery
+ # holidays
+ # lunarcalendar
+ # matplotlib
+ # pandas
+ # prophet
+ # pyhive
+ # shillelagh
+ # tableschema
+ # trino
+python-dotenv==0.19.0
+ # via apache-superset
+python-editor==1.0.4
+ # via alembic
+python-geohash==0.8.5
+ # via apache-superset
+python-ldap==3.4.3
+ # via -r requirements/development.in
+pytz==2021.3
+ # via
+ # babel
+ # celery
+ # flask-babel
+ # lunarcalendar
+ # pandas
+ # trino
pytz-deprecation-shim==0.1.0.post0
# via tzlocal
+pyyaml==6.0.1
+ # via
+ # apache-superset
+ # apispec
+ # jsonschema-spec
+ # pre-commit
+redis==4.5.4
+ # via apache-superset
+requests==2.31.0
+ # via
+ # docker
+ # google-api-core
+ # google-cloud-bigquery
+ # pydruid
+ # requests-cache
+ # requests-oauthlib
+ # shillelagh
+ # tableschema
+ # tabulator
+ # trino
+requests-cache==1.1.0
+ # via shillelagh
requests-oauthlib==1.3.1
# via google-auth-oauthlib
rfc3339-validator==0.1.4
# via openapi-schema-validator
+rfc3986==2.0.0
+ # via tableschema
+rich==13.3.4
+ # via flask-limiter
rsa==4.9
# via google-auth
+s3transfer==0.6.1
+ # via boto3
+selenium==3.141.0
+ # via apache-superset
setuptools-git==1.2
# via prophet
-shillelagh[gsheetsapi]==1.2.6
+shillelagh==1.2.10
+ # via apache-superset
+shortid==0.1.2
# via apache-superset
+simplejson==3.17.3
+ # via apache-superset
+six==1.16.0
+ # via
+ # asttokens
+ # click-repl
+ # flask-cors
+ # google-auth
+ # isodate
+ # linear-tsv
+ # paramiko
+ # prison
+ # python-dateutil
+ # rfc3339-validator
+ # tableschema
+ # tabulator
+ # thrift
+ # thrift-sasl
+ # url-normalize
+ # wtforms-json
+slack-sdk==3.21.3
+ # via apache-superset
+sqlalchemy==1.4.36
+ # via
+ # alembic
+ # apache-superset
+ # flask-appbuilder
+ # flask-sqlalchemy
+ # marshmallow-sqlalchemy
+ # shillelagh
+ # sqlalchemy-bigquery
+ # sqlalchemy-utils
+ # tabulator
sqlalchemy-bigquery==1.6.1
# via apache-superset
+sqlalchemy-utils==0.38.3
+ # via
+ # apache-superset
+ # flask-appbuilder
+sqloxide==0.1.33
+ # via -r requirements/development.in
+sqlparse==0.4.4
+ # via apache-superset
+sshtunnel==0.4.0
+ # via apache-superset
+stack-data==0.6.2
+ # via ipython
statsd==4.0.1
# via -r requirements/testing.in
+tableschema==1.20.2
+ # via apache-superset
+tabulate==0.8.9
+ # via apache-superset
+tabulator==1.53.5
+ # via tableschema
+thrift==0.16.0
+ # via
+ # apache-superset
+ # pyhive
+ # thrift-sasl
+thrift-sasl==0.4.3
+ # via pyhive
+tomli==2.0.1
+ # via
+ # build
+ # coverage
+ # pip-tools
+ # pylint
+ # pyproject-api
+ # pyproject-hooks
+ # pytest
+ # tox
+tomlkit==0.11.8
+ # via pylint
+toposort==1.10
+ # via pip-compile-multi
+tox==4.6.4
+ # via -r requirements/integration.in
tqdm==4.65.0
# via
# cmdstanpy
# prophet
+traitlets==5.9.0
+ # via
+ # ipython
+ # matplotlib-inline
trino==0.324.0
# via apache-superset
+typing-extensions==4.4.0
+ # via
+ # apache-superset
+ # astroid
+ # cattrs
+ # flask-limiter
+ # ipython
+ # jsonschema-spec
+ # limits
+ # pyee
+ # pylint
+ # shillelagh
+tzdata==2023.3
+ # via
+ # pandas
+ # pytz-deprecation-shim
tzlocal==4.3
# via trino
+unicodecsv==0.14.1
+ # via
+ # tableschema
+ # tabulator
+url-normalize==1.4.3
+ # via requests-cache
+urllib3==1.26.6
+ # via
+ # botocore
+ # docker
+ # requests
+ # requests-cache
+ # selenium
+vine==5.0.0
+ # via
+ # amqp
+ # celery
+ # kombu
+virtualenv==20.23.1
+ # via
+ # pre-commit
+ # tox
+wcwidth==0.2.5
+ # via prompt-toolkit
websocket-client==1.5.1
# via docker
+werkzeug==2.3.3
+ # via
+ # apache-superset
+ # flask
+ # flask-jwt-extended
+ # flask-login
+wheel==0.40.0
+ # via
+ # pip-tools
+ # prophet
+wrapt==1.15.0
+ # via
+ # astroid
+ # deprecated
+wtforms==2.3.3
+ # via
+ # apache-superset
+ # flask-appbuilder
+ # flask-wtf
+ # wtforms-json
+wtforms-json==0.3.5
+ # via apache-superset
+xlrd==2.0.1
+ # via tabulator
+xlsxwriter==3.0.7
+ # via apache-superset
+zipp==3.15.0
+ # via
+ # importlib-metadata
+ # importlib-resources
# The following packages are considered to be unsafe in a requirements file:
# pip
diff --git a/setup.py b/setup.py
index 5173ad6dea..6d9b89ac65 100644
--- a/setup.py
+++ b/setup.py
@@ -118,7 +118,7 @@ setup(
"PyJWT>=2.4.0, <3.0",
"redis>=4.5.4, <5.0",
"selenium>=3.141.0, <4.10.0",
- "shillelagh>=1.2.6,<2.0",
+ "shillelagh>=1.2.10,<2.0",
"shortid",
"sshtunnel>=0.4.0, <0.5",
"simplejson>=3.15.0",
@@ -162,7 +162,7 @@ setup(
"excel": ["xlrd>=1.2.0, <1.3"],
"firebird": ["sqlalchemy-firebird>=0.7.0, <0.8"],
"firebolt": ["firebolt-sqlalchemy>=0.0.1"],
- "gsheets": ["shillelagh[gsheetsapi]>=1.2.6, <2"],
+ "gsheets": ["shillelagh[gsheetsapi]>=1.2.10, <2"],
"hana": ["hdbcli==2.4.162", "sqlalchemy_hana==0.4.0"],
"hive": [
"pyhive[hive]>=0.6.5;python_version<'3.11'",
@@ -191,7 +191,7 @@ setup(
"redshift": ["sqlalchemy-redshift>=0.8.1, < 0.9"],
"rockset": ["rockset-sqlalchemy>=0.0.1, <1.0.0"],
"shillelagh": [
- "shillelagh[datasetteapi,gsheetsapi,socrata,weatherapi]>=1.2.6,<2"
+ "shillelagh[datasetteapi,gsheetsapi,socrata,weatherapi]>=1.2.10,<2"
],
"snowflake": ["snowflake-sqlalchemy>=1.2.4, <2"],
"spark": [
diff --git a/superset/extensions/metadb.py b/superset/extensions/metadb.py
index 5b014b7af6..305ac86dd0 100644
--- a/superset/extensions/metadb.py
+++ b/superset/extensions/metadb.py
@@ -38,6 +38,7 @@ joins and unions are done in memory, using the SQLite engine.
from __future__ import annotations
import datetime
+import decimal
import operator
import urllib.parse
from collections.abc import Iterator
@@ -86,7 +87,7 @@ class SupersetAPSWDialect(APSWDialect):
Queries can also join data across different Superset databases.
- The dialect is built in top of the shillelagh library, leveraging SQLite to
+ The dialect is built in top of the Shillelagh library, leveraging SQLite to
create virtual tables on-the-fly proxying Superset tables. The
`SupersetShillelaghAdapter` adapter is responsible for returning data when a
Superset table is accessed.
@@ -164,11 +165,20 @@ class Duration(Field[datetime.timedelta, datetime.timedelta]):
db_api_type = "DATETIME"
+class Decimal(Field[decimal.Decimal, decimal.Decimal]):
+ """
+ Shillelagh field used for representing decimals.
+ """
+
+ type = "DECIMAL"
+ db_api_type = "NUMBER"
+
+
# pylint: disable=too-many-instance-attributes
class SupersetShillelaghAdapter(Adapter):
"""
- A shillelagh adapter for Superset tables.
+ A Shillelagh adapter for Superset tables.
Shillelagh adapters are responsible for fetching data from a given resource,
allowing it to be represented as a virtual table in SQLite. This one works
@@ -190,6 +200,7 @@ class SupersetShillelaghAdapter(Adapter):
datetime.datetime: DateTime,
datetime.time: Time,
datetime.timedelta: Duration,
+ decimal.Decimal: Decimal,
}
@staticmethod