Skip to content

Commit 138a304

Browse files
authored
Merge branch 'master' into ramiro.aquino.romero/sc-97459/add-export-to-png-and-pdf-options-for-charts
2 parents fa28161 + a17f38a commit 138a304

1,884 files changed

Lines changed: 137432 additions & 37749 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.asf.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ notifications:
2424
discussions: notifications@superset.apache.org
2525

2626
github:
27-
del_branch_on_merge: true
27+
pull_requests:
28+
del_branch_on_merge: true
29+
allow_update_branch: true
2830
description: "Apache Superset is a Data Visualization and Data Exploration Platform"
2931
homepage: https://superset.apache.org/
3032
labels:

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
"features": {
1515
"ghcr.io/devcontainers/features/docker-in-docker:2": {
16-
"moby": true,
16+
"moby": false,
1717
"dockerDashComposeVersion": "v2"
1818
},
1919
"ghcr.io/devcontainers/features/node:1": {

.github/dependabot.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@ updates:
1616
update-types: ["version-update:semver-major", "version-update:semver-minor"]
1717
- dependency-name: "eslint-plugin-storybook"
1818
- dependency-name: "react-error-boundary"
19+
- dependency-name: "@rjsf/*"
1920
# remark-gfm v4+ requires react-markdown v9+, which needs React 18
2021
- dependency-name: "remark-gfm"
2122
- dependency-name: "react-markdown"
23+
# TODO: remove below entries until React >= 19.0.0
24+
- dependency-name: "react-icons"
2225
# JSDOM v30 doesn't play well with Jest v30
2326
# Source: https://jestjs.io/blog#known-issues
2427
# GH thread: https://github.com/jsdom/jsdom/issues/3492
@@ -27,6 +30,9 @@ updates:
2730
# See https://github.com/apache/superset/pull/37384#issuecomment-3793991389
2831
# TODO: remove the plugin once Lodash usage has been migrated to a more readily tree-shakeable alternative
2932
- dependency-name: "@swc/plugin-transform-imports"
33+
# `just-handlerbars-helpers` library in plugin-chart-handlebars requires `currencyformatter`` to be < 2
34+
- dependency-name: "currencyformatter.js"
35+
update-types: ["version-update:semver-major"]
3036
groups:
3137
storybook:
3238
applies-to: version-updates
@@ -65,6 +71,22 @@ updates:
6571

6672
- package-ecosystem: "npm"
6773
directory: "/docs/"
74+
ignore:
75+
# TODO: remove below entries until React >= 18.0.0 in superset-frontend
76+
- dependency-name: "storybook"
77+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
78+
- dependency-name: "@storybook*"
79+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
80+
- dependency-name: "eslint-plugin-storybook"
81+
- dependency-name: "react-error-boundary"
82+
groups:
83+
storybook:
84+
applies-to: version-updates
85+
patterns:
86+
- "@storybook*"
87+
- "storybook"
88+
update-types:
89+
- "patch"
6890
schedule:
6991
interval: "daily"
7092
open-pull-requests-limit: 10
@@ -123,6 +145,9 @@ updates:
123145

124146
- package-ecosystem: "npm"
125147
directory: "/superset-frontend/plugins/plugin-chart-pivot-table/"
148+
ignore:
149+
# TODO: remove below entries until React >= 19.0.0
150+
- dependency-name: "react-icons"
126151
schedule:
127152
interval: "daily"
128153
labels:
@@ -173,6 +198,9 @@ updates:
173198

174199
- package-ecosystem: "npm"
175200
directory: "/superset-frontend/plugins/plugin-chart-table/"
201+
ignore:
202+
# TODO: remove below entries until React >= 19.0.0
203+
- dependency-name: "react-icons"
176204
schedule:
177205
interval: "daily"
178206
labels:
@@ -273,6 +301,10 @@ updates:
273301

274302
- package-ecosystem: "npm"
275303
directory: "/superset-frontend/plugins/plugin-chart-handlebars/"
304+
ignore:
305+
# `just-handlerbars-helpers` library in plugin-chart-handlebars requires `currencyformatter`` to be < 2
306+
- dependency-name: "currencyformatter.js"
307+
update-types: ["version-update:semver-major"]
276308
schedule:
277309
interval: "daily"
278310
labels:

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
# Scan for vulnerabilities in built container image after pushes to mainline branch.
105105
- name: Run Trivy container image vulnerabity scan
106106
if: github.event_name == 'push' && github.ref == 'refs/heads/master' && (steps.check.outputs.python || steps.check.outputs.frontend || steps.check.outputs.docker) && matrix.build_preset == 'lean'
107-
uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8 # v0.33.1
107+
uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # v0.34.2
108108
with:
109109
image-ref: ${{ env.IMAGE_TAG }}
110110
format: 'sarif'

.github/workflows/no-hold-label.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
pull_request:
55
types: [labeled, unlabeled, opened, reopened, synchronize]
66

7+
permissions:
8+
pull-requests: read
9+
710
# cancel previous workflow jobs for PRs
811
concurrency:
912
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}

.github/workflows/pre-commit.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
pull_request:
99
types: [synchronize, opened, reopened, ready_for_review]
1010

11+
permissions:
12+
contents: read
13+
1114
# cancel previous workflow jobs for PRs
1215
concurrency:
1316
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}

