From d21529d7023547b55b3d676e42fd2d500065bfc1 Mon Sep 17 00:00:00 2001 From: EugeneTorap Date: Tue, 9 May 2023 13:20:58 +0300 Subject: [PATCH 1/7] chore: Bump jsonschema to 4.17.3 --- requirements/base.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 54c5c43cf5119..c2e21126c7d22 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -15,7 +15,7 @@ apispec[yaml]==3.3.2 # via flask-appbuilder async-timeout==4.0.2 # via redis -attrs==21.2.0 +attrs==23.1.0 # via jsonschema babel==2.9.1 # via flask-babel @@ -152,7 +152,7 @@ jinja2==3.0.3 # via # flask # flask-babel -jsonschema==3.2.0 +jsonschema==4.17.3 # via flask-appbuilder kombu==5.2.4 # via celery @@ -193,7 +193,7 @@ numpy==1.23.5 # pyarrow ordered-set==4.1.0 # via flask-limiter -packaging==21.3 +packaging==23.1 # via # deprecation # limits @@ -230,7 +230,7 @@ pyparsing==3.0.6 # via # apache-superset # packaging -pyrsistent==0.16.1 +pyrsistent==0.19.3 # via jsonschema python-dateutil==2.8.2 # via @@ -270,10 +270,8 @@ six==1.16.0 # via # click-repl # isodate - # jsonschema # paramiko # prison - # pyrsistent # python-dateutil # wtforms-json slack-sdk==3.21.3 From 045514b3904c42581bb26a5530a42519dbdd8493 Mon Sep 17 00:00:00 2001 From: EugeneTorap Date: Tue, 9 May 2023 13:33:50 +0300 Subject: [PATCH 2/7] bump flask-limiter --- requirements/base.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index c2e21126c7d22..07c971e117936 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -98,7 +98,7 @@ flask-compress==1.13 # via apache-superset flask-jwt-extended==4.3.1 # via flask-appbuilder -flask-limiter==3.3.0 +flask-limiter==3.3.1 # via flask-appbuilder flask-login==0.6.0 # via @@ -158,7 +158,7 @@ kombu==5.2.4 # via celery korean-lunar-calendar==0.2.1 # via holidays -limits==3.3.1 +limits==3.4.0 # via flask-limiter mako==1.1.4 # via alembic @@ -227,9 +227,7 @@ pymeeus==0.5.11 pynacl==1.5.0 # via paramiko pyparsing==3.0.6 - # via - # apache-superset - # packaging + # via apache-superset pyrsistent==0.19.3 # via jsonschema python-dateutil==2.8.2 From 805b6bcd822dec086670c504541b99aa5f43cb69 Mon Sep 17 00:00:00 2001 From: EugeneTorap Date: Tue, 9 May 2023 13:38:25 +0300 Subject: [PATCH 3/7] Use packaging==23.1 --- requirements/integration.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/integration.txt b/requirements/integration.txt index 29c43279f9ebd..72b9774de34fa 100644 --- a/requirements/integration.txt +++ b/requirements/integration.txt @@ -23,7 +23,7 @@ identify==2.2.13 # via pre-commit nodeenv==1.6.0 # via pre-commit -packaging==21.3 +packaging==23.1 # via # build # tox From 4bc0d18dd46c41c30d77e7037cb4a581d4ae7f56 Mon Sep 17 00:00:00 2001 From: EugeneTorap Date: Tue, 9 May 2023 13:56:18 +0300 Subject: [PATCH 4/7] Update libs --- requirements/base.txt | 2 +- requirements/development.txt | 50 ++++++++++++------------ requirements/integration.txt | 2 - requirements/testing.txt | 73 ++++++++++++++++++++---------------- 4 files changed, 67 insertions(+), 60 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 07c971e117936..eacad3dc49d68 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -209,7 +209,7 @@ polyline==2.0.0 # via apache-superset prison==0.2.1 # via flask-appbuilder -prompt-toolkit==3.0.28 +prompt-toolkit==3.0.38 # via click-repl pyarrow==10.0.1 # via apache-superset diff --git a/requirements/development.txt b/requirements/development.txt index 26134a8df475e..3aaf064f0b3bc 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -1,4 +1,4 @@ -# SHA1:48510babdc779399d3e065d67c6418cbf4f50ca3 +# SHA1:b04a08ca507696956387f1cb37671ae013ed4ee2 # # This file is autogenerated by pip-compile-multi # To update, run: @@ -14,59 +14,59 @@ appnope==0.1.3 # via ipython astroid==2.6.6 # via pylint -asttokens==2.0.5 +asttokens==2.2.1 # via stack-data backcall==0.2.0 # via ipython -boto3==1.18.19 +boto3==1.26.130 # via tabulator -botocore==1.21.19 +botocore==1.29.130 # via # boto3 # s3transfer cached-property==1.5.2 # via tableschema -certifi==2021.10.8 +certifi==2023.5.7 # via requests -chardet==4.0.0 +chardet==5.1.0 # via tabulator -charset-normalizer==2.0.12 +charset-normalizer==3.1.0 # via requests decorator==5.1.1 # via ipython et-xmlfile==1.1.0 # via openpyxl -executing==0.8.3 +executing==1.2.0 # via stack-data flask-cors==3.0.10 # via apache-superset -future==0.18.2 +future==0.18.3 # via pyhive -ijson==3.1.4 +ijson==3.2.0.post0 # via tabulator -ipython==8.3.0 +ipython==8.13.2 # via -r requirements/development.in isort==5.12.0 # via pylint -jedi==0.18.1 +jedi==0.18.2 # via ipython -jmespath==0.10.0 +jmespath==1.0.1 # via # boto3 # botocore -jsonlines==2.0.0 +jsonlines==3.1.0 # via tabulator lazy-object-proxy==1.9.0 # via astroid linear-tsv==1.1.0 # via tabulator -matplotlib-inline==0.1.3 +matplotlib-inline==0.1.6 # via ipython mccabe==0.6.1 # via pylint mysqlclient==2.1.0 # via apache-superset -openpyxl==3.0.7 +openpyxl==3.1.2 # via tabulator parso==0.8.3 # via jedi @@ -74,7 +74,7 @@ pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -pillow==9.3.0 +pillow==9.5.0 # via apache-superset progress==1.6 # via -r requirements/development.in @@ -90,30 +90,30 @@ pydruid==0.6.5 # via apache-superset pyhive[hive]==0.6.5 # via apache-superset -pyinstrument==4.0.2 +pyinstrument==4.4.0 # via -r requirements/development.in pylint==2.9.6 # via -r requirements/development.in -requests==2.26.0 +requests==2.30.0 # via # pydruid # tableschema # tabulator -rfc3986==1.5.0 +rfc3986==2.0.0 # via tableschema -s3transfer==0.5.0 +s3transfer==0.6.1 # via boto3 sasl==0.3.1 # via pyhive -sqloxide==0.1.30 +sqloxide==0.1.33 # via -r requirements/development.in -stack-data==0.2.0 +stack-data==0.6.2 # via ipython tableschema==1.20.2 # via apache-superset tabulator==1.53.5 # via tableschema -thrift==0.14.1 +thrift==0.16.0 # via # apache-superset # pyhive @@ -122,7 +122,7 @@ thrift-sasl==0.4.3 # via pyhive toml==0.10.2 # via pylint -traitlets==5.2.1.post0 +traitlets==5.9.0 # via # ipython # matplotlib-inline diff --git a/requirements/integration.txt b/requirements/integration.txt index 72b9774de34fa..661dffdcf43bf 100644 --- a/requirements/integration.txt +++ b/requirements/integration.txt @@ -41,8 +41,6 @@ pre-commit==3.3.1 # via -r requirements/integration.in py==1.10.0 # via tox -pyparsing==3.0.6 - # via packaging pyyaml==5.4.1 # via pre-commit six==1.16.0 diff --git a/requirements/testing.txt b/requirements/testing.txt index 26658eef74989..863d00278a71c 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -12,17 +12,19 @@ # -r requirements/base.in # -r requirements/development.in # -r requirements/testing.in -cachetools==5.2.0 +cachetools==5.3.0 # via google-auth -coverage==5.5 +coverage[toml]==7.2.5 # via pytest-cov -db-dtypes==1.0.5 +db-dtypes==1.1.1 # via pandas-gbq -docker==5.0.0 +docker==6.1.1 # via -r requirements/testing.in +exceptiongroup==1.1.1 + # via pytest flask-testing==0.8.1 # via -r requirements/testing.in -freezegun==1.1.0 +freezegun==1.2.2 # via -r requirements/testing.in google-api-core[grpc]==2.11.0 # via @@ -31,7 +33,7 @@ google-api-core[grpc]==2.11.0 # google-cloud-core # pandas-gbq # sqlalchemy-bigquery -google-auth==2.14.1 +google-auth==2.17.3 # via # google-api-core # google-auth-oauthlib @@ -39,54 +41,57 @@ google-auth==2.14.1 # pandas-gbq # pydata-google-auth # sqlalchemy-bigquery -google-auth-oauthlib==0.7.1 +google-auth-oauthlib==1.0.0 # via # pandas-gbq # pydata-google-auth -google-cloud-bigquery==3.4.0 +google-cloud-bigquery==3.10.0 # via # apache-superset # pandas-gbq # sqlalchemy-bigquery -google-cloud-bigquery-storage==2.16.2 +google-cloud-bigquery-storage==2.19.1 # via - # google-cloud-bigquery # pandas-gbq # sqlalchemy-bigquery google-cloud-core==2.3.2 # via google-cloud-bigquery google-crc32c==1.5.0 # via google-resumable-media -google-resumable-media==2.4.0 +google-resumable-media==2.5.0 # via google-cloud-bigquery -googleapis-common-protos==1.57.0 +googleapis-common-protos==1.59.0 # via # google-api-core # grpcio-status -grpcio==1.51.1 +grpcio==1.54.0 # via # google-api-core # google-cloud-bigquery # grpcio-status -grpcio-status==1.51.1 +grpcio-status==1.54.0 # via google-api-core -iniconfig==1.1.1 +iniconfig==2.0.0 # via pytest +jsonschema-spec==0.1.4 + # via openapi-spec-validator oauthlib==3.2.2 # via requests-oauthlib -openapi-schema-validator==0.1.5 +openapi-schema-validator==0.4.4 # via openapi-spec-validator -openapi-spec-validator==0.3.1 +openapi-spec-validator==0.5.6 # via -r requirements/testing.in -pandas-gbq==0.18.1 +pandas-gbq==0.19.1 # via apache-superset -parameterized==0.8.1 +parameterized==0.9.0 # via -r requirements/testing.in -proto-plus==1.22.1 +pathable==0.4.3 + # via jsonschema-spec +proto-plus==1.22.2 # via # google-cloud-bigquery # google-cloud-bigquery-storage -protobuf==4.21.10 +protobuf==4.23.0 # via # google-api-core # google-cloud-bigquery @@ -94,36 +99,40 @@ protobuf==4.21.10 # googleapis-common-protos # grpcio-status # proto-plus -pyasn1==0.4.8 +pyasn1==0.5.0 # via # pyasn1-modules # rsa -pyasn1-modules==0.2.8 +pyasn1-modules==0.3.0 # via google-auth -pydata-google-auth==1.4.0 +pydata-google-auth==1.7.0 # via pandas-gbq -pyfakefs==4.5.6 +pyfakefs==5.2.2 # via -r requirements/testing.in -pytest==6.2.4 +pyhive[presto]==0.6.5 + # via apache-superset +pytest==7.3.1 # via # -r requirements/testing.in # pytest-cov # pytest-mock -pytest-cov==2.12.1 +pytest-cov==4.0.0 # via -r requirements/testing.in -pytest-mock==3.6.1 +pytest-mock==3.10.0 # via -r requirements/testing.in requests-oauthlib==1.3.1 # via google-auth-oauthlib +rfc3339-validator==0.1.4 + # via openapi-schema-validator rsa==4.9 # via google-auth -sqlalchemy-bigquery==1.5.0 +sqlalchemy-bigquery==1.6.1 # via apache-superset -statsd==3.3.0 +statsd==4.0.1 # via -r requirements/testing.in -trino==0.319.0 +trino==0.323.0 # via apache-superset -websocket-client==1.2.0 +websocket-client==1.5.1 # via docker # The following packages are considered to be unsafe in a requirements file: From bf2797fa2132cd4f048634c03dd59bb96d40f355 Mon Sep 17 00:00:00 2001 From: EugeneTorap Date: Tue, 9 May 2023 14:01:25 +0300 Subject: [PATCH 5/7] Use ipython==8.12.2 --- requirements/development.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/development.txt b/requirements/development.txt index 3aaf064f0b3bc..e3d58f4113f36 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -44,7 +44,7 @@ future==0.18.3 # via pyhive ijson==3.2.0.post0 # via tabulator -ipython==8.13.2 +ipython==8.12.2 # via -r requirements/development.in isort==5.12.0 # via pylint From 7f5ae8f2ff2884ff34c4e67c021102a472ce5179 Mon Sep 17 00:00:00 2001 From: EugeneTorap Date: Tue, 9 May 2023 15:43:16 +0300 Subject: [PATCH 6/7] Update libs --- requirements/base.txt | 2 +- requirements/development.txt | 2 +- requirements/integration.txt | 54 +++++++++++++++++++++--------------- requirements/testing.txt | 10 ++++--- 4 files changed, 39 insertions(+), 29 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index eacad3dc49d68..3e7b872dc3c89 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -53,7 +53,7 @@ click-plugins==1.1.1 # via celery click-repl==0.2.0 # via celery -colorama==0.4.4 +colorama==0.4.6 # via # apache-superset # flask-appbuilder diff --git a/requirements/development.txt b/requirements/development.txt index e3d58f4113f36..870c0c6a23be9 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -1,4 +1,4 @@ -# SHA1:b04a08ca507696956387f1cb37671ae013ed4ee2 +# SHA1:48510babdc779399d3e065d67c6418cbf4f50ca3 # # This file is autogenerated by pip-compile-multi # To update, run: diff --git a/requirements/integration.txt b/requirements/integration.txt index 661dffdcf43bf..542422d985cfc 100644 --- a/requirements/integration.txt +++ b/requirements/integration.txt @@ -5,59 +5,67 @@ # # pip-compile-multi # -build==0.8.0 +build==0.10.0 # via pip-tools -cfgv==3.3.0 +cachetools==5.3.0 + # via tox +cfgv==3.3.1 # via pre-commit +chardet==5.1.0 + # via tox click==8.0.4 # via # pip-compile-multi # pip-tools +colorama==0.4.6 + # via tox distlib==0.3.6 # via virtualenv -filelock==3.9.0 +filelock==3.12.0 # via # tox # virtualenv -identify==2.2.13 +identify==2.5.24 # via pre-commit -nodeenv==1.6.0 +nodeenv==1.7.0 # via pre-commit packaging==23.1 # via # build + # pyproject-api # tox -pep517==0.11.0 - # via build -pip-compile-multi==2.6.2 +pip-compile-multi==2.6.3 # via -r requirements/integration.in -pip-tools==6.8.0 +pip-tools==6.13.0 # via pip-compile-multi -platformdirs==2.6.2 - # via virtualenv -pluggy==0.13.1 +platformdirs==3.5.0 + # via + # tox + # virtualenv +pluggy==1.0.0 # via tox pre-commit==3.3.1 # via -r requirements/integration.in -py==1.10.0 +pyproject-api==1.5.1 # via tox +pyproject-hooks==1.0.0 + # via build pyyaml==5.4.1 # via pre-commit -six==1.16.0 - # via tox -toml==0.10.2 - # via tox -tomli==1.2.1 - # via build -toposort==1.6 +tomli==2.0.1 + # via + # build + # pyproject-api + # tox +toposort==1.10 # via pip-compile-multi -tox==3.25.1 +tox==4.5.1 # via -r requirements/integration.in -virtualenv==20.17.1 +virtualenv==20.23.0 # via # pre-commit # tox -wheel==0.38.1 +wheel==0.40.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/testing.txt b/requirements/testing.txt index 863d00278a71c..1e54713546831 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -12,8 +12,6 @@ # -r requirements/base.in # -r requirements/development.in # -r requirements/testing.in -cachetools==5.3.0 - # via google-auth coverage[toml]==7.2.5 # via pytest-cov db-dtypes==1.1.1 @@ -109,8 +107,6 @@ pydata-google-auth==1.7.0 # via pandas-gbq pyfakefs==5.2.2 # via -r requirements/testing.in -pyhive[presto]==0.6.5 - # via apache-superset pytest==7.3.1 # via # -r requirements/testing.in @@ -120,6 +116,8 @@ pytest-cov==4.0.0 # via -r requirements/testing.in pytest-mock==3.10.0 # via -r requirements/testing.in +pytz-deprecation-shim==0.1.0.post0 + # via tzlocal requests-oauthlib==1.3.1 # via google-auth-oauthlib rfc3339-validator==0.1.4 @@ -132,6 +130,10 @@ statsd==4.0.1 # via -r requirements/testing.in trino==0.323.0 # via apache-superset +tzdata==2023.3 + # via pytz-deprecation-shim +tzlocal==4.3 + # via trino websocket-client==1.5.1 # via docker From 363e205dc8adeb8c6828b570f65b1ba85e6ea331 Mon Sep 17 00:00:00 2001 From: EugeneTorap Date: Tue, 9 May 2023 16:58:28 +0300 Subject: [PATCH 7/7] Update setup.py --- docs/docs/installation/running-on-kubernetes.mdx | 2 +- setup.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/docs/installation/running-on-kubernetes.mdx b/docs/docs/installation/running-on-kubernetes.mdx index 18ab85bebd651..d71d7ab2c8ebe 100644 --- a/docs/docs/installation/running-on-kubernetes.mdx +++ b/docs/docs/installation/running-on-kubernetes.mdx @@ -142,7 +142,7 @@ connect to those datasources in your Superset installation: bootstrapScript: | #!/bin/bash pip install psycopg2==2.9.6 \ - sqlalchemy-bigquery==1.5.0 \ + sqlalchemy-bigquery==1.6.1 \ elasticsearch-dbapi==0.2.5 &&\ if [ ! -f ~/bootstrap ]; then echo "Running Superset with uid {{ .Values.runAsUser }}" > ~/bootstrap; fi ``` diff --git a/setup.py b/setup.py index eb396b8ccef06..e20c1eb07e780 100644 --- a/setup.py +++ b/setup.py @@ -133,9 +133,9 @@ def get_git_sha() -> str: "athena": ["pyathena[pandas]>=2, <3"], "aurora-data-api": ["preset-sqlalchemy-aurora-data-api>=0.2.8,<0.3"], "bigquery": [ - "pandas-gbq>=0.18.1", - "sqlalchemy-bigquery>=1.5.0", - "google-cloud-bigquery>=3.4.0", + "pandas-gbq>=0.19.1", + "sqlalchemy-bigquery>=1.6.1", + "google-cloud-bigquery>=3.10.0", ], "clickhouse": ["clickhouse-connect>=0.5.14, <1.0"], "cockroachdb": ["cockroachdb>=0.3.5, <0.4"], @@ -172,7 +172,7 @@ def get_git_sha() -> str: "pinot": ["pinotdb>=0.3.3, <0.4"], "postgres": ["psycopg2-binary==2.9.6"], "presto": ["pyhive[presto]>=0.6.5"], - "trino": ["trino>=0.319.0"], + "trino": ["trino>=0.323.0"], "prophet": ["prophet>=1.0.1, <1.1", "pystan<3.0"], "redshift": ["sqlalchemy-redshift>=0.8.1, < 0.9"], "rockset": ["rockset>=0.8.10, <0.9"], @@ -182,7 +182,7 @@ def get_git_sha() -> str: "snowflake": ["snowflake-sqlalchemy>=1.2.4, <2"], "spark": ["pyhive[hive]>=0.6.5", "tableschema", "thrift>=0.14.1, <1.0.0"], "teradata": ["teradatasql>=16.20.0.23"], - "thumbnails": ["Pillow>=9.3.0, <10.0.0"], + "thumbnails": ["Pillow>=9.5.0, <10.0.0"], "vertica": ["sqlalchemy-vertica-python>=0.5.9, < 0.6"], "netezza": ["nzalchemy>=11.0.2"], },