From 35c8e4dbca39d098b5b60f8456034715b805734d Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Mon, 16 Sep 2024 11:08:40 +0200 Subject: [PATCH 1/5] chore(superset): update versions for 24.11 --- superset/constraints-2.1.3.txt | 322 -------------- superset/constraints-3.1.0.txt | 393 ------------------ superset/constraints-3.1.3.txt | 393 ------------------ superset/stackable/patches/2.1.3/.gitkeep | 0 .../3.1.0/001-26885-query-export-fix.patch | 37 -- superset/stackable/patches/3.1.3/.gitkeep | 0 superset/versions.py | 23 +- 7 files changed, 1 insertion(+), 1167 deletions(-) delete mode 100644 superset/constraints-2.1.3.txt delete mode 100644 superset/constraints-3.1.0.txt delete mode 100644 superset/constraints-3.1.3.txt delete mode 100644 superset/stackable/patches/2.1.3/.gitkeep delete mode 100644 superset/stackable/patches/3.1.0/001-26885-query-export-fix.patch delete mode 100644 superset/stackable/patches/3.1.3/.gitkeep diff --git a/superset/constraints-2.1.3.txt b/superset/constraints-2.1.3.txt deleted file mode 100644 index 0f58ab663..000000000 --- a/superset/constraints-2.1.3.txt +++ /dev/null @@ -1,322 +0,0 @@ -# from https://github.com/apache/superset/blob/2.1.3/requirements/base.txt -alembic==1.6.5 - # via flask-migrate -amqp==5.1.0 - # via kombu -apispec==3.3.2 - # via flask-appbuilder -attrs==21.2.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 -brotli==1.0.9 - # via flask-compress -cachelib==0.4.1 - # via apache-superset -celery==5.2.2 - # via apache-superset -cffi==1.15.1 - # via - # cryptography - # pynacl -click==8.1.3 - # via - # apache-superset - # celery - # click-didyoumean - # click-plugins - # click-repl - # flask - # flask-appbuilder -click-didyoumean==0.3.0 - # via celery -click-plugins==1.1.1 - # via celery -click-repl==0.2.0 - # via celery -colorama==0.4.4 - # via - # apache-superset - # flask-appbuilder -convertdate==2.4.0 - # via holidays -cron-descriptor==1.2.24 - # via apache-superset -croniter==1.0.15 - # 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.2.5 - # via - # apache-superset - # flask-appbuilder - # flask-babel - # flask-caching - # flask-compress - # flask-jwt-extended - # flask-login - # flask-migrate - # flask-sqlalchemy - # flask-wtf -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.13 - # via apache-superset -flask-jwt-extended==4.3.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==1.0.0 - # via apache-superset -flask-wtf==1.0.1 - # 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 -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 -importlib-metadata==6.3.0 - # via flask -importlib-resources==5.12.0 - # via limits -isodate==0.6.0 - # via apache-superset -itsdangerous==2.1.2 - # via - # flask - # flask-wtf -jinja2==3.1.2 - # via - # flask - # flask-babel -jsonschema==3.2.0 - # via flask-appbuilder -kombu==5.2.4 - # via celery -korean-lunar-calendar==0.2.1 - # via holidays -limits==3.3.1 - # via flask-limiter -mako==1.1.4 - # via alembic -markdown==3.3.4 - # via apache-superset -markupsafe==2.1.1 - # via - # jinja2 - # mako - # werkzeug - # 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 -nh3==0.2.11 - # via apache-superset -numpy==1.23.5 - # via - # apache-superset - # pandas - # pyarrow -packaging==21.3 - # via - # deprecation -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 - # via apache-superset -prison==0.2.1 - # via flask-appbuilder -prompt-toolkit==3.0.28 - # via click-repl -pyarrow==10.0.1 - # via apache-superset -pycparser==2.20 - # via cffi -pygments==2.15.0 - # via rich -pyjwt==2.4.0 - # via - # apache-superset - # flask-appbuilder - # flask-jwt-extended -pymeeus==0.5.11 - # via convertdate -pynacl==1.5.0 - # via paramiko -pyparsing==3.0.6 - # via - # apache-superset - # packaging -pyrsistent==0.16.1 - # via 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 -pytz==2021.3 - # via - # babel - # celery - # flask-babel - # pandas -pyyaml==5.4.1 - # via - # apache-superset - # apispec -redis==3.5.3 - # via apache-superset -rich==13.3.4 - # via flask-limiter -selenium==3.141.0 - # via apache-superset -simplejson==3.17.3 - # via apache-superset -six==1.16.0 - # via - # click-repl - # isodate - # jsonschema - # paramiko - # polyline - # prison - # pyrsistent - # python-dateutil - # wtforms-json -slack-sdk==3.18.3 - # via apache-superset -sqlalchemy==1.4.36 - # via - # alembic - # apache-superset - # flask-appbuilder - # flask-sqlalchemy - # marshmallow-sqlalchemy - # sqlalchemy-utils -sqlalchemy-utils==0.38.3 - # via - # apache-superset - # flask-appbuilder -sqlparse==0.4.4 - # via apache-superset -sshtunnel==0.4.0 - # via apache-superset -tabulate==0.8.9 - # via apache-superset -typing-extensions==4.4.0 - # via - # apache-superset - # flask-limiter - # limits - # rich -urllib3==1.26.6 - # via selenium -vine==5.0.0 - # via - # amqp - # celery - # 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 deprecated -wtforms==3.0.1 - # via - # apache-superset - # flask-appbuilder - # flask-wtf - # wtforms-json -wtforms-json==0.3.5 - # via apache-superset -xlsxwriter==3.0.7 - # via apache-superset -zipp==3.15.0 - # via - # importlib-metadata - # importlib-resources -# from https://raw.githubusercontent.com/apache/superset/2.1.3/requirements/docker.txt -gevent==21.8.0 - # via -r requirements/docker.in -# The greenlet==2.0.2 causes a dependency conflict -> https://github.com/apache/superset/issues/26396 -# Since gevent is the same version as in 2.1.1 we select the greenlet version from 2.1.1 -#greenlet==2.0.2 -greenlet==1.1.3.post0 - # via gevent -psycopg2-binary==2.9.5 - # via apache-superset -zope-event==4.5.0 - # via gevent -zope-interface==5.4.0 - # via gevent diff --git a/superset/constraints-3.1.0.txt b/superset/constraints-3.1.0.txt deleted file mode 100644 index 79e7243ac..000000000 --- a/superset/constraints-3.1.0.txt +++ /dev/null @@ -1,393 +0,0 @@ -# from https://github.com/apache/superset/blob/3.1.0/requirements/base.txt -alembic==1.6.5 - # via flask-migrate -amqp==5.1.0 - # via kombu -apispec==6.3.0 - # via flask-appbuilder -apsw==3.42.0.1 - # via shillelagh -async-timeout==4.0.2 - # via redis -attrs==23.1.0 - # via - # cattrs - # jsonschema - # requests-cache -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 -bottleneck==1.3.7 - # via pandas -brotli==1.0.9 - # via flask-compress -cachelib==0.9.0 - # via - # flask-caching - # flask-session -cattrs==23.2.1 - # via requests-cache -celery==5.2.2 - # via apache-superset -certifi==2023.7.22 - # via requests -cffi==1.15.1 - # via - # cryptography - # pynacl -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 -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.4.0 - # via holidays -cron-descriptor==1.2.24 - # via apache-superset -croniter==1.0.15 - # via apache-superset -cryptography==41.0.2 - # 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 -exceptiongroup==1.1.1 - # via cattrs -flask==2.2.5 - # via - # apache-superset - # flask-appbuilder - # flask-babel - # flask-caching - # flask-compress - # flask-jwt-extended - # flask-limiter - # flask-login - # flask-migrate - # flask-session - # flask-sqlalchemy - # flask-wtf -flask-appbuilder==4.3.10 - # via apache-superset -flask-babel==1.0.0 - # via flask-appbuilder -flask-caching==2.1.0 - # via apache-superset -flask-compress==1.13 - # 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-wtf==1.1.1 - # 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 -greenlet==2.0.2 - # via - # shillelagh - # sqlalchemy -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 -humanize==3.11.0 - # via apache-superset -idna==3.2 - # via - # email-validator - # requests -importlib-metadata==6.6.0 - # via - # apache-superset - # flask - # shillelagh -importlib-resources==5.12.0 - # via limits -isodate==0.6.0 - # via apache-superset -itsdangerous==2.1.2 - # via - # flask - # flask-wtf -jinja2==3.1.2 - # via - # flask - # flask-babel -jsonschema==4.17.3 - # via flask-appbuilder -kombu==5.2.4 - # via celery -korean-lunar-calendar==0.3.1 - # via holidays -limits==3.4.0 - # via flask-limiter -llvmlite==0.40.1 - # via numba -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 -mdurl==0.1.2 - # via markdown-it-py -msgpack==1.0.2 - # via apache-superset -nh3==0.2.11 - # via apache-superset -numba==0.57.1 - # via pandas -numexpr==2.8.4 - # via pandas -numpy==1.23.5 - # via - # apache-superset - # bottleneck - # numba - # numexpr - # pandas - # pyarrow -ordered-set==4.1.0 - # via flask-limiter -packaging==23.1 - # via - # apache-superset - # apispec - # deprecation - # gunicorn - # limits - # marshmallow - # shillelagh -pandas==2.0.3 - # via apache-superset -paramiko==2.11.0 - # via sshtunnel -parsedatetime==2.6 - # via apache-superset -pgsanity==0.2.9 - # via apache-superset -platformdirs==3.8.1 - # via requests-cache -polyline==2.0.0 - # via apache-superset -prison==0.2.1 - # via flask-appbuilder -prompt-toolkit==3.0.38 - # via click-repl -pyarrow==14.0.1 - # via apache-superset -pycparser==2.20 - # via cffi -pygments==2.15.0 - # via rich -pyjwt==2.4.0 - # via - # apache-superset - # flask-appbuilder - # flask-jwt-extended -pymeeus==0.5.12 - # via convertdate -pynacl==1.5.0 - # via paramiko -pyparsing==3.0.6 - # via apache-superset -pyrsistent==0.19.3 - # via jsonschema -python-dateutil==2.8.2 - # via - # alembic - # apache-superset - # croniter - # flask-appbuilder - # holidays - # pandas - # shillelagh -python-dotenv==0.19.0 - # via apache-superset -python-editor==1.0.4 - # via alembic -python-geohash==0.8.5 - # via apache-superset -pytz==2021.3 - # via - # babel - # celery - # flask-babel - # pandas -pyyaml==6.0.1 - # via - # apache-superset - # apispec -redis==4.5.4 - # via apache-superset -requests==2.31.0 - # via - # requests-cache - # shillelagh -requests-cache==1.1.1 - # via shillelagh -rich==13.3.4 - # via flask-limiter -selenium==3.141.0 - # via apache-superset -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 - # click-repl - # isodate - # paramiko - # prison - # python-dateutil - # 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-utils -sqlalchemy-utils==0.38.3 - # via - # apache-superset - # flask-appbuilder -sqlparse==0.4.4 - # via apache-superset -sshtunnel==0.4.0 - # via apache-superset -tabulate==0.8.9 - # via apache-superset -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 - # amqp - # celery - # kombu -wcwidth==0.2.5 - # via prompt-toolkit -werkzeug==2.3.3 - # via - # apache-superset - # flask - # flask-appbuilder - # flask-jwt-extended - # flask-login -wrapt==1.15.0 - # via deprecated -wtforms==2.3.3 - # via - # apache-superset - # flask-appbuilder - # flask-wtf - # wtforms-json -wtforms-json==0.3.5 - # via apache-superset -xlsxwriter==3.0.7 - # via apache-superset -zipp==3.15.0 - # via - # importlib-metadata - # importlib-resources -# from https://github.com/apache/superset/blob/3.1.0/requirements/docker.txt -gevent==22.10.2 - # via -r requirements/docker.in -psycopg2-binary==2.9.6 - # via apache-superset -zope-event==4.5.0 - # via gevent -zope-interface==5.4.0 - # via gevent diff --git a/superset/constraints-3.1.3.txt b/superset/constraints-3.1.3.txt deleted file mode 100644 index a82507e18..000000000 --- a/superset/constraints-3.1.3.txt +++ /dev/null @@ -1,393 +0,0 @@ -# from https://github.com/apache/superset/blob/3.1.3/requirements/base.txt -alembic==1.6.5 - # via flask-migrate -amqp==5.1.0 - # via kombu -apispec==6.3.0 - # via flask-appbuilder -apsw==3.42.0.1 - # via shillelagh -async-timeout==4.0.2 - # via redis -attrs==23.1.0 - # via - # cattrs - # jsonschema - # requests-cache -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 -bottleneck==1.3.7 - # via pandas -brotli==1.0.9 - # via flask-compress -cachelib==0.9.0 - # via - # flask-caching - # flask-session -cattrs==23.2.1 - # via requests-cache -celery==5.2.2 - # via apache-superset -certifi==2023.7.22 - # via requests -cffi==1.15.1 - # via - # cryptography - # pynacl -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 -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 -cron-descriptor==1.2.24 - # via apache-superset -croniter==1.0.15 - # via apache-superset -cryptography==42.0.4 - # 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 -exceptiongroup==1.2.0 - # via cattrs -flask==2.2.5 - # via - # apache-superset - # flask-appbuilder - # flask-babel - # flask-caching - # flask-compress - # flask-jwt-extended - # flask-limiter - # flask-login - # flask-migrate - # flask-session - # flask-sqlalchemy - # flask-wtf -flask-appbuilder==4.4.1 - # via apache-superset -flask-babel==1.0.0 - # via flask-appbuilder -flask-caching==2.1.0 - # via apache-superset -flask-compress==1.13 - # 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-wtf==1.1.1 - # 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 -greenlet==2.0.2 - # via - # shillelagh - # sqlalchemy -gunicorn==21.2.0 - # via apache-superset -hashids==1.3.1 - # via apache-superset -holidays==0.25 - # via apache-superset -humanize==3.11.0 - # via apache-superset -idna==3.2 - # via - # email-validator - # requests -importlib-metadata==6.6.0 - # via - # apache-superset - # flask - # shillelagh -importlib-resources==5.12.0 - # via limits -isodate==0.6.0 - # via apache-superset -itsdangerous==2.1.2 - # via - # flask - # flask-wtf -jinja2==3.1.2 - # via - # flask - # flask-babel -jsonschema==4.17.3 - # via flask-appbuilder -kombu==5.2.4 - # via celery -korean-lunar-calendar==0.3.1 - # via holidays -limits==3.4.0 - # via flask-limiter -llvmlite==0.40.1 - # via numba -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 -mdurl==0.1.2 - # via markdown-it-py -msgpack==1.0.2 - # via apache-superset -nh3==0.2.11 - # via apache-superset -numba==0.57.1 - # via pandas -numexpr==2.9.0 - # via - # -r requirements/base.in - # pandas -numpy==1.23.5 - # via - # apache-superset - # bottleneck - # numba - # numexpr - # pandas - # pyarrow -ordered-set==4.1.0 - # via flask-limiter -packaging==23.1 - # via - # apache-superset - # apispec - # deprecation - # gunicorn - # limits - # marshmallow - # shillelagh -pandas==2.0.3 - # via apache-superset -paramiko==3.4.0 - # via - # apache-superset - # sshtunnel -parsedatetime==2.6 - # via apache-superset -pgsanity==0.2.9 - # via apache-superset -platformdirs==3.8.1 - # via requests-cache -polyline==2.0.0 - # via apache-superset -prison==0.2.1 - # via flask-appbuilder -prompt-toolkit==3.0.38 - # via click-repl -pyarrow==14.0.1 - # via apache-superset -pycparser==2.20 - # via cffi -pygments==2.15.0 - # via rich -pyjwt==2.4.0 - # via - # apache-superset - # flask-appbuilder - # flask-jwt-extended -pynacl==1.5.0 - # via paramiko -pyparsing==3.0.6 - # via apache-superset -pyrsistent==0.19.3 - # via jsonschema -python-dateutil==2.8.2 - # via - # alembic - # apache-superset - # croniter - # flask-appbuilder - # holidays - # pandas - # shillelagh -python-dotenv==0.19.0 - # via apache-superset -python-editor==1.0.4 - # via alembic -python-geohash==0.8.5 - # via apache-superset -pytz==2021.3 - # via - # babel - # celery - # flask-babel - # pandas -pyyaml==6.0.1 - # via - # apache-superset - # apispec -redis==4.5.4 - # via apache-superset -requests==2.31.0 - # via - # requests-cache - # shillelagh -requests-cache==1.1.1 - # via shillelagh -rich==13.3.4 - # via flask-limiter -selenium==3.141.0 - # via apache-superset -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 - # click-repl - # isodate - # prison - # python-dateutil - # 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-utils -sqlalchemy-utils==0.38.3 - # via - # apache-superset - # flask-appbuilder -sqlglot==23.0.2 - # via apache-superset -sqlparse==0.4.4 - # via apache-superset -sshtunnel==0.4.0 - # via apache-superset -tabulate==0.8.9 - # via apache-superset -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.18 - # via - # -r requirements/base.in - # requests - # requests-cache - # selenium -vine==5.0.0 - # via - # amqp - # celery - # kombu -wcwidth==0.2.5 - # via prompt-toolkit -werkzeug==2.3.3 - # via - # apache-superset - # flask - # flask-appbuilder - # flask-jwt-extended - # flask-login -wrapt==1.15.0 - # via deprecated -wtforms==2.3.3 - # via - # apache-superset - # flask-appbuilder - # flask-wtf - # wtforms-json -wtforms-json==0.3.5 - # via apache-superset -xlsxwriter==3.0.7 - # via apache-superset -zipp==3.15.0 - # via - # importlib-metadata - # importlib-resources -# from https://github.com/apache/superset/blob/3.1.3/requirements/docker.txt -gevent==23.9.1 - # via apache-superset -psycopg2-binary==2.9.6 - # via apache-superset -zope-event==4.5.0 - # via gevent -zope-interface==5.4.0 - # via gevent diff --git a/superset/stackable/patches/2.1.3/.gitkeep b/superset/stackable/patches/2.1.3/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/superset/stackable/patches/3.1.0/001-26885-query-export-fix.patch b/superset/stackable/patches/3.1.0/001-26885-query-export-fix.patch deleted file mode 100644 index 2a251cf89..000000000 --- a/superset/stackable/patches/3.1.0/001-26885-query-export-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3036e00810d29ece971b3fac36d2da4965cb421d Mon Sep 17 00:00:00 2001 -From: Sebastian Bernauer -Date: Thu, 1 Feb 2024 16:12:29 +0100 -Subject: [PATCH] fix: Allow exporting saved queries without schema information - (#26889) - ---- - superset/commands/query/export.py | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/superset/commands/query/export.py b/superset/commands/query/export.py -index a8fa8acbf0..43a110c3b9 100644 ---- a/superset/commands/query/export.py -+++ b/superset/commands/query/export.py -@@ -40,11 +40,16 @@ class ExportSavedQueriesCommand(ExportModelsCommand): - def _export( - model: SavedQuery, export_related: bool = True - ) -> Iterator[tuple[str, str]]: -- # build filename based on database, optional schema, and label -+ # build filename based on database, optional schema, and label. -+ # we call secure_filename() multiple times and join the directories afterwards, -+ # as secure_filename() replaces "/" with "_". - database_slug = secure_filename(model.database.database_name) -- schema_slug = secure_filename(model.schema) - query_slug = secure_filename(model.label) or str(model.uuid) -- file_name = f"queries/{database_slug}/{schema_slug}/{query_slug}.yaml" -+ if model.schema is None: -+ file_name = f"queries/{database_slug}/{query_slug}.yaml" -+ else: -+ schema_slug = secure_filename(model.schema) -+ file_name = f"queries/{database_slug}/{schema_slug}/{query_slug}.yaml" - - payload = model.export_to_dict( - recursive=False, --- -2.43.0 - diff --git a/superset/stackable/patches/3.1.3/.gitkeep b/superset/stackable/patches/3.1.3/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/superset/versions.py b/superset/versions.py index 4b0cd4ec2..7bd79825e 100644 --- a/superset/versions.py +++ b/superset/versions.py @@ -1,30 +1,9 @@ versions = [ - { - "product": "2.1.3", - "python": "3.9", - "vector": "0.40.1", - "statsd_exporter": "0.26.1", - "authlib": "0.15.4", # https://github.com/dpgaspar/Flask-AppBuilder/blob/v4.3.0/requirements-extra.txt#L10 - }, - { - "product": "3.1.0", - "python": "3.9", - "vector": "0.40.1", - "statsd_exporter": "0.26.1", - "authlib": "1.2.1", # https://github.com/dpgaspar/Flask-AppBuilder/blob/v4.3.10/requirements-extra.txt#L7 - }, - { - "product": "3.1.3", - "python": "3.9", - "vector": "0.40.1", - "statsd_exporter": "0.26.1", - "authlib": "1.2.1", # https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.4.1/requirements/extra.txt#L7 - }, { "product": "4.0.2", "python": "3.9", "vector": "0.40.1", - "statsd_exporter": "0.26.1", + "statsd_exporter": "0.27.0", "authlib": "1.2.1", # https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.4.1/requirements/extra.txt#L7 }, ] From fe8207c7e88671818a61ec32f830dc93e66b4c39 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Mon, 16 Sep 2024 11:12:15 +0200 Subject: [PATCH 2/5] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1006394ff..1342ec356 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ All notable changes to this project will be documented in this file. - hbase: Remove 2.4.17 ([#846]). - omid: Remove 1.1.0 and 1.1.1 ([#846]). - spark: Remove 3.4.2 and 3.4.3 ([#848]). +- superset: Remove 2.1.3, 3.1.0 and 3.1.3 ([#866]). - zookeeper: Remove 3.8.4 ([#851]). ### Fixed @@ -54,6 +55,7 @@ All notable changes to this project will be documented in this file. [#848]: https://github.com/stackabletech/docker-images/pull/848 [#851]: https://github.com/stackabletech/docker-images/pull/851 [#852]: https://github.com/stackabletech/docker-images/pull/852 +[#866]: https://github.com/stackabletech/docker-images/pull/866 ## [24.7.0] - 2024-07-24 From a5ad5abf69382dc2746e3810fa4f05f929e251ee Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Mon, 16 Sep 2024 11:49:49 +0200 Subject: [PATCH 3/5] update statsd exporter --- statsd_exporter/versions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/statsd_exporter/versions.py b/statsd_exporter/versions.py index de8253b98..48e85f3bb 100644 --- a/statsd_exporter/versions.py +++ b/statsd_exporter/versions.py @@ -1,6 +1,6 @@ versions = [ { - "product": "0.26.1", + "product": "0.27.0", "stackable-base": "1.0.0", } ] From e19ece78d59e6f492ca09abfab662a6aa4d112fa Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:02:49 +0200 Subject: [PATCH 4/5] Update changelog and statsd dependency for Airflow --- CHANGELOG.md | 2 ++ airflow/versions.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1342ec356..851f2836d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file. - trino: Add version `455` ([#822]). - trino-cli: Add version `455` ([#822]). - spark: Add version `3.5.2` ([#848]). +- statsd-exporter: Add version 0.27.0 ([#866]). - hadoop: Add patch "HADOOP-18516: Support Fixed SAS Token for ABFS Authentication" ([#852]). ### Changed @@ -34,6 +35,7 @@ All notable changes to this project will be documented in this file. - hbase: Remove 2.4.17 ([#846]). - omid: Remove 1.1.0 and 1.1.1 ([#846]). - spark: Remove 3.4.2 and 3.4.3 ([#848]). +- statsd-exporter: Remove 0.26.1 ([#866]). - superset: Remove 2.1.3, 3.1.0 and 3.1.3 ([#866]). - zookeeper: Remove 3.8.4 ([#851]). diff --git a/airflow/versions.py b/airflow/versions.py index 2d8a08096..548cdded4 100644 --- a/airflow/versions.py +++ b/airflow/versions.py @@ -3,7 +3,7 @@ "product": "2.9.2", "python": "3.9", "git_sync": "v4.2.4", - "statsd_exporter": "0.26.1", + "statsd_exporter": "0.27.0", "tini": "0.19.0", "vector": "0.40.1", }, @@ -11,7 +11,7 @@ "product": "2.9.3", "python": "3.9", "git_sync": "v4.2.4", - "statsd_exporter": "0.26.1", + "statsd_exporter": "0.27.0", "tini": "0.19.0", "vector": "0.40.1", }, From 990e83b1de993604783bdd368b915a384e65d288 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Tue, 17 Sep 2024 14:43:10 +0200 Subject: [PATCH 5/5] fix: markdown lint --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3131a147..c1354ba36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,7 +62,6 @@ All notable changes to this project will be documented in this file. [#853]: https://github.com/stackabletech/docker-images/pull/853 [#866]: https://github.com/stackabletech/docker-images/pull/866 - ## [24.7.0] - 2024-07-24 ### Added