(superset) branch aminghadersohi/merge-theme-editors-purge-audit-heads created (now 77ef39fcaaa)

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aminghadersohi pushed a change to branch aminghadersohi/merge-theme-editors-purge-audit-heads
in repository https://gitbox.apache.org/repos/asf/superset.git


      at 77ef39fcaaa fix(migrations): merge theme editors and purge audit heads

This branch includes the following new commits:

     new 77ef39fcaaa fix(migrations): merge theme editors and purge audit heads

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

(superset) 01/01: fix(migrations): merge theme editors and purge audit heads

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aminghadersohi pushed a commit to branch aminghadersohi/merge-theme-editors-purge-audit-heads
in repository https://gitbox.apache.org/repos/asf/superset.git

commit 77ef39fcaaaf5170b8e828a69953a98ca4ca46f4
Author: Amin Ghadersohi <am...@gmail.com>
AuthorDate: Wed Sep 16 22:58:09 2026 +0000

    fix(migrations): merge theme editors and purge audit heads
    
    master has two alembic heads, so `superset db upgrade` aborts with
    "Multiple head revisions are present" and every PR's integration CI legs
    fail in 1-2 minutes before running any tests.
    
    Add an empty merge revision joining 0884f655c0a6 and e2f3a1b9c640. No
    schema or data change.
---
 ...11_merge_theme_editors_and_purge_audit_heads.py | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/superset/migrations/versions/2026-09-16_22-55_60f94cd6cd11_merge_theme_editors_and_purge_audit_heads.py b/superset/migrations/versions/2026-09-16_22-55_60f94cd6cd11_merge_theme_editors_and_purge_audit_heads.py
new file mode 100644
index 00000000000..5b7de73bbf0
--- /dev/null
+++ b/superset/migrations/versions/2026-09-16_22-55_60f94cd6cd11_merge_theme_editors_and_purge_audit_heads.py
@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""Merge theme editors and purge audit heads.
+
+Revision ID: 60f94cd6cd11
+Revises: 0884f655c0a6, e2f3a1b9c640
+Create Date: 2026-09-16 22:55:39.000000
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "60f94cd6cd11"
+down_revision = ("0884f655c0a6", "e2f3a1b9c640")
+
+
+def upgrade() -> None:
+    """Join both migration branches without changing schema or data."""
+
+
+def downgrade() -> None:
+    """Restore both parent heads without changing schema or data."""