Skip to content

Commit 270c377

Browse files
authored
Merge branch 'master' into feature/dashboard-color-picker-gui
2 parents 380f435 + 1f1539f commit 270c377

981 files changed

Lines changed: 69044 additions & 34871 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.

‎.codecov.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ codecov:
33
after_n_builds: 4
44
ignore:
55
- "superset/migrations/versions/*.py"
6-
- "superset-frontend/packages/superset-ui-demo/**/*"
76
- "**/*.stories.tsx"
8-
- "**/*.stories.jsx"
97
coverage:
108
status:
119
project:

‎.github/ISSUE_TEMPLATE/bug-report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Bug report
22
description: Report a bug to improve Superset's stability
3-
labels: ["bug"]
3+
labels: ["#bug"]
44
body:
55
- type: markdown
66
attributes:

‎.github/ISSUE_TEMPLATE/cosmetic.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: Cosmetic Issue
33
about: Describe a cosmetic issue with CSS, positioning, layout, labeling, or similar
4-
labels: "cosmetic-issue"
4+
labels: "#bug:cosmetic"
55
---
66

77
## Screenshot

‎.github/dependabot.yml‎

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ updates:
55
directory: "/"
66
schedule:
77
interval: "daily"
8+
groups:
9+
security:
10+
applies-to: "security-updates"
11+
patterns: ["*"]
812
cooldown:
913
default-days: 7
1014

@@ -20,14 +24,6 @@ updates:
2024
- dependency-name: "@types/react-dom"
2125
update-types: ["version-update:semver-major"]
2226
- dependency-name: "react-icons"
23-
# JSDOM v30 doesn't play well with Jest v30
24-
# Source: https://jestjs.io/blog#known-issues
25-
# GH thread: https://github.com/jsdom/jsdom/issues/3492
26-
- dependency-name: "jest-environment-jsdom"
27-
# `@swc/plugin-transform-imports` doesn't work with current Webpack-SWC hybrid setup
28-
# See https://github.com/apache/superset/pull/37384#issuecomment-3793991389
29-
# TODO: remove the plugin once Lodash usage has been migrated to a more readily tree-shakeable alternative
30-
- dependency-name: "@swc/plugin-transform-imports"
3127
# deck.gl and luma.gl share strict peer constraints across the root and
3228
# plugin workspaces, and root overrides pin their transitive versions.
3329
# Upgrade both families together in a manually validated change.
@@ -61,6 +57,9 @@ updates:
6157
- npm
6258
- dependabot
6359
groups:
60+
security:
61+
applies-to: "security-updates"
62+
patterns: ["*"]
6463
rjsf:
6564
patterns:
6665
- "@rjsf/*"
@@ -80,6 +79,11 @@ updates:
8079
patterns:
8180
- "ag-grid-react"
8281
- "ag-grid-community"
82+
swc:
83+
patterns:
84+
- "@swc/core"
85+
- "@swc/plugin-emotion"
86+
- "@swc/plugin-transform-imports"
8387
open-pull-requests-limit: 30
8488
versioning-strategy: increase
8589
cooldown:
@@ -98,13 +102,21 @@ updates:
98102
labels:
99103
- pip
100104
- dependabot
105+
groups:
106+
security:
107+
applies-to: "security-updates"
108+
patterns: ["*"]
101109
cooldown:
102110
default-days: 7
103111

104112
- package-ecosystem: "npm"
105113
directory: ".github/actions"
106114
schedule:
107115
interval: "daily"
116+
groups:
117+
security:
118+
applies-to: "security-updates"
119+
patterns: ["*"]
108120
open-pull-requests-limit: 10
109121
versioning-strategy: increase
110122
cooldown:
@@ -115,6 +127,9 @@ updates:
115127
schedule:
116128
interval: "daily"
117129
groups:
130+
security:
131+
applies-to: "security-updates"
132+
patterns: ["*"]
118133
storybook:
119134
patterns:
120135
- "@storybook/*"
@@ -142,6 +157,10 @@ updates:
142157
labels:
143158
- npm
144159
- dependabot
160+
groups:
161+
security:
162+
applies-to: "security-updates"
163+
patterns: ["*"]
145164
versioning-strategy: increase
146165
cooldown:
147166
default-days: 7
@@ -153,6 +172,10 @@ updates:
153172
labels:
154173
- npm
155174
- dependabot
175+
groups:
176+
security:
177+
applies-to: "security-updates"
178+
patterns: ["*"]
156179
open-pull-requests-limit: 10
157180
versioning-strategy: increase
158181
cooldown:

‎.github/workflows/bump-python-package.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
python-version: "3.11"
4949

5050
- name: Install uv
51-
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
51+
uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
5252
with:
5353
python-version: "3.11"
5454
enable-cache: true

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767

6868
# Initializes the CodeQL tools for scanning.
6969
- name: Initialize CodeQL
70-
uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
70+
uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
7171
with:
7272
languages: ${{ matrix.language }}
7373
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -78,6 +78,6 @@ jobs:
7878
# queries: security-extended,security-and-quality
7979

8080
- name: Perform CodeQL Analysis
81-
uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
81+
uses: github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
8282
with:
8383
category: "/language:${{matrix.language}}"

‎.github/workflows/dependency-review.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,27 @@ jobs:
6666

6767
- name: "Set up liccheck"
6868
run: |
69+
# liccheck (as of 0.9.2) still does a bare `import pkg_resources`
70+
# without declaring setuptools as a dependency, relying on it
71+
# having historically been bundled. setuptools 81+ (installed
72+
# above via requirements/base.txt) dropped the pkg_resources
73+
# subpackage entirely, so liccheck's own import breaks outright.
74+
#
75+
# Reinstalling an older setuptools would restore pkg_resources but
76+
# would also downgrade the *real* setuptools install, which then
77+
# trips liccheck's own working_set.resolve() -- it cross-checks
78+
# requirements/base.txt's declared `setuptools==84.0.0` against
79+
# what's actually installed, and a downgrade makes those disagree.
80+
#
81+
# Instead, vendor just the pkg_resources/ package files from an
82+
# old setuptools wheel into site-packages, leaving the real
83+
# setuptools install (and its dist-info metadata) untouched. This
84+
# gives liccheck an importable pkg_resources whose own working-set
85+
# scan still correctly reports the real installed setuptools
86+
# version, so no conflict is raised.
87+
pip download "setuptools<81" --no-deps -d /tmp/old-setuptools
88+
python -m zipfile -e /tmp/old-setuptools/setuptools-*.whl /tmp/old-setuptools-extracted/
89+
cp -r /tmp/old-setuptools-extracted/pkg_resources "$(python -c 'import site; print(site.getsitepackages()[0])')/"
6990
uv pip install --system liccheck
7091
- name: "Run liccheck"
7192
run: |

‎.github/workflows/frontend-bundle-size-nightly.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ jobs:
105105
tool: customSmallerIsBetter
106106
output-file-path: bundle-size-summary.json
107107
external-data-json-path: bundle-size-history.json
108+
github-token: ${{ secrets.GITHUB_TOKEN }}
108109
fail-on-alert: false
109110
summary-always: true
110111

‎.github/workflows/generate-FOSSA-report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
persist-credentials: false
3838
submodules: recursive
3939
- name: Setup Java
40-
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
40+
uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
4141
with:
4242
distribution: "temurin"
4343
java-version: "11"

‎.github/workflows/license-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
persist-credentials: false
2424
submodules: recursive
2525
- name: Setup Java
26-
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
26+
uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
2727
with:
2828
distribution: "temurin"
2929
java-version: "11"

0 commit comments

Comments
 (0)