Consolidate SkipMixin imports through common-compat layer#62776
Merged
kaxil merged 2 commits intoapache:mainfrom Mar 3, 2026
Merged
Consolidate SkipMixin imports through common-compat layer#62776kaxil merged 2 commits intoapache:mainfrom
SkipMixin imports through common-compat layer#62776kaxil merged 2 commits intoapache:mainfrom
Conversation
SkipMixin imports through common-compat layer
Replace version-conditional SkipMixin imports in branch.py and test_skipmixin.py with the common.compat.sdk layer. Add the standard provider's skipmixin as a middle fallback path in the compat import chain for consistency with common/compat/standard/utils.py. Also route SkipMixin and XComArg in common/sql through the compat layer instead of importing directly from airflow.models / airflow. Bump common-compat dependency to >=1.14.0.
7de8bb7 to
ec83937
Compare
gopidesupavan
approved these changes
Mar 3, 2026
Move airflow.models.skipmixin before airflow.providers.standard.utils.skipmixin in the compat fallback chain. On Airflow 2.x, the standard provider's SkipMixin is Airflow 3-only (uses DownstreamTasksSkipped), so the compat layer should resolve to the old session-based airflow.models.skipmixin first.
81 tasks
dominikhei
pushed a commit
to dominikhei/airflow
that referenced
this pull request
Mar 11, 2026
…#62776) Replace version-conditional SkipMixin imports in branch.py and test_skipmixin.py with the common.compat.sdk layer. Add the standard provider's skipmixin as a middle fallback path in the compat import chain for consistency with common/compat/standard/utils.py. Also route SkipMixin and XComArg in common/sql through the compat layer instead of importing directly from airflow.models / airflow.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up of #62749
Replace version-conditional
SkipMixinimports inbranch.pyandtest_skipmixin.pywith thecommon.compat.sdklayer. Add the standard provider's skipmixin as a middle fallback path in the compat import chain for consistency withcommon/compat/standard/utils.py.Also route
SkipMixinandXComArgincommon/sqlthrough the compat layer instead of importing directly fromairflow.models.Was generative AI tooling used to co-author this PR?
{pr_number}.significant.rstor{issue_number}.significant.rst, in airflow-core/newsfragments.