Sync v2-9-stable with v2-9-test to release 2.9.1

RELEASE_NOTES.rst

@@ -40,7 +40,7 @@ Bug Fixes
 """""""""
 - Make task log messages include run_id (#39280)
 - Copy menu_item ``href`` for nav bar (#39282)
-- Fix trigger kwarg encryption migration (#39246)
+- Fix trigger kwarg encryption migration (#39246, #39361, #39374)
 - Add workaround for datetime-local input in ``firefox`` (#39261)
 - Add Grid button to Task Instance view (#39223)
 - Get served logs when remote or executor logs not available for non-running task try (#39177)

airflow/migrations/versions/0140_2_9_0_update_trigger_kwargs_type.py

@@ -50,7 +50,7 @@ def get_session() -> sa.orm.Session:
 def upgrade():
     """Update trigger kwargs type to string and encrypt"""
     with op.batch_alter_table("trigger") as batch_op:
-        batch_op.alter_column("kwargs", type_=sa.Text(), )
+        batch_op.alter_column("kwargs", type_=sa.Text(), existing_nullable=False)
 
     if not context.is_offline_mode():
         session = get_session()
@@ -81,4 +81,6 @@ def downgrade():
             session.close()
 
     with op.batch_alter_table("trigger") as batch_op:
-        batch_op.alter_column("kwargs", type_=ExtendedJSON(), postgresql_using='kwargs::json')
+        batch_op.alter_column(
+            "kwargs", type_=ExtendedJSON(), postgresql_using="kwargs::json", existing_nullable=False
+        )

airflow/reproducible_build.yaml

@@ -1,2 +1,2 @@
-release-notes-hash: 8060a88f29c322b456c8534a6e2fecda
-source-date-epoch: 1714463734
+release-notes-hash: 9809f8d0a17cb29bb999a06b7a23c02b
+source-date-epoch: 1714668201

docs/apache-airflow/img/airflow_erd.sha256

@@ -1 +1 @@
-818cbc5af55096456b556d62e73eb5d797001969a04256f4a99e097fe189855d
+17599c5958628056a2277267adf5320e4e09107d1ed8824fbb81fba937d0bf55