From 351dcd28f31cd50381563155145c130eae6c015d Mon Sep 17 00:00:00 2001 From: dervoeti Date: Wed, 22 Oct 2025 18:20:37 +0200 Subject: [PATCH 1/2] fix: pin luxon to fix build --- .../0001-fix-pin-luxon-to-fix-build.patch | 23 ++++++++ .../stackable/patches/4.1.2/0001-fix.patch | 55 ------------------- .../0001-fix-pin-luxon-to-fix-build.patch | 23 ++++++++ 3 files changed, 46 insertions(+), 55 deletions(-) create mode 100644 superset/stackable/patches/4.1.2/0001-fix-pin-luxon-to-fix-build.patch delete mode 100644 superset/stackable/patches/4.1.2/0001-fix.patch create mode 100644 superset/stackable/patches/4.1.4/0001-fix-pin-luxon-to-fix-build.patch diff --git a/superset/stackable/patches/4.1.2/0001-fix-pin-luxon-to-fix-build.patch b/superset/stackable/patches/4.1.2/0001-fix-pin-luxon-to-fix-build.patch new file mode 100644 index 000000000..59b650f68 --- /dev/null +++ b/superset/stackable/patches/4.1.2/0001-fix-pin-luxon-to-fix-build.patch @@ -0,0 +1,23 @@ +From 1b11f3ff47f46105289f7f9dcaa4fc10d6ea3571 Mon Sep 17 00:00:00 2001 +From: dervoeti +Date: Wed, 22 Oct 2025 17:04:19 +0200 +Subject: fix: pin luxon to fix build + +For some reason npm tries to use a newer version of luxon than the version in the lock file. I suspect this might be related to how npm before version 11 handles workspace dependencies in lock files. The luxon version is set to 3.6.1 now to prevent npm from trying to select a newer version, so that the same packages as in the original Superset build are used. +--- + superset-frontend/package.json | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/superset-frontend/package.json b/superset-frontend/package.json +index ebca197a25..3490ecaa93 100644 +--- a/superset-frontend/package.json ++++ b/superset-frontend/package.json +@@ -148,7 +148,7 @@ + "json-bigint": "^1.0.0", + "json-stringify-pretty-compact": "^2.0.0", + "lodash": "^4.17.21", +- "luxon": "^3.5.0", ++ "luxon": "3.6.1", + "mapbox-gl": "^2.10.0", + "markdown-to-jsx": "^7.4.7", + "match-sorter": "^6.3.4", diff --git a/superset/stackable/patches/4.1.2/0001-fix.patch b/superset/stackable/patches/4.1.2/0001-fix.patch deleted file mode 100644 index 58a725c2f..000000000 --- a/superset/stackable/patches/4.1.2/0001-fix.patch +++ /dev/null @@ -1,55 +0,0 @@ -From a80b4577d184f92680676cd021199838a6a84fc2 Mon Sep 17 00:00:00 2001 -From: dervoeti -Date: Tue, 14 Oct 2025 18:49:00 +0200 -Subject: fix - ---- - superset-frontend/package-lock.json | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) - -diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json -index 3130369143..879991195a 100644 ---- a/superset-frontend/package-lock.json -+++ b/superset-frontend/package-lock.json -@@ -1,12 +1,12 @@ - { - "name": "superset", -- "version": "4.1.1", -+ "version": "4.1.2", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "superset", -- "version": "4.1.1", -+ "version": "4.1.2", - "license": "Apache-2.0", - "workspaces": [ - "packages/*", -@@ -41663,9 +41663,10 @@ - } - }, - "node_modules/luxon": { -- "version": "3.5.0", -- "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz", -- "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==", -+ "version": "3.6.1", -+ "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz", -+ "integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==", -+ "license": "MIT", - "engines": { - "node": ">=12" - } -@@ -99672,9 +99673,9 @@ - } - }, - "luxon": { -- "version": "3.5.0", -- "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz", -- "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==" -+ "version": "3.6.1", -+ "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz", -+ "integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==" - }, - "lz-string": { - "version": "1.5.0", diff --git a/superset/stackable/patches/4.1.4/0001-fix-pin-luxon-to-fix-build.patch b/superset/stackable/patches/4.1.4/0001-fix-pin-luxon-to-fix-build.patch new file mode 100644 index 000000000..e1393f349 --- /dev/null +++ b/superset/stackable/patches/4.1.4/0001-fix-pin-luxon-to-fix-build.patch @@ -0,0 +1,23 @@ +From 23a71074574336d3cbdf0b27e3650bf21b39b337 Mon Sep 17 00:00:00 2001 +From: dervoeti +Date: Wed, 22 Oct 2025 16:42:08 +0200 +Subject: fix: pin luxon to fix build + +For some reason npm tries to use a newer version of luxon than the version in the lock file. I suspect this might be related to how npm before version 11 handles workspace dependencies in lock files. The luxon version is set to 3.6.1 now to prevent npm from trying to select a newer version, so that the same packages as in the original Superset build are used. +--- + superset-frontend/package.json | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/superset-frontend/package.json b/superset-frontend/package.json +index 066ce89764..cd6ca2a53f 100644 +--- a/superset-frontend/package.json ++++ b/superset-frontend/package.json +@@ -148,7 +148,7 @@ + "json-bigint": "^1.0.0", + "json-stringify-pretty-compact": "^2.0.0", + "lodash": "^4.17.21", +- "luxon": "^3.5.0", ++ "luxon": "3.6.1", + "mapbox-gl": "^2.10.0", + "markdown-to-jsx": "^7.4.7", + "match-sorter": "^6.3.4", From f9be163024bf2023b140002d0dd9f2be2580fa3d Mon Sep 17 00:00:00 2001 From: dervoeti Date: Wed, 22 Oct 2025 18:33:40 +0200 Subject: [PATCH 2/2] chore: changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f900dd94..dfd854865 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ All notable changes to this project will be documented in this file. - hbase: move hbck2.env to hbase-operator-tools image and add log4j2 properties for this tool ([#1300]). - hbase: replace `sed` calls with `config-utils template` where possible ([#1301]). - superset: Fix the 4.1.2 build when building from source ([#1309]) +- superset: Pin `luxon` to version 3.6.1 to fix build ([#1315]) ### Fixed @@ -106,6 +107,7 @@ All notable changes to this project will be documented in this file. [#1308]: https://github.com/stackabletech/docker-images/pull/1308 [#1309]: https://github.com/stackabletech/docker-images/pull/1309 [#1311]: https://github.com/stackabletech/docker-images/pull/1311 +[#1315]: https://github.com/stackabletech/docker-images/pull/1315 ## [25.7.0] - 2025-07-23