diff --git a/CHANGELOG.md b/CHANGELOG.md index 3858a092d..1770181b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file. - nifi: added support for version 1.23.2 ([#473]). - opa: add version 0.57.0 ([#471]). - opa: add new version upload script ([#471]). +- superset: add new version 2.1.1, 3.0.0 ([#482]). - zookeeper: add version 3.8.3 ([#470]). - zookeeper: add upload script ([#470]). @@ -37,6 +38,8 @@ All notable changes to this project will be documented in this file. - airflow: Added wrapper script to allow the triggering of pre/post hook actions ([#435]). - hadoop: bumped jmx-exporter version to 0.20.0 ([#478]). - hive: bump jmx-exporter to 0.20.0 ([#472]). +- superset: removed patches that are obsolete since 2.0.0 ([#482]). +- superset: bump statsd_exporter to 0.24.0 and set via conf.py ([#482]). - zookeeper: bumped jmx-exporter version to 0.20.0 ([#470]). ### Removed @@ -52,6 +55,7 @@ All notable changes to this project will be documented in this file. - nifi: removed support for version 1.15.x, 1.16.x, 1.18.x, 1.20.x ([#473]). - nifi: removed openssl from image ([#473]). - opa: removed versions 0.27.1, 0.28.0, 0.37.2, 0.41.0, 0.45.0 ([#471]). +- superset: removed versions 1.3.2, 1.4.1, 1.4.2, 1.5.1, 1.5.3, 2.0.1 ([#482]). - zookeeper: removed versions 3.5.8, 3.6.3, 3.7.0, 3.8.0 ([#470]). [#400]: https://github.com/stackabletech/docker-images/pull/400 @@ -76,6 +80,7 @@ All notable changes to this project will be documented in this file. [#476]: https://github.com/stackabletech/docker-images/pull/476 [#478]: https://github.com/stackabletech/docker-images/pull/478 [#479]: https://github.com/stackabletech/docker-images/pull/479 +[#482]: https://github.com/stackabletech/docker-images/pull/482 ## [23.7.0] - 2023-07-14 diff --git a/conf.py b/conf.py index 68e47702d..6343387dc 100644 --- a/conf.py +++ b/conf.py @@ -304,41 +304,25 @@ "name": "superset", "versions": [ { - "product": "1.3.2", - "python": "3.8", - "vector": "0.33.0", - }, - { - "product": "1.4.1", + "product": "2.1.0", "python": "3.9", "vector": "0.33.0", + "statsd_exporter": "v0.24.0", + "authlib": "0.15.4" # https://github.com/dpgaspar/Flask-AppBuilder/blob/v4.3.0/requirements-extra.txt#L10 }, { - "product": "1.4.2", + "product": "2.1.1", "python": "3.9", "vector": "0.33.0", + "statsd_exporter": "v0.24.0", + "authlib": "0.15.4" # https://github.com/dpgaspar/Flask-AppBuilder/blob/v4.3.0/requirements-extra.txt#L10 }, { - "product": "1.5.1", - "python": "3.8", - "vector": "0.33.0", - }, - { - "product": "1.5.3", - "python": "3.8", + "product": "3.0.0", + "python": "3.9", "vector": "0.33.0", - }, - { - 'product': '2.0.1', - 'python': '3.9', - 'vector': '0.33.0', - 'authlib': '0.15.4' # https://github.com/dpgaspar/Flask-AppBuilder/blob/4ac9bba008e404b9a1e783cd272c81bb8634de3d/requirements-extra.txt#L10 - }, - { - 'product': '2.1.0', - 'python': '3.9', - 'vector': '0.33.0', - 'authlib': '0.15.4' # https://github.com/dpgaspar/Flask-AppBuilder/blob/4554c40e2298d11c4472ca64b9a60236b12c6535/requirements-extra.txt#L10 + "statsd_exporter": "v0.24.0", + "authlib": "0.15.4" # https://github.com/dpgaspar/Flask-AppBuilder/blob/v4.3.6/requirements-extra.txt#L7 }, ], }, diff --git a/superset/Dockerfile b/superset/Dockerfile index fa8b67079..1e98401f6 100644 --- a/superset/Dockerfile +++ b/superset/Dockerfile @@ -1,5 +1,9 @@ # syntax=docker/dockerfile:1 +# Get statsd-exporter +ARG STATSD_EXPORTER +FROM oci.stackable.tech/mirror/prom/statsd-exporter:${STATSD_EXPORTER} as statsd-exporter + # Build stage FROM stackable/image/vector AS builder @@ -48,24 +52,6 @@ RUN microdnf update \ python-json-logger \ && if [ ! -z "$AUTHLIB" ]; then pip install Authlib==${AUTHLIB}; fi -# Patch Python packages - -# In Flask-AppBuilder v4.1.1, a bug in the LDAP integration was fixed (see -# https://github.com/dpgaspar/Flask-AppBuilder/pull/1846). Superset 2.0.0 and -# higher depend on a Flask-AppBuilder version containing this fix. Prior -# Superset versions must be patched. - -COPY superset/patches-${PRODUCT}/* /tmp/patches/ - -# https://github.com/hadolint/hadolint/wiki/DL4006 -SHELL ["/bin/bash", "-o", "pipefail", "-c"] -RUN cat /tmp/patches/* | patch \ - --directory=/stackable/app/lib/python${PYTHON}/site-packages \ - --strip=1 - -# Get statsd-exporter -FROM prom/statsd-exporter:0.3.0@sha256:a9c27602d6f6b86527657922b6a87c12789f7f9b39a90f1513e8c665c941f26a as statsd-exporter - # Final image FROM stackable/image/vector diff --git a/superset/README.md b/superset/README.md index dec15b1ea..0528cae28 100644 --- a/superset/README.md +++ b/superset/README.md @@ -4,4 +4,4 @@ The `constraints-.txt` files come from e.g. and are concatenated with the dependencies provided in . This differs from version to version (2.0.1 shown here). -In some cases `apispec[yaml]==3.3.2` needed to be adjusted to `apispec==3.3.2` +In some cases `apispec[yaml]==3.3.2` needed to be adjusted to `apispec==3.3.2` due to `ERROR: Constraints cannot have extras`. diff --git a/superset/constraints-1.3.2.txt b/superset/constraints-1.3.2.txt deleted file mode 100644 index a7f2d67af..000000000 --- a/superset/constraints-1.3.2.txt +++ /dev/null @@ -1,296 +0,0 @@ -aiohttp==3.7.2 - # via slackclient -alembic==1.4.3 - # via flask-migrate -amqp==2.6.1 - # via kombu -apispec==3.3.2 - # via flask-appbuilder -async-timeout==3.0.1 - # via aiohttp -attrs==20.2.0 - # via - # aiohttp - # jsonschema -babel==2.8.0 - # via flask-babel -backoff==1.10.0 - # via apache-superset -billiard==3.6.3.0 - # via celery -bleach==3.3.0 - # via apache-superset -brotli==1.0.9 - # via flask-compress -cachelib==0.1.1 - # via apache-superset -celery==4.4.7 - # via apache-superset -cffi==1.14.3 - # via cryptography -chardet==3.0.4 - # via aiohttp -click==7.1.2 - # via - # apache-superset - # flask - # flask-appbuilder -colorama==0.4.4 - # via - # apache-superset - # flask-appbuilder -convertdate==2.3.0 - # via holidays -cron-descriptor==1.2.24 - # via apache-superset -croniter==0.3.36 - # via apache-superset -cryptography==3.3.2 - # via apache-superset -defusedxml==0.6.0 - # via python3-openid -deprecation==2.1.0 - # via apache-superset -dnspython==2.0.0 - # via email-validator -email-validator==1.1.1 - # via flask-appbuilder -flask==1.1.2 - # via - # apache-superset - # flask-appbuilder - # flask-babel - # flask-caching - # flask-compress - # flask-jwt-extended - # flask-login - # flask-migrate - # flask-openid - # flask-sqlalchemy - # flask-wtf -flask-appbuilder==3.3.0 - # via apache-superset -flask-babel==1.0.0 - # via flask-appbuilder -flask-caching==1.10.1 - # via apache-superset -flask-compress==1.8.0 - # via apache-superset -flask-jwt-extended==3.24.1 - # via flask-appbuilder -flask-login==0.4.1 - # via flask-appbuilder -flask-migrate==2.5.3 - # via apache-superset -flask-openid==1.3.0 - # via flask-appbuilder -flask-sqlalchemy==2.4.4 - # via - # flask-appbuilder - # flask-migrate -flask-talisman==0.7.0 - # via apache-superset -flask-wtf==0.14.3 - # via - # apache-superset - # flask-appbuilder -geographiclib==1.50 - # via geopy -geopy==2.0.0 - # via apache-superset -graphlib-backport==1.0.3 - # via apache-superset -gunicorn==20.0.4 - # via apache-superset -holidays==0.10.3 - # via apache-superset -humanize==3.1.0 - # via apache-superset -idna==2.10 - # via - # email-validator - # yarl -isodate==0.6.0 - # via apache-superset -itsdangerous==1.1.0 - # via - # apache-superset - # flask - # flask-wtf -jinja2==2.11.3 - # via - # flask - # flask-babel -jsonschema==3.2.0 - # via flask-appbuilder -kombu==4.6.11 - # via celery -korean-lunar-calendar==0.2.1 - # via holidays -mako==1.1.3 - # via alembic -markdown==3.3.3 - # via apache-superset -markupsafe==1.1.1 - # via - # jinja2 - # mako - # wtforms -marshmallow==3.9.0 - # via - # flask-appbuilder - # marshmallow-enum - # marshmallow-sqlalchemy -marshmallow-enum==1.5.1 - # via flask-appbuilder -marshmallow-sqlalchemy==0.23.1 - # via flask-appbuilder -msgpack==1.0.0 - # via apache-superset -multidict==5.0.0 - # via - # aiohttp - # yarl -natsort==7.0.1 - # via croniter -numpy==1.19.4 - # via - # pandas - # pyarrow -packaging==20.4 - # via - # bleach - # deprecation -pandas==1.2.2 - # via apache-superset -parsedatetime==2.6 - # via apache-superset -pgsanity==0.2.9 - # via apache-superset -polyline==1.4.0 - # via apache-superset -prison==0.1.3 - # via flask-appbuilder -pyarrow==4.0.1 - # via apache-superset -pycparser==2.20 - # via cffi -pyjwt==1.7.1 - # via - # apache-superset - # flask-appbuilder - # flask-jwt-extended -pymeeus==0.3.7 - # via convertdate -pyparsing==2.4.7 - # via - # apache-superset - # packaging -pyrsistent==0.16.1 - # via - # -r requirements/base.in - # jsonschema -python-dateutil==2.8.1 - # via - # alembic - # apache-superset - # croniter - # flask-appbuilder - # holidays - # pandas -python-dotenv==0.15.0 - # via apache-superset -python-editor==1.0.4 - # via alembic -python-geohash==0.8.5 - # via apache-superset -python3-openid==3.2.0 - # via flask-openid -pytz==2020.4 - # via - # babel - # celery - # convertdate - # flask-babel - # pandas -pyyaml==5.4.1 - # via - # apache-superset - # apispec -redis==3.5.3 - # via apache-superset -selenium==3.141.0 - # via apache-superset -simplejson==3.17.2 - # via apache-superset -six==1.15.0 - # via - # bleach - # cryptography - # flask-jwt-extended - # flask-talisman - # holidays - # isodate - # jsonschema - # packaging - # polyline - # prison - # pyrsistent - # python-dateutil - # sqlalchemy-utils - # wtforms-json -slackclient==2.5.0 - # via apache-superset -sqlalchemy==1.3.20 - # via - # alembic - # apache-superset - # flask-appbuilder - # flask-sqlalchemy - # marshmallow-sqlalchemy - # sqlalchemy-utils -sqlalchemy-utils==0.36.8 - # via - # apache-superset - # flask-appbuilder -sqlparse==0.3.0 - # via apache-superset -tabulate==0.8.9 - # via apache-superset -typing-extensions==3.7.4.3 - # via - # aiohttp - # apache-superset -urllib3==1.25.11 - # via selenium -vine==1.3.0 - # via - # amqp - # celery -webencodings==0.5.1 - # via bleach -werkzeug==1.0.1 - # via - # flask - # flask-jwt-extended -wtforms==2.3.3 - # via - # flask-wtf - # wtforms-json -wtforms-json==0.3.3 - # via apache-superset -yarl==1.6.2 - # via aiohttp -zipp==3.4.1 - # via -r requirements/base.in - -gevent==20.12.1 - # via -r requirements/docker.in -greenlet==0.4.17 - # via gevent -psycopg2-binary==2.8.6 - # via -r requirements/docker.in -zope.event==4.5.0 - # via gevent -zope.interface==5.1.2 - # via gevent diff --git a/superset/constraints-1.4.1.txt b/superset/constraints-1.4.1.txt deleted file mode 100644 index 8011ceb0a..000000000 --- a/superset/constraints-1.4.1.txt +++ /dev/null @@ -1,311 +0,0 @@ -aiohttp==3.7.4.post0 - # via slackclient -alembic==1.6.5 - # via flask-migrate -amqp==2.6.1 - # via kombu -apispec==3.3.2 - # via flask-appbuilder -async-timeout==3.0.1 - # via aiohttp -attrs==21.2.0 - # via - # aiohttp - # jsonschema -babel==2.9.1 - # via flask-babel -backoff==1.11.1 - # via apache-superset -billiard==3.6.4.0 - # via celery -bleach==3.3.1 - # via apache-superset -brotli==1.0.9 - # via flask-compress -cachelib==0.1.1 - # via apache-superset -celery==4.4.7 - # via apache-superset -certifi==2021.5.30 - # via - # -r requirements/base.in - # requests -cffi==1.14.6 - # via cryptography -chardet==4.0.0 - # via aiohttp -charset-normalizer==2.0.4 - # via - # -r requirements/base.in - # requests -click==7.1.2 - # via - # apache-superset - # flask - # flask-appbuilder -colorama==0.4.4 - # via - # apache-superset - # flask-appbuilder -convertdate==2.3.2 - # via holidays -cron-descriptor==1.2.24 - # via apache-superset -croniter==1.0.15 - # via apache-superset -cryptography==3.4.7 - # via apache-superset -defusedxml==0.7.1 - # via python3-openid -deprecation==2.1.0 - # via apache-superset -dnspython==2.1.0 - # via email-validator -email-validator==1.1.3 - # via flask-appbuilder -flask==1.1.4 - # via - # apache-superset - # flask-appbuilder - # flask-babel - # flask-caching - # flask-compress - # flask-jwt-extended - # flask-login - # flask-migrate - # flask-openid - # flask-sqlalchemy - # flask-wtf -flask-appbuilder==3.4.3 - # via apache-superset -flask-babel==1.0.0 - # via flask-appbuilder -flask-caching==1.10.1 - # via apache-superset -flask-compress==1.10.1 - # via apache-superset -flask-jwt-extended==3.25.1 - # via flask-appbuilder -flask-login==0.4.1 - # via flask-appbuilder -flask-migrate==3.1.0 - # via apache-superset -flask-openid==1.3.0 - # via flask-appbuilder -flask-sqlalchemy==2.5.1 - # via - # flask-appbuilder - # flask-migrate -flask-talisman==0.8.1 - # via apache-superset -flask-wtf==0.14.3 - # via - # apache-superset - # flask-appbuilder -geographiclib==1.52 - # via geopy -geopy==2.2.0 - # via apache-superset -graphlib-backport==1.0.3 - # via apache-superset -gunicorn==20.1.0 - # via apache-superset -holidays==0.10.3 - # via apache-superset -humanize==3.11.0 - # via apache-superset -idna==3.2 - # via - # email-validator - # requests - # yarl -isodate==0.6.0 - # via apache-superset -itsdangerous==1.1.0 - # via - # apache-superset - # flask - # flask-wtf -jinja2==2.11.3 - # via - # flask - # flask-babel -jsonschema==3.2.0 - # via flask-appbuilder -kombu==4.6.11 - # via celery -korean-lunar-calendar==0.2.1 - # via holidays -mako==1.1.4 - # via alembic -markdown==3.3.4 - # via apache-superset -markupsafe==2.0.1 - # via - # jinja2 - # mako - # wtforms -marshmallow==3.13.0 - # via - # flask-appbuilder - # marshmallow-enum - # marshmallow-sqlalchemy -marshmallow-enum==1.5.1 - # via flask-appbuilder -marshmallow-sqlalchemy==0.23.1 - # via flask-appbuilder -msgpack==1.0.2 - # via apache-superset -multidict==5.1.0 - # via - # aiohttp - # yarl -numpy==1.21.1 - # via - # pandas - # pyarrow -packaging==21.0 - # via - # -r requirements/base.in - # bleach - # deprecation -pandas==1.2.5 - # via apache-superset -parsedatetime==2.6 - # via apache-superset -pgsanity==0.2.9 - # via apache-superset -polyline==1.4.0 - # via apache-superset -prison==0.2.1 - # via flask-appbuilder -pyarrow==4.0.1 - # via apache-superset -pycparser==2.20 - # via cffi -pyjwt==1.7.1 - # via - # apache-superset - # flask-appbuilder - # flask-jwt-extended -pymeeus==0.5.11 - # via convertdate -pyparsing==2.4.7 - # via - # apache-superset - # packaging -pyrsistent==0.16.1 - # via - # -r requirements/base.in - # jsonschema -python-dateutil==2.8.2 - # via - # alembic - # apache-superset - # croniter - # flask-appbuilder - # holidays - # pandas -python-dotenv==0.19.0 - # via apache-superset -python-editor==1.0.4 - # via alembic -python-geohash==0.8.5 - # via apache-superset -python3-openid==3.2.0 - # via flask-openid -pytz==2021.1 - # via - # babel - # celery - # convertdate - # flask-babel - # pandas -pyyaml==5.4.1 - # via - # apache-superset - # apispec -redis==3.5.3 - # via apache-superset -requests==2.26.0 - # via apache-superset -sasl==0.3.1 - # via -r requirements/base.in -selenium==3.141.0 - # via apache-superset -simplejson==3.17.3 - # via apache-superset -six==1.16.0 - # via - # bleach - # flask-jwt-extended - # flask-talisman - # holidays - # isodate - # jsonschema - # polyline - # prison - # pyrsistent - # python-dateutil - # sasl - # sqlalchemy-utils - # wtforms-json -slackclient==2.5.0 - # via apache-superset -sqlalchemy==1.3.24 - # via - # alembic - # apache-superset - # flask-appbuilder - # flask-sqlalchemy - # marshmallow-sqlalchemy - # sqlalchemy-utils -sqlalchemy-utils==0.37.8 - # via - # apache-superset - # flask-appbuilder -sqlparse==0.3.0 - # via apache-superset -tabulate==0.8.9 - # via apache-superset -typing-extensions==3.10.0.0 - # via - # aiohttp - # apache-superset -urllib3==1.26.6 - # via - # requests - # selenium -vine==1.3.0 - # via - # amqp - # celery -webencodings==0.5.1 - # via bleach -werkzeug==1.0.1 - # via - # flask - # flask-jwt-extended -wrapt==1.12.1 - # via -r requirements/base.in -wtforms==2.3.3 - # via - # flask-wtf - # wtforms-json -wtforms-json==0.3.3 - # via apache-superset -yarl==1.6.3 - # via aiohttp -zipp==3.4.1 - # via -r requirements/base.in - -gevent==21.8.0 - # via -r requirements/docker.in -greenlet==1.1.1 - # via gevent -psycopg2-binary==2.9.1 - # via -r requirements/docker.in -zope.event==4.5.0 - # via gevent -zope.interface==5.4.0 - # via gevent diff --git a/superset/constraints-1.4.2.txt b/superset/constraints-1.4.2.txt deleted file mode 100644 index a364e434e..000000000 --- a/superset/constraints-1.4.2.txt +++ /dev/null @@ -1,312 +0,0 @@ -# from https://raw.githubusercontent.com/apache/superset/1.4.2/requirements/base.txt -aiohttp==3.7.4.post0 - # via slackclient -alembic==1.6.5 - # via flask-migrate -amqp==2.6.1 - # via kombu -apispec==3.3.2 - # via flask-appbuilder -async-timeout==3.0.1 - # via aiohttp -attrs==21.2.0 - # via - # aiohttp - # jsonschema -babel==2.9.1 - # via flask-babel -backoff==1.11.1 - # via apache-superset -billiard==3.6.4.0 - # via celery -bleach==3.3.1 - # via apache-superset -brotli==1.0.9 - # via flask-compress -cachelib==0.1.1 - # via apache-superset -celery==4.4.7 - # via apache-superset -certifi==2021.5.30 - # via - # -r requirements/base.in - # requests -cffi==1.14.6 - # via cryptography -chardet==4.0.0 - # via aiohttp -charset-normalizer==2.0.4 - # via - # -r requirements/base.in - # requests -click==7.1.2 - # via - # apache-superset - # flask - # flask-appbuilder -colorama==0.4.4 - # via - # apache-superset - # flask-appbuilder -convertdate==2.3.2 - # via holidays -cron-descriptor==1.2.24 - # via apache-superset -croniter==1.0.15 - # via apache-superset -cryptography==3.4.7 - # via apache-superset -defusedxml==0.7.1 - # via python3-openid -deprecation==2.1.0 - # via apache-superset -dnspython==2.1.0 - # via email-validator -email-validator==1.1.3 - # via flask-appbuilder -flask==1.1.4 - # via - # apache-superset - # flask-appbuilder - # flask-babel - # flask-caching - # flask-compress - # flask-jwt-extended - # flask-login - # flask-migrate - # flask-openid - # flask-sqlalchemy - # flask-wtf -flask-appbuilder==3.4.3 - # via apache-superset -flask-babel==1.0.0 - # via flask-appbuilder -flask-caching==1.10.1 - # via apache-superset -flask-compress==1.10.1 - # via apache-superset -flask-jwt-extended==3.25.1 - # via flask-appbuilder -flask-login==0.4.1 - # via flask-appbuilder -flask-migrate==3.1.0 - # via apache-superset -flask-openid==1.3.0 - # via flask-appbuilder -flask-sqlalchemy==2.5.1 - # via - # flask-appbuilder - # flask-migrate -flask-talisman==0.8.1 - # via apache-superset -flask-wtf==0.14.3 - # via - # apache-superset - # flask-appbuilder -geographiclib==1.52 - # via geopy -geopy==2.2.0 - # via apache-superset -graphlib-backport==1.0.3 - # via apache-superset -gunicorn==20.1.0 - # via apache-superset -holidays==0.10.3 - # via apache-superset -humanize==3.11.0 - # via apache-superset -idna==3.2 - # via - # email-validator - # requests - # yarl -isodate==0.6.0 - # via apache-superset -itsdangerous==1.1.0 - # via - # apache-superset - # flask - # flask-wtf -jinja2==2.11.3 - # via - # flask - # flask-babel -jsonschema==3.2.0 - # via flask-appbuilder -kombu==4.6.11 - # via celery -korean-lunar-calendar==0.2.1 - # via holidays -mako==1.1.4 - # via alembic -markdown==3.3.4 - # via apache-superset -markupsafe==2.0.1 - # via - # jinja2 - # mako - # wtforms -marshmallow==3.13.0 - # via - # flask-appbuilder - # marshmallow-enum - # marshmallow-sqlalchemy -marshmallow-enum==1.5.1 - # via flask-appbuilder -marshmallow-sqlalchemy==0.23.1 - # via flask-appbuilder -msgpack==1.0.2 - # via apache-superset -multidict==5.1.0 - # via - # aiohttp - # yarl -numpy==1.21.1 - # via - # pandas - # pyarrow -packaging==21.0 - # via - # -r requirements/base.in - # bleach - # deprecation -pandas==1.2.5 - # via apache-superset -parsedatetime==2.6 - # via apache-superset -pgsanity==0.2.9 - # via apache-superset -polyline==1.4.0 - # via apache-superset -prison==0.2.1 - # via flask-appbuilder -pyarrow==4.0.1 - # via apache-superset -pycparser==2.20 - # via cffi -pyjwt==1.7.1 - # via - # apache-superset - # flask-appbuilder - # flask-jwt-extended -pymeeus==0.5.11 - # via convertdate -pyparsing==2.4.7 - # via - # apache-superset - # packaging -pyrsistent==0.16.1 - # via - # -r requirements/base.in - # jsonschema -python-dateutil==2.8.2 - # via - # alembic - # apache-superset - # croniter - # flask-appbuilder - # holidays - # pandas -python-dotenv==0.19.0 - # via apache-superset -python-editor==1.0.4 - # via alembic -python-geohash==0.8.5 - # via apache-superset -python3-openid==3.2.0 - # via flask-openid -pytz==2021.1 - # via - # babel - # celery - # convertdate - # flask-babel - # pandas -pyyaml==5.4.1 - # via - # apache-superset - # apispec -redis==3.5.3 - # via apache-superset -requests==2.26.0 - # via apache-superset -sasl==0.3.1 - # via -r requirements/base.in -selenium==3.141.0 - # via apache-superset -simplejson==3.17.3 - # via apache-superset -six==1.16.0 - # via - # bleach - # flask-jwt-extended - # flask-talisman - # holidays - # isodate - # jsonschema - # polyline - # prison - # pyrsistent - # python-dateutil - # sasl - # sqlalchemy-utils - # wtforms-json -slackclient==2.5.0 - # via apache-superset -sqlalchemy==1.3.24 - # via - # alembic - # apache-superset - # flask-appbuilder - # flask-sqlalchemy - # marshmallow-sqlalchemy - # sqlalchemy-utils -sqlalchemy-utils==0.37.8 - # via - # apache-superset - # flask-appbuilder -sqlparse==0.3.0 - # via apache-superset -tabulate==0.8.9 - # via apache-superset -typing-extensions==3.10.0.0 - # via - # aiohttp - # apache-superset -urllib3==1.26.6 - # via - # requests - # selenium -vine==1.3.0 - # via - # amqp - # celery -webencodings==0.5.1 - # via bleach -werkzeug==1.0.1 - # via - # flask - # flask-jwt-extended -wrapt==1.12.1 - # via -r requirements/base.in -wtforms==2.3.3 - # via - # flask-wtf - # wtforms-json -wtforms-json==0.3.3 - # via apache-superset -yarl==1.6.3 - # via aiohttp -zipp==3.4.1 - # via -r requirements/base.in -# from https://raw.githubusercontent.com/apache/superset/1.4.2/requirements/docker.txt -gevent==21.8.0 - # via -r requirements/docker.in -greenlet==1.1.1 - # via gevent -psycopg2-binary==2.9.1 - # via -r requirements/docker.in -zope.event==4.5.0 - # via gevent -zope.interface==5.4.0 - # via gevent diff --git a/superset/constraints-1.5.1.txt b/superset/constraints-1.5.1.txt deleted file mode 100644 index 20fee5f50..000000000 --- a/superset/constraints-1.5.1.txt +++ /dev/null @@ -1,302 +0,0 @@ -aiohttp==3.7.4.post0 - # via slackclient -alembic==1.6.5 - # via flask-migrate -amqp==2.6.1 - # via kombu -apispec==3.3.2 - # via flask-appbuilder -async-timeout==3.0.1 - # via aiohttp -attrs==21.2.0 - # via - # aiohttp - # jsonschema -babel==2.9.1 - # via flask-babel -backoff==1.11.1 - # via apache-superset -billiard==3.6.4.0 - # via celery -bleach==3.3.1 - # via apache-superset -brotli==1.0.9 - # via flask-compress -cachelib==0.4.1 - # via apache-superset -celery==4.4.7 - # via apache-superset -cffi==1.14.6 - # via cryptography -chardet==4.0.0 - # via aiohttp -click==7.1.2 - # via - # apache-superset - # flask - # flask-appbuilder -colorama==0.4.4 - # via - # apache-superset - # flask-appbuilder -convertdate==2.3.2 - # via holidays -cron-descriptor==1.2.24 - # via apache-superset -croniter==1.0.15 - # via apache-superset -cryptography==3.4.7 - # via apache-superset -defusedxml==0.7.1 - # via python3-openid -deprecation==2.1.0 - # via apache-superset -dnspython==2.1.0 - # via email-validator -email-validator==1.1.3 - # via flask-appbuilder -flask==1.1.4 - # via - # apache-superset - # flask-appbuilder - # flask-babel - # flask-caching - # flask-compress - # flask-jwt-extended - # flask-login - # flask-migrate - # flask-openid - # flask-sqlalchemy - # flask-wtf -flask-appbuilder==3.4.5 - # via apache-superset -flask-babel==1.0.0 - # via flask-appbuilder -flask-caching==1.10.1 - # via apache-superset -flask-compress==1.10.1 - # via apache-superset -flask-jwt-extended==3.25.1 - # via flask-appbuilder -flask-login==0.4.1 - # via flask-appbuilder -flask-migrate==3.1.0 - # via apache-superset -flask-openid==1.3.0 - # via flask-appbuilder -flask-sqlalchemy==2.5.1 - # via - # flask-appbuilder - # flask-migrate -flask-talisman==0.8.1 - # via apache-superset -flask-wtf==0.14.3 - # via - # apache-superset - # flask-appbuilder -func-timeout==4.3.5 - # via apache-superset -geographiclib==1.52 - # via geopy -geopy==2.2.0 - # via apache-superset -graphlib-backport==1.0.3 - # via apache-superset -gunicorn==20.1.0 - # via apache-superset -hashids==1.3.1 - # via apache-superset -holidays==0.10.3 - # via apache-superset -humanize==3.11.0 - # via apache-superset -idna==3.2 - # via - # email-validator - # yarl -isodate==0.6.0 - # via apache-superset -itsdangerous==1.1.0 - # via - # apache-superset - # flask - # flask-wtf -jinja2==2.11.3 - # via - # flask - # flask-babel -jsonschema==3.2.0 - # via flask-appbuilder -kombu==4.6.11 - # via celery -korean-lunar-calendar==0.2.1 - # via holidays -mako==1.1.4 - # via alembic -markdown==3.3.4 - # via apache-superset -markupsafe==2.0.1 - # via - # jinja2 - # mako - # wtforms -marshmallow==3.13.0 - # via - # flask-appbuilder - # marshmallow-enum - # marshmallow-sqlalchemy -marshmallow-enum==1.5.1 - # via flask-appbuilder -marshmallow-sqlalchemy==0.23.1 - # via flask-appbuilder -msgpack==1.0.2 - # via apache-superset -multidict==5.1.0 - # via - # aiohttp - # yarl -numpy==1.21.1 - # via - # pandas - # pyarrow -packaging==21.3 - # via - # bleach - # deprecation -pandas==1.3.4 - # via apache-superset -parsedatetime==2.6 - # via apache-superset -pgsanity==0.2.9 - # via apache-superset -polyline==1.4.0 - # via apache-superset -prison==0.2.1 - # via flask-appbuilder -pyarrow==5.0.0 - # via apache-superset -pycparser==2.20 - # via cffi -pyjwt==1.7.1 - # via - # apache-superset - # flask-appbuilder - # flask-jwt-extended -pymeeus==0.5.11 - # via convertdate -pyparsing==3.0.6 - # via - # apache-superset - # packaging -pyrsistent==0.16.1 - # via - # -r requirements/base.in - # jsonschema -python-dateutil==2.8.2 - # via - # alembic - # apache-superset - # croniter - # flask-appbuilder - # holidays - # pandas -python-dotenv==0.19.0 - # via apache-superset -python-editor==1.0.4 - # via alembic -python-geohash==0.8.5 - # via apache-superset -python3-openid==3.2.0 - # via flask-openid -pytz==2021.1 - # via - # babel - # celery - # convertdate - # flask-babel - # pandas -pyyaml==5.4.1 - # via - # apache-superset - # apispec -redis==3.5.3 - # via apache-superset -sasl==0.3.1 - # via -r requirements/base.in -selenium==3.141.0 - # via apache-superset -simplejson==3.17.3 - # via apache-superset -six==1.16.0 - # via - # bleach - # flask-jwt-extended - # flask-talisman - # holidays - # isodate - # jsonschema - # polyline - # prison - # pyrsistent - # python-dateutil - # sasl - # sqlalchemy-utils - # wtforms-json -slackclient==2.5.0 - # via apache-superset -sqlalchemy==1.3.24 - # via - # alembic - # apache-superset - # flask-appbuilder - # flask-sqlalchemy - # marshmallow-sqlalchemy - # sqlalchemy-utils -sqlalchemy-utils==0.37.8 - # via - # apache-superset - # flask-appbuilder -sqlparse==0.3.0 - # via apache-superset -tabulate==0.8.9 - # via apache-superset -typing-extensions==3.10.0.0 - # via - # aiohttp - # apache-superset -urllib3==1.26.6 - # via selenium -vine==1.3.0 - # via - # amqp - # celery -webencodings==0.5.1 - # via bleach -werkzeug==1.0.1 - # via - # flask - # flask-jwt-extended -wrapt==1.12.1 - # via -r requirements/base.in -wtforms==2.3.3 - # via - # flask-appbuilder - # flask-wtf - # wtforms-json -wtforms-json==0.3.3 - # via apache-superset -yarl==1.6.3 - # via aiohttp -zipp==3.4.1 - # via -r requirements/base.in - -gevent==21.8.0 - # via -r requirements/docker.in -greenlet==1.1.1 - # via gevent -psycopg2-binary==2.9.1 - # via -r requirements/docker.in -zope.event==4.5.0 - # via gevent -zope.interface==5.4.0 - # via gevent diff --git a/superset/constraints-2.0.1.txt b/superset/constraints-2.1.1.txt similarity index 82% rename from superset/constraints-2.0.1.txt rename to superset/constraints-2.1.1.txt index 9ca738df1..f89f993dc 100644 --- a/superset/constraints-2.0.1.txt +++ b/superset/constraints-2.1.1.txt @@ -1,24 +1,18 @@ -# from https://github.com/apache/superset/blob/2.0.1/requirements/base.txt -aiohttp==3.8.1 - # via slackclient -aiosignal==1.2.0 - # via aiohttp +# from https://raw.githubusercontent.com/apache/superset/2.1.1/requirements/base.txt alembic==1.6.5 # via flask-migrate amqp==5.1.0 # via kombu apispec==3.3.2 # via flask-appbuilder -async-timeout==4.0.2 - # via aiohttp attrs==21.2.0 - # via - # aiohttp - # jsonschema + # via jsonschema babel==2.9.1 # via flask-babel backoff==1.11.1 # via apache-superset +bcrypt==4.0.1 + # via paramiko billiard==3.6.4.0 # via celery bleach==3.3.1 @@ -29,10 +23,10 @@ cachelib==0.4.1 # via apache-superset celery==5.2.2 # via apache-superset -cffi==1.14.6 - # via cryptography -charset-normalizer==2.0.4 - # via aiohttp +cffi==1.15.1 + # via + # cryptography + # pynacl click==8.0.4 # via # apache-superset @@ -58,15 +52,17 @@ cron-descriptor==1.2.24 # via apache-superset croniter==1.0.15 # via apache-superset -cryptography==3.4.7 - # via apache-superset +cryptography==39.0.0 + # via + # apache-superset + # paramiko deprecation==2.1.0 # via apache-superset dnspython==2.1.0 # via email-validator email-validator==1.1.3 # via flask-appbuilder -flask==2.0.3 +flask==2.1.3 # via # apache-superset # flask-appbuilder @@ -78,34 +74,32 @@ flask==2.0.3 # flask-migrate # flask-sqlalchemy # flask-wtf -flask-appbuilder==4.1.3 +flask-appbuilder==4.3.0 # via apache-superset flask-babel==1.0.0 # via flask-appbuilder flask-caching==1.10.1 # via apache-superset -flask-compress==1.10.1 +flask-compress==1.13 # via apache-superset flask-jwt-extended==4.3.1 # via flask-appbuilder -flask-login==0.4.1 - # via flask-appbuilder +flask-login==0.6.0 + # via + # apache-superset + # flask-appbuilder flask-migrate==3.1.0 # via apache-superset flask-sqlalchemy==2.5.1 # via # flask-appbuilder # flask-migrate -flask-talisman==0.8.1 +flask-talisman==1.0.0 # via apache-superset -flask-wtf==0.14.3 +flask-wtf==1.0.1 # via # apache-superset # flask-appbuilder -frozenlist==1.3.0 - # via - # aiohttp - # aiosignal func-timeout==4.3.5 # via apache-superset geographiclib==1.52 @@ -118,14 +112,14 @@ gunicorn==20.1.0 # via apache-superset hashids==1.3.1 # via apache-superset -holidays==0.14.2 +hijri-converter==2.2.4 + # via holidays +holidays==0.17.2 # via apache-superset humanize==3.11.0 # via apache-superset idna==3.2 - # via - # email-validator - # yarl + # via email-validator isodate==0.6.0 # via apache-superset itsdangerous==2.1.1 @@ -146,7 +140,7 @@ mako==1.1.4 # via alembic markdown==3.3.4 # via apache-superset -markupsafe==2.0.1 +markupsafe==2.1.1 # via # jinja2 # mako @@ -162,11 +156,7 @@ marshmallow-sqlalchemy==0.23.1 # via flask-appbuilder msgpack==1.0.2 # via apache-superset -multidict==5.1.0 - # via - # aiohttp - # yarl -numpy==1.22.1 +numpy==1.23.5 # via # apache-superset # pandas @@ -175,8 +165,10 @@ packaging==21.3 # via # bleach # deprecation -pandas==1.3.4 +pandas==1.5.3 # via apache-superset +paramiko==2.11.0 + # via sshtunnel parsedatetime==2.6 # via apache-superset pgsanity==0.2.9 @@ -187,7 +179,7 @@ prison==0.2.1 # via flask-appbuilder prompt-toolkit==3.0.28 # via click-repl -pyarrow==5.0.0 +pyarrow==10.0.1 # via apache-superset pycparser==2.20 # via cffi @@ -198,6 +190,8 @@ pyjwt==2.4.0 # flask-jwt-extended pymeeus==0.5.11 # via convertdate +pynacl==1.5.0 + # via paramiko pyparsing==3.0.6 # via # apache-superset @@ -222,7 +216,6 @@ pytz==2021.3 # via # babel # celery - # convertdate # flask-babel # pandas pyyaml==5.4.1 @@ -239,19 +232,17 @@ six==1.16.0 # via # bleach # click-repl - # flask-talisman - # holidays # isodate # jsonschema + # paramiko # polyline # prison # pyrsistent # python-dateutil - # sqlalchemy-utils # wtforms-json -slackclient==2.5.0 +slack-sdk==3.18.3 # via apache-superset -sqlalchemy==1.3.24 +sqlalchemy==1.4.36 # via # alembic # apache-superset @@ -259,15 +250,17 @@ sqlalchemy==1.3.24 # flask-sqlalchemy # marshmallow-sqlalchemy # sqlalchemy-utils -sqlalchemy-utils==0.37.8 +sqlalchemy-utils==0.38.3 # via # apache-superset # flask-appbuilder -sqlparse==0.3.0 +sqlparse==0.4.3 + # via apache-superset +sshtunnel==0.4.0 # via apache-superset tabulate==0.8.9 # via apache-superset -typing-extensions==3.10.0.0 +typing-extensions==4.4.0 # via apache-superset urllib3==1.26.6 # via selenium @@ -280,25 +273,27 @@ wcwidth==0.2.5 # via prompt-toolkit webencodings==0.5.1 # via bleach -werkzeug==2.0.3 +werkzeug==2.1.2 # via # flask # flask-jwt-extended + # flask-login wtforms==2.3.3 # via + # apache-superset # flask-appbuilder # flask-wtf # wtforms-json wtforms-json==0.3.3 # via apache-superset -yarl==1.6.3 - # via aiohttp -# from https://github.com/apache/superset/blob/2.0.1/requirements/docker.txt +xlsxwriter==3.0.7 + # via apache-superset +# from https://raw.githubusercontent.com/apache/superset/2.1.1/requirements/docker.txt gevent==21.8.0 # via -r requirements/docker.in -greenlet==1.1.1 +greenlet==1.1.3.post0 # via gevent -psycopg2-binary==2.9.1 +psycopg2-binary==2.9.5 # via apache-superset zope-event==4.5.0 # via gevent diff --git a/superset/constraints-1.5.3.txt b/superset/constraints-3.0.0.txt similarity index 59% rename from superset/constraints-1.5.3.txt rename to superset/constraints-3.0.0.txt index 2895e4777..40d1baa88 100644 --- a/superset/constraints-1.5.3.txt +++ b/superset/constraints-3.0.0.txt @@ -1,62 +1,73 @@ -# from https://raw.githubusercontent.com/apache/superset/1.5.3/requirements/base.txt -aiohttp==3.7.4.post0 - # via slackclient +# from https://raw.githubusercontent.com/apache/superset/3.0.0/requirements/base.txt alembic==1.6.5 # via flask-migrate -amqp==2.6.1 +amqp==5.1.0 # via kombu -apispec==3.3.2 +apispec==6.3.0 # via flask-appbuilder -async-timeout==3.0.1 - # via aiohttp -attrs==21.2.0 - # via - # aiohttp - # jsonschema +async-timeout==4.0.2 + # via redis +attrs==23.1.0 + # via jsonschema babel==2.9.1 # via flask-babel backoff==1.11.1 # via apache-superset +bcrypt==4.0.1 + # via paramiko billiard==3.6.4.0 # via celery -bleach==3.3.1 - # via apache-superset brotli==1.0.9 # via flask-compress -cachelib==0.4.1 +cachelib==0.6.0 + # via flask-caching +celery==5.2.2 # via apache-superset -celery==4.4.7 - # via apache-superset -cffi==1.14.6 - # via cryptography -chardet==4.0.0 - # via aiohttp -click==7.1.2 +cffi==1.15.1 + # via + # cryptography + # pynacl +click==8.1.3 # via # apache-superset + # celery + # click-didyoumean + # click-option-group + # click-plugins + # click-repl # flask # flask-appbuilder -colorama==0.4.4 +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 +colorama==0.4.6 # via # apache-superset # flask-appbuilder -convertdate==2.3.2 +convertdate==2.4.0 # via holidays cron-descriptor==1.2.24 # via apache-superset croniter==1.0.15 # via apache-superset -cryptography==3.4.7 - # via apache-superset -defusedxml==0.7.1 - # via python3-openid +cryptography==39.0.1 + # via + # apache-superset + # paramiko +deprecated==1.2.13 + # via limits deprecation==2.1.0 # via apache-superset dnspython==2.1.0 # via email-validator email-validator==1.1.3 # via flask-appbuilder -flask==1.1.4 +flask==2.2.5 # via # apache-superset # flask-appbuilder @@ -64,34 +75,36 @@ flask==1.1.4 # flask-caching # flask-compress # flask-jwt-extended + # flask-limiter # flask-login # flask-migrate - # flask-openid # flask-sqlalchemy # flask-wtf -flask-appbuilder==3.4.5 +flask-appbuilder==4.3.6 # via apache-superset flask-babel==1.0.0 # via flask-appbuilder -flask-caching==1.10.1 +flask-caching==1.11.1 # via apache-superset -flask-compress==1.10.1 +flask-compress==1.13 # via apache-superset -flask-jwt-extended==3.25.1 +flask-jwt-extended==4.3.1 # via flask-appbuilder -flask-login==0.4.1 +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-openid==1.3.0 - # via flask-appbuilder flask-sqlalchemy==2.5.1 # via # flask-appbuilder # flask-migrate -flask-talisman==0.8.1 +flask-talisman==1.0.0 # via apache-superset -flask-wtf==0.14.3 +flask-wtf==1.1.1 # via # apache-superset # flask-appbuilder @@ -101,98 +114,113 @@ geographiclib==1.52 # via geopy geopy==2.2.0 # via apache-superset -graphlib-backport==1.0.3 - # via apache-superset gunicorn==20.1.0 # via apache-superset hashids==1.3.1 # via apache-superset -holidays==0.10.3 +hijri-converter==2.3.1 + # via holidays +holidays==0.23 # via apache-superset humanize==3.11.0 # via apache-superset idna==3.2 - # via - # email-validator - # yarl + # via email-validator +importlib-metadata==6.6.0 + # via apache-superset +importlib-resources==5.12.0 + # via limits isodate==0.6.0 # via apache-superset -itsdangerous==1.1.0 +itsdangerous==2.1.2 # via - # apache-superset # flask # flask-wtf -jinja2==2.11.3 +jinja2==3.1.2 # via # flask # flask-babel -jsonschema==3.2.0 +jsonschema==4.17.3 # via flask-appbuilder -kombu==4.6.11 +kombu==5.2.4 # via celery -korean-lunar-calendar==0.2.1 +korean-lunar-calendar==0.3.1 # via holidays -mako==1.1.4 - # via alembic +limits==3.4.0 + # via flask-limiter +mako==1.2.4 + # via + # alembic + # apache-superset markdown==3.3.4 # via apache-superset -markupsafe==2.0.1 +markdown-it-py==2.2.0 + # via rich +markupsafe==2.1.1 # via # jinja2 # mako + # werkzeug # wtforms -marshmallow==3.13.0 +marshmallow==3.19.0 # via # flask-appbuilder - # marshmallow-enum # marshmallow-sqlalchemy -marshmallow-enum==1.5.1 - # via flask-appbuilder marshmallow-sqlalchemy==0.23.1 # via flask-appbuilder +mdurl==0.1.2 + # via markdown-it-py msgpack==1.0.2 # via apache-superset -multidict==5.1.0 - # via - # aiohttp - # yarl -numpy==1.21.1 +nh3==0.2.11 + # via apache-superset +numpy==1.23.5 # via + # apache-superset # pandas # pyarrow -packaging==21.3 +ordered-set==4.1.0 + # via flask-limiter +packaging==23.1 # via - # bleach + # apache-superset + # apispec # deprecation -pandas==1.3.4 + # limits + # marshmallow +pandas==1.5.3 # via apache-superset +paramiko==2.11.0 + # via sshtunnel parsedatetime==2.6 # via apache-superset pgsanity==0.2.9 # via apache-superset -polyline==1.4.0 +polyline==2.0.0 # via apache-superset prison==0.2.1 # via flask-appbuilder -pyarrow==5.0.0 +prompt-toolkit==3.0.38 + # via click-repl +pyarrow==12.0.0 # via apache-superset pycparser==2.20 # via cffi -pyjwt==1.7.1 +pygments==2.15.0 + # via rich +pyjwt==2.4.0 # via # apache-superset # flask-appbuilder # flask-jwt-extended -pymeeus==0.5.11 +pymeeus==0.5.12 # via convertdate +pynacl==1.5.0 + # via paramiko pyparsing==3.0.6 - # via - # apache-superset - # packaging -pyrsistent==0.16.1 - # via - # -r requirements/base.in - # jsonschema + # via apache-superset +pyrsistent==0.19.3 + # via jsonschema python-dateutil==2.8.2 # via # alembic @@ -207,45 +235,37 @@ python-editor==1.0.4 # via alembic python-geohash==0.8.5 # via apache-superset -python3-openid==3.2.0 - # via flask-openid -pytz==2021.1 +pytz==2021.3 # via # babel # celery - # convertdate # flask-babel # pandas -pyyaml==5.4.1 +pyyaml==6.0.1 # via # apache-superset # apispec -redis==3.5.3 +redis==4.5.4 # via apache-superset -sasl==0.3.1 - # via -r requirements/base.in +rich==13.3.4 + # via flask-limiter selenium==3.141.0 # via apache-superset +shortid==0.1.2 + # via apache-superset simplejson==3.17.3 # via apache-superset six==1.16.0 # via - # bleach - # flask-jwt-extended - # flask-talisman - # holidays + # click-repl # isodate - # jsonschema - # polyline + # paramiko # prison - # pyrsistent # python-dateutil - # sasl - # sqlalchemy-utils # wtforms-json -slackclient==2.5.0 +slack-sdk==3.21.3 # via apache-superset -sqlalchemy==1.3.24 +sqlalchemy==1.4.36 # via # alembic # apache-superset @@ -253,51 +273,60 @@ sqlalchemy==1.3.24 # flask-sqlalchemy # marshmallow-sqlalchemy # sqlalchemy-utils -sqlalchemy-utils==0.37.8 +sqlalchemy-utils==0.38.3 # via # apache-superset # flask-appbuilder -sqlparse==0.3.0 +sqlparse==0.4.4 + # via apache-superset +sshtunnel==0.4.0 # via apache-superset tabulate==0.8.9 # via apache-superset -typing-extensions==3.10.0.0 +typing-extensions==4.4.0 # via - # aiohttp # apache-superset + # flask-limiter + # limits urllib3==1.26.6 # via selenium -vine==1.3.0 +vine==5.0.0 # via # amqp # celery -webencodings==0.5.1 - # via bleach -werkzeug==1.0.1 + # kombu +wcwidth==0.2.5 + # via prompt-toolkit +werkzeug==2.3.3 # via + # apache-superset # flask # flask-jwt-extended + # flask-login wrapt==1.12.1 - # via -r requirements/base.in + # via deprecated wtforms==2.3.3 # via + # apache-superset # flask-appbuilder # flask-wtf # wtforms-json -wtforms-json==0.3.3 - # via apache-superset -yarl==1.6.3 - # via aiohttp -zipp==3.4.1 - # via -r requirements/base.in -# from https://raw.githubusercontent.com/apache/superset/1.5.3/requirements/docker.txt -gevent==21.8.0 - # via -r requirements/docker.in -greenlet==1.1.1 - # via gevent -psycopg2-binary==2.9.1 +wtforms-json==0.3.5 + # via apache-superset +xlsxwriter==3.0.7 + # via apache-superset +zipp==3.15.0 + # via importlib-metadata +# from https://raw.githubusercontent.com/apache/superset/3.0.0/requirements/docker.txt +gevent==22.10.2 # via -r requirements/docker.in -zope.event==4.5.0 +greenlet==2.0.2 + # via + # -r requirements/docker.in + # gevent +psycopg2-binary==2.9.6 + # via apache-superset +zope-event==4.5.0 # via gevent -zope.interface==5.4.0 +zope-interface==5.4.0 # via gevent diff --git a/superset/patches-1.3.2/0001-fix-Set-certificates-before-reconnecting-to-LDAP.patch b/superset/patches-1.3.2/0001-fix-Set-certificates-before-reconnecting-to-LDAP.patch deleted file mode 100644 index 3272d2c8f..000000000 --- a/superset/patches-1.3.2/0001-fix-Set-certificates-before-reconnecting-to-LDAP.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ffe97546918f219f556ef68e1d8f08e9a252ffa0 Mon Sep 17 00:00:00 2001 -From: Sebastian Bernauer -Date: Tue, 10 May 2022 15:43:25 +0200 -Subject: [PATCH] fix: Set certificates before reconnecting to LDAP - ---- - flask_appbuilder/security/manager.py | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/flask_appbuilder/security/manager.py b/flask_appbuilder/security/manager.py -index ada7865c..6137a818 100644 ---- a/flask_appbuilder/security/manager.py -+++ b/flask_appbuilder/security/manager.py -@@ -1060,12 +1060,6 @@ class BaseSecurityManager(AbstractSecurityManager): - - try: - # LDAP certificate settings -- if self.auth_ldap_allow_self_signed: -- ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_ALLOW) -- ldap.set_option(ldap.OPT_X_TLS_NEWCTX, 0) -- elif self.auth_ldap_tls_demand: -- ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_DEMAND) -- ldap.set_option(ldap.OPT_X_TLS_NEWCTX, 0) - if self.auth_ldap_tls_cacertdir: - ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, self.auth_ldap_tls_cacertdir) - if self.auth_ldap_tls_cacertfile: -@@ -1076,6 +1070,12 @@ class BaseSecurityManager(AbstractSecurityManager): - ldap.set_option(ldap.OPT_X_TLS_CERTFILE, self.auth_ldap_tls_certfile) - if self.auth_ldap_tls_keyfile: - ldap.set_option(ldap.OPT_X_TLS_KEYFILE, self.auth_ldap_tls_keyfile) -+ if self.auth_ldap_allow_self_signed: -+ ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_ALLOW) -+ ldap.set_option(ldap.OPT_X_TLS_NEWCTX, 0) -+ elif self.auth_ldap_tls_demand: -+ ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_DEMAND) -+ ldap.set_option(ldap.OPT_X_TLS_NEWCTX, 0) - - # Initialise LDAP connection - con = ldap.initialize(self.auth_ldap_server) --- -2.36.0 - diff --git a/superset/patches-1.4.1/0001-fix-Set-certificates-before-reconnecting-to-LDAP.patch b/superset/patches-1.4.1/0001-fix-Set-certificates-before-reconnecting-to-LDAP.patch deleted file mode 100644 index 3272d2c8f..000000000 --- a/superset/patches-1.4.1/0001-fix-Set-certificates-before-reconnecting-to-LDAP.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ffe97546918f219f556ef68e1d8f08e9a252ffa0 Mon Sep 17 00:00:00 2001 -From: Sebastian Bernauer -Date: Tue, 10 May 2022 15:43:25 +0200 -Subject: [PATCH] fix: Set certificates before reconnecting to LDAP - ---- - flask_appbuilder/security/manager.py | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/flask_appbuilder/security/manager.py b/flask_appbuilder/security/manager.py -index ada7865c..6137a818 100644 ---- a/flask_appbuilder/security/manager.py -+++ b/flask_appbuilder/security/manager.py -@@ -1060,12 +1060,6 @@ class BaseSecurityManager(AbstractSecurityManager): - - try: - # LDAP certificate settings -- if self.auth_ldap_allow_self_signed: -- ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_ALLOW) -- ldap.set_option(ldap.OPT_X_TLS_NEWCTX, 0) -- elif self.auth_ldap_tls_demand: -- ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_DEMAND) -- ldap.set_option(ldap.OPT_X_TLS_NEWCTX, 0) - if self.auth_ldap_tls_cacertdir: - ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, self.auth_ldap_tls_cacertdir) - if self.auth_ldap_tls_cacertfile: -@@ -1076,6 +1070,12 @@ class BaseSecurityManager(AbstractSecurityManager): - ldap.set_option(ldap.OPT_X_TLS_CERTFILE, self.auth_ldap_tls_certfile) - if self.auth_ldap_tls_keyfile: - ldap.set_option(ldap.OPT_X_TLS_KEYFILE, self.auth_ldap_tls_keyfile) -+ if self.auth_ldap_allow_self_signed: -+ ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_ALLOW) -+ ldap.set_option(ldap.OPT_X_TLS_NEWCTX, 0) -+ elif self.auth_ldap_tls_demand: -+ ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_DEMAND) -+ ldap.set_option(ldap.OPT_X_TLS_NEWCTX, 0) - - # Initialise LDAP connection - con = ldap.initialize(self.auth_ldap_server) --- -2.36.0 - diff --git a/superset/patches-1.4.2/no-patches-needed b/superset/patches-1.4.2/no-patches-needed deleted file mode 100644 index e69de29bb..000000000 diff --git a/superset/patches-1.5.1/0001-fix-Set-certificates-before-reconnecting-to-LDAP.patch b/superset/patches-1.5.1/0001-fix-Set-certificates-before-reconnecting-to-LDAP.patch deleted file mode 100644 index 3272d2c8f..000000000 --- a/superset/patches-1.5.1/0001-fix-Set-certificates-before-reconnecting-to-LDAP.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ffe97546918f219f556ef68e1d8f08e9a252ffa0 Mon Sep 17 00:00:00 2001 -From: Sebastian Bernauer -Date: Tue, 10 May 2022 15:43:25 +0200 -Subject: [PATCH] fix: Set certificates before reconnecting to LDAP - ---- - flask_appbuilder/security/manager.py | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/flask_appbuilder/security/manager.py b/flask_appbuilder/security/manager.py -index ada7865c..6137a818 100644 ---- a/flask_appbuilder/security/manager.py -+++ b/flask_appbuilder/security/manager.py -@@ -1060,12 +1060,6 @@ class BaseSecurityManager(AbstractSecurityManager): - - try: - # LDAP certificate settings -- if self.auth_ldap_allow_self_signed: -- ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_ALLOW) -- ldap.set_option(ldap.OPT_X_TLS_NEWCTX, 0) -- elif self.auth_ldap_tls_demand: -- ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_DEMAND) -- ldap.set_option(ldap.OPT_X_TLS_NEWCTX, 0) - if self.auth_ldap_tls_cacertdir: - ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, self.auth_ldap_tls_cacertdir) - if self.auth_ldap_tls_cacertfile: -@@ -1076,6 +1070,12 @@ class BaseSecurityManager(AbstractSecurityManager): - ldap.set_option(ldap.OPT_X_TLS_CERTFILE, self.auth_ldap_tls_certfile) - if self.auth_ldap_tls_keyfile: - ldap.set_option(ldap.OPT_X_TLS_KEYFILE, self.auth_ldap_tls_keyfile) -+ if self.auth_ldap_allow_self_signed: -+ ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_ALLOW) -+ ldap.set_option(ldap.OPT_X_TLS_NEWCTX, 0) -+ elif self.auth_ldap_tls_demand: -+ ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_DEMAND) -+ ldap.set_option(ldap.OPT_X_TLS_NEWCTX, 0) - - # Initialise LDAP connection - con = ldap.initialize(self.auth_ldap_server) --- -2.36.0 - diff --git a/superset/patches-1.5.3/no-patches-needed b/superset/patches-1.5.3/no-patches-needed deleted file mode 100644 index e69de29bb..000000000 diff --git a/superset/patches-2.0.1/no-patches-needed b/superset/patches-2.0.1/no-patches-needed deleted file mode 100644 index e69de29bb..000000000 diff --git a/superset/patches-2.1.0/no-patches-needed b/superset/patches-2.1.0/no-patches-needed deleted file mode 100644 index e69de29bb..000000000