From 490739ebc7e5f9a4c64f7b1980888e817650af03 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Thu, 13 Apr 2023 15:12:54 +0200 Subject: [PATCH 1/5] [WIP] superset: Support 2.0.0 and 2.1.0 --- image_tools/conf.py | 10 + superset/README.md | 2 + superset/constraints-2.0.0.txt | 294 +++++++++++++++++++++++ superset/constraints-2.1.0.txt | 292 ++++++++++++++++++++++ superset/patches-2.0.0/no-patches-needed | 0 superset/patches-2.1.0/no-patches-needed | 0 6 files changed, 598 insertions(+) create mode 100644 superset/README.md create mode 100644 superset/constraints-2.0.0.txt create mode 100644 superset/constraints-2.1.0.txt create mode 100644 superset/patches-2.0.0/no-patches-needed create mode 100644 superset/patches-2.1.0/no-patches-needed diff --git a/image_tools/conf.py b/image_tools/conf.py index 432da8d7b..63237cfab 100644 --- a/image_tools/conf.py +++ b/image_tools/conf.py @@ -300,6 +300,16 @@ 'python': '3.8', 'vector': '0.26.0', }, + { + 'product': '2.0.0', + 'python': '3.9', + 'vector': '0.26.0', + }, + { + 'product': '2.1.0', + 'python': '3.9', + 'vector': '0.26.0', + }, ], }, { diff --git a/superset/README.md b/superset/README.md new file mode 100644 index 000000000..2e0f72a86 --- /dev/null +++ b/superset/README.md @@ -0,0 +1,2 @@ +`constraints-.txt` files came from e.g. https://github.com/apache/superset/blob/2.0.0/requirements/base.txt#L18. +In some cases `apispec[yaml]==3.3.2` needed to be adjusted to `apispec==3.3.2` diff --git a/superset/constraints-2.0.0.txt b/superset/constraints-2.0.0.txt new file mode 100644 index 000000000..390b6f532 --- /dev/null +++ b/superset/constraints-2.0.0.txt @@ -0,0 +1,294 @@ +aiohttp==3.8.1 + # via slackclient +aiosignal==1.2.0 + # via aiohttp +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 +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==5.2.2 + # via apache-superset +cffi==1.14.6 + # via cryptography +charset-normalizer==2.0.4 + # via aiohttp +click==8.0.4 + # 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.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 +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 + # 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.1.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==4.3.1 + # via flask-appbuilder +flask-login==0.4.1 + # via 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 + # via apache-superset +flask-wtf==0.14.3 + # via + # apache-superset + # flask-appbuilder +frozenlist==1.3.0 + # via + # aiohttp + # aiosignal +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==2.1.1 + # via + # flask + # flask-wtf +jinja2==3.0.3 + # 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 +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.22.1 + # via + # apache-superset + # 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 +prompt-toolkit==3.0.28 + # via click-repl +pyarrow==5.0.0 + # via apache-superset +pycparser==2.20 + # via cffi +pyjwt==2.4.0 + # 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 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 + # 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.3 + # via apache-superset +six==1.16.0 + # via + # bleach + # click-repl + # flask-talisman + # holidays + # isodate + # jsonschema + # polyline + # prison + # pyrsistent + # python-dateutil + # 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 apache-superset +urllib3==1.26.6 + # via selenium +vine==5.0.0 + # via + # amqp + # celery + # kombu +wcwidth==0.2.5 + # via prompt-toolkit +webencodings==0.5.1 + # via bleach +werkzeug==2.0.3 + # via + # flask + # flask-jwt-extended +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 diff --git a/superset/constraints-2.1.0.txt b/superset/constraints-2.1.0.txt new file mode 100644 index 000000000..611b6f574 --- /dev/null +++ b/superset/constraints-2.1.0.txt @@ -0,0 +1,292 @@ +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 +bleach==3.3.1 + # via apache-superset +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.0.4 + # 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.1.3 + # 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 +isodate==0.6.0 + # via apache-superset +itsdangerous==2.1.1 + # via + # flask + # flask-wtf +jinja2==3.0.3 + # 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 +mako==1.1.4 + # via alembic +markdown==3.3.4 + # via apache-superset +markupsafe==2.1.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 +numpy==1.23.5 + # via + # apache-superset + # pandas + # pyarrow +packaging==21.3 + # via + # bleach + # 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 +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 +selenium==3.141.0 + # via apache-superset +simplejson==3.17.3 + # via apache-superset +six==1.16.0 + # via + # bleach + # 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.3 + # 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 +urllib3==1.26.6 + # via selenium +vine==5.0.0 + # via + # amqp + # celery + # kombu +wcwidth==0.2.5 + # via prompt-toolkit +webencodings==0.5.1 + # via bleach +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 +xlsxwriter==3.0.7 + # via apache-superset + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/superset/patches-2.0.0/no-patches-needed b/superset/patches-2.0.0/no-patches-needed new file mode 100644 index 000000000..e69de29bb diff --git a/superset/patches-2.1.0/no-patches-needed b/superset/patches-2.1.0/no-patches-needed new file mode 100644 index 000000000..e69de29bb From 58a1f4f4183cc9893e3c1e735290e55f770ba7dc Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Tue, 25 Apr 2023 14:07:05 +0200 Subject: [PATCH 2/5] add missing patch versions bumps --- image_tools/conf.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/image_tools/conf.py b/image_tools/conf.py index 37365060e..4a6214238 100644 --- a/image_tools/conf.py +++ b/image_tools/conf.py @@ -297,11 +297,21 @@ "python": "3.9", "vector": "0.26.0", }, + { + "product": "1.4.2", + "python": "3.9", + "vector": "0.26.0", + }, { "product": "1.5.1", "python": "3.8", "vector": "0.26.0", }, + { + "product": "1.5.3", + "python": "3.8", + "vector": "0.26.0", + }, { 'product': '2.0.0', 'python': '3.9', From 42b19ebb11117182079cd5ab6ae6fec37903c9aa Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Tue, 25 Apr 2023 14:55:45 +0200 Subject: [PATCH 3/5] added missing patches and patch versions --- image_tools/conf.py | 2 +- superset/constraints-1.4.2.txt | 303 ++++++++++++++++++ superset/constraints-1.5.3.txt | 294 +++++++++++++++++ ...raints-2.0.0.txt => constraints-2.0.1.txt} | 7 +- .../no-patches-needed | 0 superset/patches-1.5.3/no-patches-needed | 0 superset/patches-2.0.1/no-patches-needed | 0 7 files changed, 603 insertions(+), 3 deletions(-) create mode 100644 superset/constraints-1.4.2.txt create mode 100644 superset/constraints-1.5.3.txt rename superset/{constraints-2.0.0.txt => constraints-2.0.1.txt} (97%) rename superset/{patches-2.0.0 => patches-1.4.2}/no-patches-needed (100%) create mode 100644 superset/patches-1.5.3/no-patches-needed create mode 100644 superset/patches-2.0.1/no-patches-needed diff --git a/image_tools/conf.py b/image_tools/conf.py index 4a6214238..074666113 100644 --- a/image_tools/conf.py +++ b/image_tools/conf.py @@ -313,7 +313,7 @@ "vector": "0.26.0", }, { - 'product': '2.0.0', + 'product': '2.0.1', 'python': '3.9', 'vector': '0.26.0', }, diff --git a/superset/constraints-1.4.2.txt b/superset/constraints-1.4.2.txt new file mode 100644 index 000000000..fc1a487e2 --- /dev/null +++ b/superset/constraints-1.4.2.txt @@ -0,0 +1,303 @@ +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 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/superset/constraints-1.5.3.txt b/superset/constraints-1.5.3.txt new file mode 100644 index 000000000..be1d32c28 --- /dev/null +++ b/superset/constraints-1.5.3.txt @@ -0,0 +1,294 @@ +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 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/superset/constraints-2.0.0.txt b/superset/constraints-2.0.1.txt similarity index 97% rename from superset/constraints-2.0.0.txt rename to superset/constraints-2.0.1.txt index 390b6f532..b39913e6d 100644 --- a/superset/constraints-2.0.0.txt +++ b/superset/constraints-2.0.1.txt @@ -51,7 +51,7 @@ colorama==0.4.4 # via # apache-superset # flask-appbuilder -convertdate==2.3.2 +convertdate==2.4.0 # via holidays cron-descriptor==1.2.24 # via apache-superset @@ -117,7 +117,7 @@ gunicorn==20.1.0 # via apache-superset hashids==1.3.1 # via apache-superset -holidays==0.10.3 +holidays==0.14.2 # via apache-superset humanize==3.11.0 # via apache-superset @@ -292,3 +292,6 @@ wtforms-json==0.3.3 # via apache-superset yarl==1.6.3 # via aiohttp + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/superset/patches-2.0.0/no-patches-needed b/superset/patches-1.4.2/no-patches-needed similarity index 100% rename from superset/patches-2.0.0/no-patches-needed rename to superset/patches-1.4.2/no-patches-needed diff --git a/superset/patches-1.5.3/no-patches-needed b/superset/patches-1.5.3/no-patches-needed new file mode 100644 index 000000000..e69de29bb diff --git a/superset/patches-2.0.1/no-patches-needed b/superset/patches-2.0.1/no-patches-needed new file mode 100644 index 000000000..e69de29bb From deeb0c261a396e64a2d77cca3cd7b25954bd4e72 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Tue, 25 Apr 2023 17:03:44 +0200 Subject: [PATCH 4/5] fixed constraints and readme --- superset/README.md | 7 ++++++- superset/constraints-1.4.2.txt | 15 ++++++++++++--- superset/constraints-1.5.3.txt | 15 ++++++++++++--- superset/constraints-2.0.1.txt | 15 ++++++++++++--- superset/constraints-2.1.0.txt | 15 ++++++++++++--- 5 files changed, 54 insertions(+), 13 deletions(-) diff --git a/superset/README.md b/superset/README.md index 2e0f72a86..f94378106 100644 --- a/superset/README.md +++ b/superset/README.md @@ -1,2 +1,7 @@ -`constraints-.txt` files came from e.g. https://github.com/apache/superset/blob/2.0.0/requirements/base.txt#L18. +# SuperSet Docker Image + +## Constraints + +The `constraints-.txt` files come from e.g. https://github.com/apache/superset/blob/2.0.1/requirements/base.txt and are concatenated with the dependencies provided in https://github.com/apache/superset/blob/2.0.1/requirements/docker.txt. 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` diff --git a/superset/constraints-1.4.2.txt b/superset/constraints-1.4.2.txt index fc1a487e2..a364e434e 100644 --- a/superset/constraints-1.4.2.txt +++ b/superset/constraints-1.4.2.txt @@ -1,3 +1,4 @@ +# from https://raw.githubusercontent.com/apache/superset/1.4.2/requirements/base.txt aiohttp==3.7.4.post0 # via slackclient alembic==1.6.5 @@ -298,6 +299,14 @@ yarl==1.6.3 # via aiohttp zipp==3.4.1 # via -r requirements/base.in - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +# 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.3.txt b/superset/constraints-1.5.3.txt index be1d32c28..2895e4777 100644 --- a/superset/constraints-1.5.3.txt +++ b/superset/constraints-1.5.3.txt @@ -1,3 +1,4 @@ +# from https://raw.githubusercontent.com/apache/superset/1.5.3/requirements/base.txt aiohttp==3.7.4.post0 # via slackclient alembic==1.6.5 @@ -289,6 +290,14 @@ yarl==1.6.3 # via aiohttp zipp==3.4.1 # via -r requirements/base.in - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +# 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 + # 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.0.1.txt index b39913e6d..9ca738df1 100644 --- a/superset/constraints-2.0.1.txt +++ b/superset/constraints-2.0.1.txt @@ -1,3 +1,4 @@ +# from https://github.com/apache/superset/blob/2.0.1/requirements/base.txt aiohttp==3.8.1 # via slackclient aiosignal==1.2.0 @@ -292,6 +293,14 @@ wtforms-json==0.3.3 # via apache-superset yarl==1.6.3 # via aiohttp - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +# from https://github.com/apache/superset/blob/2.0.1/requirements/docker.txt +gevent==21.8.0 + # via -r requirements/docker.in +greenlet==1.1.1 + # via gevent +psycopg2-binary==2.9.1 + # via apache-superset +zope-event==4.5.0 + # via gevent +zope-interface==5.4.0 + # via gevent diff --git a/superset/constraints-2.1.0.txt b/superset/constraints-2.1.0.txt index 611b6f574..d90a871a0 100644 --- a/superset/constraints-2.1.0.txt +++ b/superset/constraints-2.1.0.txt @@ -1,3 +1,4 @@ +# from https://raw.githubusercontent.com/apache/superset/2.1.0/requirements/base.txt alembic==1.6.5 # via flask-migrate amqp==5.1.0 @@ -287,6 +288,14 @@ wtforms-json==0.3.3 # via apache-superset xlsxwriter==3.0.7 # via apache-superset - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +# from https://raw.githubusercontent.com/apache/superset/2.1.0/requirements/docker.txt +gevent==21.8.0 + # via -r requirements/docker.in +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 From db423ba3a4241c2b440bd6686e84136d079efbaa Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Tue, 25 Apr 2023 17:06:05 +0200 Subject: [PATCH 5/5] attempt to fix md linter --- superset/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superset/README.md b/superset/README.md index f94378106..dec15b1ea 100644 --- a/superset/README.md +++ b/superset/README.md @@ -2,6 +2,6 @@ ## Constraints -The `constraints-.txt` files come from e.g. https://github.com/apache/superset/blob/2.0.1/requirements/base.txt and are concatenated with the dependencies provided in https://github.com/apache/superset/blob/2.0.1/requirements/docker.txt. This differs from version to version (2.0.1 shown here). +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`