.github/workflows/superset-app-cli.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
SUPERSET__SQLALCHEMY_DATABASE_URI: postgresql+psycopg2://superset:superset@127.0.0.1:15432/superset
2424
services:
2525
postgres:
26-
image: postgres:16-alpine
26+
image: postgres:17-alpine
2727
env:
2828
POSTGRES_USER: superset
2929
POSTGRES_PASSWORD: superset

.github/workflows/superset-docs-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
yarn install --check-cache
6969
- name: Download database diagnostics (if triggered by integration tests)
7070
if: github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success'
71-
uses: dawidd6/action-download-artifact@v14
71+
uses: dawidd6/action-download-artifact@v16
7272
continue-on-error: true
7373
with:
7474
workflow: superset-python-integrationtest.yml
@@ -77,7 +77,7 @@ jobs:
7777
path: docs/src/data/
7878
- name: Try to download latest diagnostics (for push/dispatch triggers)
7979
if: github.event_name != 'workflow_run'
80-
uses: dawidd6/action-download-artifact@v14
80+
uses: dawidd6/action-download-artifact@v16
8181
continue-on-error: true
8282
with:
8383
workflow: superset-python-integrationtest.yml

.github/workflows/superset-docs-verify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- uses: actions/checkout@v6
2828
# Do not bump this linkinator-action version without opening
2929
# an ASF Infra ticket to allow the new version first!
30-
- uses: JustinBeckwith/linkinator-action@f62ba0c110a76effb2ee6022cc6ce4ab161085e3 # v2.4
30+
- uses: JustinBeckwith/linkinator-action@af984b9f30f63e796ae2ea5be5e07cb587f1bbd9 # v2.3
3131
continue-on-error: true # This will make the job advisory (non-blocking, no red X)
3232
with:
3333
paths: "**/*.md, **/*.mdx"
@@ -111,7 +111,7 @@ jobs:
111111
run: |
112112
yarn install --check-cache
113113
- name: Download database diagnostics from integration tests
114-
uses: dawidd6/action-download-artifact@v14
114+
uses: dawidd6/action-download-artifact@v16
115115
with:
116116
workflow: superset-python-integrationtest.yml
117117
run_id: ${{ github.event.workflow_run.id }}

.github/workflows/superset-e2e.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
USE_DASHBOARD: ${{ github.event.inputs.use_dashboard == 'true' || 'false' }}
5555
services:
5656
postgres:
57-
image: postgres:16-alpine
57+
image: postgres:17-alpine
5858
env:
5959
POSTGRES_USER: superset
6060
POSTGRES_PASSWORD: superset
@@ -146,7 +146,7 @@ jobs:
146146
SAFE_APP_ROOT=${APP_ROOT//\//_}
147147
echo "safe_app_root=$SAFE_APP_ROOT" >> $GITHUB_OUTPUT
148148
- name: Upload Artifacts
149-
uses: actions/upload-artifact@v6
149+
uses: actions/upload-artifact@v7
150150
if: failure()
151151
with:
152152
path: ${{ github.workspace }}/superset-frontend/cypress-base/cypress/screenshots
@@ -171,7 +171,7 @@ jobs:
171171
GITHUB_TOKEN: ${{ github.token }}
172172
services:
173173
postgres:
174-
image: postgres:16-alpine
174+
image: postgres:17-alpine
175175
env:
176176
POSTGRES_USER: superset
177177
POSTGRES_PASSWORD: superset
@@ -259,7 +259,7 @@ jobs:
259259
SAFE_APP_ROOT=${APP_ROOT//\//_}
260260
echo "safe_app_root=$SAFE_APP_ROOT" >> $GITHUB_OUTPUT
261261
- name: Upload Playwright Artifacts
262-
uses: actions/upload-artifact@v6
262+
uses: actions/upload-artifact@v7
263263
if: failure()
264264
with:
265265
path: |

0 commit comments

Comments
 (0)