[devin-ai-integration]

SUMMARY

Merges apache/superset@c14ac29f47 (40 upstream commits) into this fork's master.

The fork's only local commit was 8cb2c9287 fix(dashboard): import getClientErrorObject in dashboardState actions, a hotfix for an upstream semantic conflict. Upstream has since landed the same import, so git's textual merge produced a duplicate getClientErrorObject entry in the @superset-ui/core import block of superset-frontend/src/dashboard/actions/dashboardState.ts (no conflict markers — git took both adds). Resolved by dropping the fork's copy, which makes the merged tree byte-identical to upstream/master: git diff upstream/master is empty.

Dependency changes (all inherited from upstream, nothing regenerated here — lockfiles are upstream's and already in sync):

• Python: tiktoken>=0.14.0,<1.0 dropped from the fastmcp extra (with tiktoken/regex removed from requirements/development.txt); pinot bumped pinotdb>=5.0.0,<10 -> pinotdb[sqlalchemy]>=8.0.0,<10.
• Frontend: @googleapis/sheets ^17 -> ^18, @types/d3-selection ^3.0.11 -> ^3.0.12, oxlint ^1.82 -> ^1.83, oxfmt ^0.67 -> ^0.68 (also in docs/ and superset-websocket/).

DB migrations included (all authored upstream, carried over verbatim):

• 1f5f4fb8bfc1_delete_deprecated_permissions_33272
• 3ce9a4572f8a_rename_deprecated_permissions_33272
• 2ce579e91ae6_merge_deprecated_permissions_with_master
• 53a7abc31422_merge_deprecated_permissions_with_master_v2
• 95d8a99c822e_merge_deprecated_permissions_with_master_v3

Known upstream breakage carried over: none beyond whatever is red on apache/superset@c14ac29f47 itself — since this branch's tree is identical to that SHA, any CI failure here is by construction also present on upstream master at that SHA. dependency-review remains unsupported on this fork (Dependency graph disabled in repo settings).

BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF

N/A

TESTING INSTRUCTIONS

• git diff upstream/master on this branch -> empty (tree identical to apache/superset@c14ac29f47).
• No local checks were run beyond that: with an identical tree, lint/type/test results are by definition those of upstream master at this SHA. CI on this PR is the verification.

ADDITIONAL INFORMATION

• Has associated issue:
• Required feature flags:
• Changes UI
• Includes DB Migration (upstream migrations carried over verbatim)
• Introduces new feature or API
• Removes existing feature or API

Link to Devin session: https://app.devin.ai/sessions/0ef9b4c1c77d41528ad40c0a0de160f8
Requested by: ronalds (ronalds@gmail.com)

[devin-ai-integration]

Review

Verdict: LGTM — approve pending green CI.

Verified locally:

• git diff origin/devin/1790148543-sync-upstream upstream/master and ... c14ac29f47 are both empty — the merged tree is byte-identical to apache/superset@c14ac29f47, as the description claims.
• The merge commit f7c7cada7 did contain a duplicate getClientErrorObject, in the @superset-ui/core import block of superset-frontend/src/dashboard/actions/dashboardState.ts (2 occurrences, no conflict markers). Follow-up 3ee5a5511 removes exactly one line; the file now has a single import at line 29 and a single usage at line 275. Correct resolution.
• Only non-upstream commits in the branch are the fork's previous hotfix 8cb2c9287, its merge 7908807f2, the sync merge, and the dedupe fix — nothing unexpected.
• No conflicts against master.

Notes / nothing blocking:

• Since the tree is identical to upstream, any CI failure here reproduces on upstream master at that SHA and is not attributable to this PR. enforce-single-migration-head / Check DB migration conflict will validate the 5 carried-over migrations (3 of which are merge heads).
• dependency-review is expected to be unsupported on this fork (Dependency graph disabled), as noted.
• The fork hotfix 8cb2c9287 is now redundant with upstream 4c229cb66 (fix(dashboard): import getClientErrorObject; regenerate stale messages.pot apache/superset#44513); no action needed, but future syncs should be cleaner.