Skip to content

Commit ff695b7

Browse files
authored
fix(superset): Pin setup-tools to retain pkg-resources for 4.x (#1428)
* fix(superset): Pin setup-tools for pkg-resources * changelog * typo
1 parent 279e591 commit ff695b7

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ All notable changes to this project will be documented in this file.
6666
- testing-tools: Re-add `pytest` Python package as well as `diffutils` package ([#1388]).
6767
- testing-tools: Move Kerberos packages from testing-tools/hive to parent since they provide `kinit` which is needed in other tests too (ex. HBase). ([#1389]).
6868
- hbase: Removed test class from backport HBASE-29797 to HBase version `2.6.3` ([#1426]).
69+
- superset: Pin setup-tools to ensure pkg_resources are installed (needed for `4.1.4` builds) ([#1428]).
6970

7071
[#1336]: https://github.com/stackabletech/docker-images/pull/1336
7172
[#1337]: https://github.com/stackabletech/docker-images/pull/1337
@@ -102,6 +103,7 @@ All notable changes to this project will be documented in this file.
102103
[#1424]: https://github.com/stackabletech/docker-images/pull/1424
103104
[#1425]: https://github.com/stackabletech/docker-images/pull/1425
104105
[#1426]: https://github.com/stackabletech/docker-images/pull/1426
106+
[#1428]: https://github.com/stackabletech/docker-images/pull/1428
105107

106108
## [25.11.0] - 2025-11-07
107109

superset/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ uv pip install --no-cache-dir \
141141

142142
# We bumped this from 21.2.0 to 22.0.0 to fix CVE-2024-1135
143143
# Superset 4.1.0 will contain at least 22.0.0, the bump was done in https://github.com/apache/superset/commit/4f693c6db0dc5c7286a36b8d23e90541943ff13f
144-
# We only want to bump this for the 4.0.x line, as the others already have updated and we don't want to accidentially downgrade the version
144+
# We only want to bump this for the 4.0.x line, as the others already have updated and we do not want to accidentially downgrade the version
145145
if [[ "$PRODUCT_VERSION" =~ ^4\.0\..* ]]; then
146146
echo "Superset 4.0.x detected, installing gunicorn 22.0.0 to fix CVE-2024-1135"
147147
uv pip install gunicorn==22.0.0
@@ -157,6 +157,12 @@ fi
157157

158158
uv pip install --no-cache-dir /tmp/opa_authorizer-0.1.0-py3-none-any.whl
159159

160+
# Setuptools 82+ removed pkg_resources, which is still needed by Superset 4.x
161+
# dependencies. Re-pin after all other installs in case newer versions
162+
# have been pulled in by other dependencies.
163+
# See https://setuptools.pypa.io/en/stable/history.html#v82-0-0
164+
uv pip install --no-cache-dir setuptools==75.2.0
165+
160166
cyclonedx-py environment --schema-version 1.5 --outfile /stackable/app/superset-${PRODUCT_VERSION}.cdx.json
161167
uv pip uninstall cyclonedx-bom
162168

0 commit comments

Comments
 (0)