fixed conflict

Author: adwk67

CHANGELOG.md

@@ -4,11 +4,16 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Added
+
+- superset: Add 6.0.0-rc2 ([#1337]).
+
 ### Changed
 
 - airflow: Extend list of providers for 3.0.6 ([#1336])
 
 [#1336]: https://github.com/stackabletech/docker-images/pull/1336
+[#1337]: https://github.com/stackabletech/docker-images/pull/1337
 
 ## [25.11.0] - 2025-11-07
 

superset/Dockerfile

@@ -20,7 +20,7 @@ microdnf install \
 microdnf clean all
 rm -rf /var/cache/yum
 
-pip install \
+pip${PYTHON_VERSION} install \
     --no-cache-dir \
     --upgrade \
     poetry==2.1.1 \
@@ -71,6 +71,9 @@ RUN microdnf module enable -y nodejs:${NODEJS_VERSION} && \
         nodejs \
         # Needed to create the source code snapshot
         tar \
+        # Needed by `npm run build`:
+        which \
+        zstd \
     && microdnf clean all && \
     rm -rf /var/cache/yum
 
@@ -115,8 +118,7 @@ uv pip install --no-cache-dir build
 # This picks up the UI assets from the npm build
 cd ..
 python${PYTHON_VERSION} -m build --wheel
-
-uv pip install --no-cache-dir dist/apache_superset-${PRODUCT_VERSION}-py3-none-any.whl --constraint /tmp/constraints.txt --build-constraints /tmp/build-constraints.txt
+uv pip install --no-cache-dir dist/apache_superset-*-py3-none-any.whl --constraint /tmp/constraints.txt --build-constraints /tmp/build-constraints.txt
 
 # Install additional dependencies
 # Add optional dependencies for use in custom Superset configurations.
@@ -150,7 +152,7 @@ uv pip install --no-cache-dir \
     cyclonedx-bom==${CYCLONEDX_BOM_VERSION}
 
 if [ -n "$AUTHLIB_VERSION" ]; then
-    pip install Authlib==${AUTHLIB_VERSION}
+    uv pip install Authlib==${AUTHLIB_VERSION}
 fi
 
 uv pip install --no-cache-dir /tmp/opa_authorizer-0.1.0-py3-none-any.whl

superset/boil-config.toml

@@ -5,6 +5,7 @@ vector = "0.49.0"
 
 [versions."4.0.2".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.4.1/requirements/extra.txt#L7
 authlib-version = "1.2.1"
 python-version = "3.9"
@@ -18,6 +19,7 @@ vector = "0.49.0"
 
 [versions."4.1.2".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
 authlib-version = "1.2.1"
 python-version = "3.9"
@@ -31,8 +33,23 @@ vector = "0.49.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
 authlib-version = "1.2.1"
 python-version = "3.9"
 uv-version = "0.7.3"
 nodejs-version = "20"
+
+[versions."6.0.0-rc2".local-images]
+"shared/statsd-exporter" = "0.28.0"
+stackable-devel = "1.0.0"
+vector = "0.49.0"
+
+[versions."6.0.0-rc2".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
+authlib-version = "1.2.1"
+python-version = "3.11"
+uv-version = "0.7.3"
+nodejs-version = "20"

superset/stackable/constraints/6.0.0-rc2/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