Skip to content

Refactor FAB provider to use ORM type hints from common-compat #56903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 1 commit into from
Oct 21, 2025
Merged

Refactor FAB provider to use ORM type hints from common-compat #56903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion providers/fab/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ license-files = ["NOTICE", "*/LICENSE*"]
# After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
dependencies = [
"apache-airflow>=3.0.2",
"apache-airflow-providers-common-compat>=1.2.1",
"apache-airflow-providers-common-compat>=1.7.4", # + TODO: bump to next version
# Blinker use for signals in Flask, this is an optional dependency in Flask 2.2 and lower.
# In Flask 2.3 it becomes a mandatory dependency, and flask signals are always available.
"blinker>=1.6.2; python_version < '3.13'",
Expand Down
11 changes: 1 addition & 10 deletions providers/fab/src/airflow/providers/fab/auth_manager/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,7 @@
from sqlalchemy.orm import Mapped, backref, declared_attr, relationship

from airflow.api_fastapi.auth.managers.models.base_user import BaseUser

try:
from sqlalchemy.orm import mapped_column
except ImportError:
# fallback for SQLAlchemy < 2.0
def mapped_column(*args, **kwargs):
from sqlalchemy import Column

return Column(*args, **kwargs)

from airflow.providers.common.compat.sqlalchemy.orm import mapped_column

if TYPE_CHECKING:
try:
Expand Down