chore(superset): add 6.1.0 as supported version (#1514)

* chore(superset): add 6.1.0 as supported version

* chore: lints

* chore: cleanups

* Update superset/boil-config.toml

Co-authored-by: Nick <10092581+NickLarsenNZ@users.noreply.github.com>

* chore: bump uv version

* feat: add script to gather superset versions

* chore: bump Python to 3.12 (3.11 for 4.1.4)

* Rename upstream-versions.sh to gather-upstream-versions.sh

---------

Co-authored-by: Nick <10092581+NickLarsenNZ@users.noreply.github.com>
Co-authored-by: Sebastian Bernauer <sebastian.bernauer@stackable.tech>

Author: 3 people

CHANGELOG.md

@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file.
 - opa: Add `1.16.2` ([#1509]).
 - kafka: Add `3.9.2` and `4.2.1` ([#1483]).
 - trino: Add `481` ([#1518]).
+- superset: Add `6.1.0` ([#1514])
 
 ### Changed
 
@@ -50,6 +51,7 @@ All notable changes to this project will be documented in this file.
 [#1509]: https://github.com/stackabletech/docker-images/pull/1509
 [#1510]: https://github.com/stackabletech/docker-images/pull/1510
 [#1512]: https://github.com/stackabletech/docker-images/pull/1512
+[#1514]: https://github.com/stackabletech/docker-images/pull/1514
 [#1518]: https://github.com/stackabletech/docker-images/pull/1518
 [#1520]: https://github.com/stackabletech/docker-images/pull/1520
 

superset/boil-config.toml

@@ -8,12 +8,17 @@ vector = "0.55.0"
 
 [versions."4.1.4".build-arguments]
 cyclonedx-bom-version = "6.0.0"
-# Find the flask-appbuilder version in the applicable constraints.txt file, then find the authlib version.
-# https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.5.0/requirements/extra.txt#L7
+# flask-appbuilder==4.5.0 is pinned in https://github.com/apache/superset/blob/4.1.4/requirements/base.txt (search for `flask-appbuilder==`),
+# which in turn pins authlib in https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.5.0/requirements/extra.txt (search for `authlib==`)
 authlib-version = "1.2.1"
-python-version = "3.9"
-uv-version = "0.7.3"
-nodejs-version = "20.20.2"
+# The default upstream image is built on Python 3.11 (`ARG PY_VER` in https://github.com/apache/superset/blob/4.1.4/Dockerfile)
+# and upstream CI tests 3.10 and 3.11 (https://github.com/apache/superset/blob/4.1.4/.github/actions/setup-backend/action.yml)
+python-version = "3.11"
+# Independent of Superset, use the latest release: https://github.com/astral-sh/uv/releases
+uv-version = "0.11.18"
+# https://github.com/apache/superset/blob/4.1.4/superset-frontend/.nvmrc
+nodejs-version = "18.20.1"
+# Independent of Superset, use the latest release: https://github.com/nvm-sh/nvm/releases
 nvm-version = "v0.40.4"
 
 [versions."6.0.0".local-images]
@@ -23,10 +28,34 @@ vector = "0.55.0"
 
 [versions."6.0.0".build-arguments]
 cyclonedx-bom-version = "6.0.0"
-# Find the flask-appbuilder version in the applicable constraints.txt file, then find the authlib version.
-# https://github.com/dpgaspar/Flask-AppBuilder/blob/release/5.0.0/requirements/extra.txt#L7
+# flask-appbuilder==5.0.0 is pinned in https://github.com/apache/superset/blob/6.0.0/requirements/base.txt (search for `flask-appbuilder==`),
+# which in turn pins authlib in https://github.com/dpgaspar/Flask-AppBuilder/blob/release/5.0.0/requirements/extra.txt (search for `authlib==`)
 authlib-version = "1.2.1"
-python-version = "3.11"
-uv-version = "0.7.3"
-nodejs-version = "20.20.2"
+# Upstream CI tests 3.10, 3.11 and 3.12, choosing the newest Python version
+python-version = "3.12"
+# Independent of Superset, use the latest release: https://github.com/astral-sh/uv/releases
+uv-version = "0.11.18"
+# https://github.com/apache/superset/blob/6.0.0/superset-frontend/.nvmrc
+nodejs-version = "20.18.3"
+# Independent of Superset, use the latest release: https://github.com/nvm-sh/nvm/releases
+nvm-version = "v0.40.4"
+
+[versions."6.1.0".local-images]
+"shared/statsd-exporter" = "0.28.0"
+stackable-devel = "1.0.0"
+vector = "0.55.0"
+
+[versions."6.1.0".build-arguments]
+cyclonedx-bom-version = "6.0.0"
+# flask-appbuilder==5.0.2 is pinned in https://github.com/apache/superset/blob/6.1.0/requirements/base.txt (search for `flask-appbuilder==`),
+# which in turn pins authlib in https://github.com/dpgaspar/Flask-AppBuilder/blob/release/5.0.2/requirements/extra.txt (search for `authlib==`)
+authlib-version = "1.2.1"
+# Upstream CI tests 3.10, 3.11 and 3.12 (https://github.com/apache/superset/blob/6.1.0/.github/actions/setup-backend/action.yml)
+# and a py312 image variant is published. We use 3.12
+python-version = "3.12"
+# Independent of Superset, use the latest release: https://github.com/astral-sh/uv/releases
+uv-version = "0.11.18"
+# https://github.com/apache/superset/blob/6.1.0/superset-frontend/.nvmrc
+nodejs-version = "22.22.0"
+# Independent of Superset, use the latest release: https://github.com/nvm-sh/nvm/releases
 nvm-version = "v0.40.4"

superset/gather-upstream-versions.sh

@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+# Determine the upstream-tested tool/dependency versions for a given Apache Superset
+# version, to fill in the `[versions."X.Y.Z".build-arguments]` section of
+# superset/boil-config.toml.
+#
+# Usage: ./upstream-versions.sh <superset-version>
+# Example: ./upstream-versions.sh 6.1.0
+#
+# Sources used:
+#   nodejs-version  -> superset-frontend/.nvmrc at the Superset tag
+#   flask-appbuilder -> requirements/base.txt at the Superset tag (informational; must
+#                       match the pin in superset/stackable/constraints/<version>/)
+#   authlib-version -> requirements/extra.txt at the matching Flask-AppBuilder release
+#   python-version  -> `ARG PY_VER` in the upstream Dockerfile (their default image),
+#                      plus the CI-tested versions from .github/actions/setup-backend.
+#                      Picking among the CI-tested versions is a human decision.
+#   uv/nvm-version  -> independent of Superset, latest GitHub release
+
+set -euo pipefail
+
+VERSION=${1:?Usage: $0 <superset-version> (e.g. 6.1.0)}
+RAW="https://raw.githubusercontent.com"
+
+fetch() {
+    curl --fail --silent --show-error --location "$1"
+}
+
+latest_release() {
+    fetch "https://api.github.com/repos/$1/releases/latest" \
+        | sed -nE 's/.*"tag_name": *"([^"]+)".*/\1/p' | head -1
+}
+
+# Node.js: pinned by upstream in superset-frontend/.nvmrc (strip the leading `v`)
+nodejs=$(fetch "$RAW/apache/superset/$VERSION/superset-frontend/.nvmrc" | tr -d 'v[:space:]')
+
+# Flask-AppBuilder: pinned in requirements/base.txt
+fab=$(fetch "$RAW/apache/superset/$VERSION/requirements/base.txt" \
+    | sed -nE 's/^flask-appbuilder==([0-9.]+).*/\1/p' | head -1)
+
+# Authlib: pinned by Flask-AppBuilder in requirements/extra.txt
+authlib=$(fetch "$RAW/dpgaspar/Flask-AppBuilder/release/$fab/requirements/extra.txt" \
+    | sed -nE 's/^authlib==([0-9.]+).*/\1/p' | head -1)
+
+# Python: the upstream image default (ARG PY_VER in the Dockerfile) ...
+py_default=$(fetch "$RAW/apache/superset/$VERSION/Dockerfile" \
+    | sed -nE 's/^ARG PY_VER=([0-9]+\.[0-9]+).*/\1/p' | head -1)
+# ... and all CI-tested versions (the previous/current/next aliases)
+py_tested=$(fetch "$RAW/apache/superset/$VERSION/.github/actions/setup-backend/action.yml" \
+    | sed -nE 's/.*PYTHON_VERSION=([0-9]+\.[0-9]+).*/\1/p' | sort -uV | xargs | sed 's/ /, /g')
+
+# uv and nvm are independent of Superset, use the latest release
+uv=$(latest_release astral-sh/uv)
+nvm=$(latest_release nvm-sh/nvm)
+
+cat <<EOF
+Superset $VERSION
+flask-appbuilder: $fab (informational, must match stackable/constraints/$VERSION/constraints.txt)
+authlib-version:  $authlib
+python-version:   $py_default (upstream image default; CI-tested: $py_tested)
+nodejs-version:   $nodejs
+uv-version:       $uv (latest release)
+nvm-version:      $nvm (latest release)
+EOF
+
+# Sanity check: the vendored constraints must pin the same Flask-AppBuilder version,
+# otherwise the authlib version derived above is based on the wrong FAB release.
+constraints="$(dirname "$0")/stackable/constraints/$VERSION/constraints.txt"
+if [ -f "$constraints" ]; then
+    local_fab=$(sed -nE 's/^flask-appbuilder==([0-9.]+).*/\1/p' "$constraints" | head -1)
+    if [ "$local_fab" != "$fab" ]; then
+        echo >&2
+        echo "WARNING: $constraints pins flask-appbuilder==$local_fab but upstream pins $fab" >&2
+        exit 1
+    fi
+else
+    echo >&2
+    echo "NOTE: no constraints file at $constraints yet - create it before building" >&2
+fi

superset/stackable/constraints/6.1.0/build-constraints.txt

@@ -0,0 +1,3 @@
+# It is not yet known how and when to change this
+# I will try without it overridden for now
+# Cython==3.0.12