This is an automated email from the ASF dual-hosted git repository. pierrejeambrun pushed a commit to branch v2-5-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 73fd13f4713e3dca54bc261f07080ca8dcc4b142 Author: Tzu-ping Chung <[email protected]> AuthorDate: Thu Mar 2 17:22:05 2023 +0800 Move sqlalchemy.ext.declarative imports to orm (#29862) (cherry picked from commit c4f8e22227a3f445d47386799be504388513ce3f) --- airflow/api/common/mark_tasks.py | 3 +-- airflow/api_connexion/endpoints/log_endpoint.py | 2 +- airflow/models/base.py | 2 +- airflow/models/connection.py | 3 +-- airflow/models/dagrun.py | 4 +--- airflow/models/variable.py | 3 +-- airflow/settings.py | 3 +-- airflow/www/fab_security/sqla/models.py | 3 +-- 8 files changed, 8 insertions(+), 15 deletions(-) diff --git a/airflow/api/common/mark_tasks.py b/airflow/api/common/mark_tasks.py index 8e25e0f4fd..063cb79da9 100644 --- a/airflow/api/common/mark_tasks.py +++ b/airflow/api/common/mark_tasks.py @@ -22,8 +22,7 @@ from datetime import datetime from typing import TYPE_CHECKING, Collection, Iterable, Iterator, NamedTuple from sqlalchemy import or_ -from sqlalchemy.orm import lazyload -from sqlalchemy.orm.session import Session as SASession +from sqlalchemy.orm import Session as SASession, lazyload from airflow.models.dag import DAG from airflow.models.dagrun import DagRun diff --git a/airflow/api_connexion/endpoints/log_endpoint.py b/airflow/api_connexion/endpoints/log_endpoint.py index 388b164727..03ceabe567 100644 --- a/airflow/api_connexion/endpoints/log_endpoint.py +++ b/airflow/api_connexion/endpoints/log_endpoint.py @@ -21,7 +21,7 @@ from typing import Any from flask import Response, request from itsdangerous.exc import BadSignature from itsdangerous.url_safe import URLSafeSerializer -from sqlalchemy.orm.session import Session +from sqlalchemy.orm import Session from airflow.api_connexion import security from airflow.api_connexion.exceptions import BadRequest, NotFound diff --git a/airflow/models/base.py b/airflow/models/base.py index b2587cc176..fc8a9fab7f 100644 --- a/airflow/models/base.py +++ b/airflow/models/base.py @@ -20,7 +20,7 @@ from __future__ import annotations from typing import Any from sqlalchemy import MetaData, String -from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import declarative_base from airflow.configuration import conf diff --git a/airflow/models/connection.py b/airflow/models/connection.py index 5f7406d9d4..162be8befd 100644 --- a/airflow/models/connection.py +++ b/airflow/models/connection.py @@ -24,8 +24,7 @@ from json import JSONDecodeError from urllib.parse import parse_qsl, quote, unquote, urlencode, urlsplit from sqlalchemy import Boolean, Column, Integer, String, Text -from sqlalchemy.ext.declarative import declared_attr -from sqlalchemy.orm import reconstructor, synonym +from sqlalchemy.orm import declared_attr, reconstructor, synonym from airflow.configuration import ensure_secrets_loaded from airflow.exceptions import AirflowException, AirflowNotFoundException, RemovedInAirflow3Warning diff --git a/airflow/models/dagrun.py b/airflow/models/dagrun.py index db6664d7c0..f43a2eef1e 100644 --- a/airflow/models/dagrun.py +++ b/airflow/models/dagrun.py @@ -43,9 +43,7 @@ from sqlalchemy import ( ) from sqlalchemy.exc import IntegrityError from sqlalchemy.ext.associationproxy import association_proxy -from sqlalchemy.ext.declarative import declared_attr -from sqlalchemy.orm import joinedload, relationship, synonym -from sqlalchemy.orm.session import Session +from sqlalchemy.orm import Session, declared_attr, joinedload, relationship, synonym from sqlalchemy.sql.expression import false, select, true from airflow import settings diff --git a/airflow/models/variable.py b/airflow/models/variable.py index dc7db0f7c0..b5afefddd6 100644 --- a/airflow/models/variable.py +++ b/airflow/models/variable.py @@ -23,8 +23,7 @@ from typing import Any from sqlalchemy import Boolean, Column, Integer, String, Text from sqlalchemy.dialects.mysql import MEDIUMTEXT -from sqlalchemy.ext.declarative import declared_attr -from sqlalchemy.orm import Session, reconstructor, synonym +from sqlalchemy.orm import Session, declared_attr, reconstructor, synonym from airflow.configuration import ensure_secrets_loaded from airflow.models.base import ID_LEN, Base diff --git a/airflow/settings.py b/airflow/settings.py index dcf0513d56..be808dbb74 100644 --- a/airflow/settings.py +++ b/airflow/settings.py @@ -30,8 +30,7 @@ import pendulum import sqlalchemy from sqlalchemy import create_engine, exc from sqlalchemy.engine import Engine -from sqlalchemy.orm import scoped_session, sessionmaker -from sqlalchemy.orm.session import Session as SASession +from sqlalchemy.orm import Session as SASession, scoped_session, sessionmaker from sqlalchemy.pool import NullPool from airflow.configuration import AIRFLOW_HOME, WEBSERVER_CONFIG, conf # NOQA F401 diff --git a/airflow/www/fab_security/sqla/models.py b/airflow/www/fab_security/sqla/models.py index 074ef2f291..c9e3ead248 100644 --- a/airflow/www/fab_security/sqla/models.py +++ b/airflow/www/fab_security/sqla/models.py @@ -38,8 +38,7 @@ from sqlalchemy import ( event, func, ) -from sqlalchemy.ext.declarative import declared_attr -from sqlalchemy.orm import backref, relationship +from sqlalchemy.orm import backref, declared_attr, relationship from airflow.models.base import Base
