Skip to content

Upgrade SQLAlchemy (SQLA) to 2.0 - #59218

Merged
vincbeck merged 5 commits into
apache:mainfrom
Dev-iL:Dev-iL/sqla2_deadlock
Jan 5, 2026
Merged

Upgrade SQLAlchemy (SQLA) to 2.0#59218
vincbeck merged 5 commits into
apache:mainfrom
Dev-iL:Dev-iL/sqla2_deadlock

Conversation

@Dev-iL

@Dev-iLDev-iL commented Dec 8, 2025

Copy link
Copy Markdown
Collaborator

related: #28723, #58049

Fixing assorted issues preventing us from removing the SQLA1.4 limitation. Note that many fixes done as part of this effort were split into standalone PRs as can be seen in this PR's history below.


^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

@Dev-iLDev-iL changed the title Dev i l/sqla2 deadlockAttempting to fix the MySQL timeout with SQLA2 Dec 8, 2025
@vincbeck
vincbeckforce-pushed the vincbeck/fab_remove_sqla_limit branch from 17dec44 to f3cc8f8CompareDecember 8, 2025 20:30
@Dev-iL
Dev-iLforce-pushed the Dev-iL/sqla2_deadlock branch from 5ce5e2e to 084d78fCompareDecember 8, 2025 21:14
@Dev-iL
Dev-iL changed the base branch from vincbeck/fab_remove_sqla_limit to mainDecember 8, 2025 21:15
@Dev-iL
Dev-iL marked this pull request as draft December 8, 2025 21:15
@Dev-iL
Dev-iL marked this pull request as ready for review December 8, 2025 21:15
@Dev-iLDev-iL closed this Dec 8, 2025
@Dev-iLDev-iL reopened this Dec 8, 2025
@Dev-iL
Dev-iL changed the base branch from main to vincbeck/fab_remove_sqla_limitDecember 8, 2025 21:17
@vincbeckvincbeck added full tests needed We need to run full set of tests for this PR to merge all versions If set, the CI build will be forced to use all versions of Python/K8S/DBs labels Dec 8, 2025
@vincbeckvincbeck closed this Dec 8, 2025
@vincbeckvincbeck reopened this Dec 8, 2025
@Dev-iL
Dev-iL changed the base branch from vincbeck/fab_remove_sqla_limit to mainDecember 8, 2025 21:23
@Dev-iL
Dev-iLforce-pushed the Dev-iL/sqla2_deadlock branch 7 times, most recently from 0a11b78 to a410fafCompareDecember 13, 2025 20:51
@Dev-iL
Dev-iLforce-pushed the Dev-iL/sqla2_deadlock branch 3 times, most recently from 2c55bd2 to 7112da5CompareDecember 28, 2025 20:18
@Dev-iLDev-iL self-assigned this Dec 28, 2025
@Dev-iL
Dev-iLforce-pushed the Dev-iL/sqla2_deadlock branch from 7112da5 to 20def2fCompareDecember 29, 2025 05:04

@NataneljpwdNataneljpwd left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great!

@Dev-iL
Dev-iLforce-pushed the Dev-iL/sqla2_deadlock branch from 20def2f to 438246bCompareDecember 29, 2025 20:08

@potiukpotiuk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - but I think at least @vincbeck review will be needed as well - possibly few other people who are more into SQLA.

Also - the DISCUSS thread is overwhelmingly "let's drop SQLA1" as expected, I propose @Dev-iL you start a LAZY CONSENSUS thread and link to this PR - this will drag attention of more maintainers.

Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Jan 2, 2026
Related: apache#59218, apache#59402
Passes mypy & pre-commit checks
airflow-core/src/airflow/api_fastapi
airflow-core/tests/unit/api_fastapi/execution_api/versions/head/test_dag_runs.py.
airflow-core/tests/unit/api_fastapi/execution_api/versions/head/test_variables.py
airflow-core/tests/unit/api_fastapi/execution_api/versions/head/test_xcoms.py
@Dev-iL
Dev-iLforce-pushed the Dev-iL/sqla2_deadlock branch from 438246b to 0c069ebCompareJanuary 3, 2026 19:06
@Dev-iL

Copy link
Copy Markdown
CollaboratorAuthor

Lazy consensus passed. I guess we're waiting for @vincbeck's blessing now...

@Dev-iL

Copy link
Copy Markdown
CollaboratorAuthor

Interestingly, after the latest rebase, several deps get downgraded:

< cadwyn==6.0.0> cadwyn==5.4.6< fastapi==0.128.0> fastapi==0.117.1< starlette==0.50.0> starlette==0.48.0

@Nataneljpwd

Copy link
Copy Markdown
Contributor

Interestingly, after the latest rebase, several deps get downgraded:

< cadwyn==6.0.0> cadwyn==5.4.6< fastapi==0.128.0> fastapi==0.117.1< starlette==0.50.0> starlette==0.48.0

I think @jscheffl wrote something about it in the cicd channel on slack, where the pipeline got dependency conflicts on Arm, maybe it can help him.

Here is the slack message:

https://apache-airflow.slack.com/archives/C015SLQF059/p1767483103162959?thread_ts=1767480352.315619&cid=C015SLQF059

@Dev-iLDev-iL mentioned this pull request Jan 4, 2026
@Dev-iL
Dev-iLforce-pushed the Dev-iL/sqla2_deadlock branch 2 times, most recently from 6549cb9 to 1c84f22CompareJanuary 4, 2026 22:39

@jscheffljscheffl left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No objection from @vincbeck then LGTM!

@jscheffl
jschefflforce-pushed the Dev-iL/sqla2_deadlock branch from 1c84f22 to 887dad6CompareJanuary 5, 2026 14:13
@jscheffl

Copy link
Copy Markdown
Contributor

For safety made a final rebase, let's have CI green and then merge ASAP!

@vincbeckvincbeck left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome!

@vincbeck
vincbeck merged commit e626a7f into apache:mainJan 5, 2026
220 checks passed
@jscheffl

Copy link
Copy Markdown
Contributor

#protm

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

all versionsIf set, the CI build will be forced to use all versions of Python/K8S/DBsfull tests neededWe need to run full set of tests for this PR to merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@Dev-iL@Nataneljpwd@jscheffl@potiuk@shahar1@vincbeck@vatsrahul1001