Use declarative_base from sqlalchemy.orm instead of `sqlalchemy.e…

…xt.declarative` (#39134)

airflow/migrations/versions/0054_1_10_10_add_dag_code_table.py

@@ -39,7 +39,7 @@
 
 def upgrade():
     """Create DagCode Table."""
-    from sqlalchemy.ext.declarative import declarative_base
+    from sqlalchemy.orm import declarative_base
 
     Base = declarative_base()
 

airflow/migrations/versions/0063_2_0_0_set_conn_type_as_non_nullable.py

@@ -26,7 +26,7 @@
 
 import sqlalchemy as sa
 from alembic import op
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import declarative_base
 
 # revision identifiers, used by Alembic.
 revision = "8f966b9c467a"

docs/apache-airflow/img/airflow_erd.sha256

@@ -1 +1 @@
-cccb1a4a3f22027e354cea27bb34996fd45146494cbe6893d938c02c2ddb1a61
+072fb4b43a86ccb57765ec3f163350519773be83ab38b7ac747d25e1197233e8

pyproject.toml

@@ -469,7 +469,11 @@ banned-module-level-imports = ["numpy", "pandas"]
 "unittest.skipIf".msg = "Use `pytest.mark.skipif` instead: https://docs.pytest.org/en/stable/reference/reference.html#marks"
 "unittest.skipUnless".msg = "Use `pytest.mark.skipif` instead: https://docs.pytest.org/en/stable/reference/reference.html#marks"
 "unittest.expectedFailure".msg = "Use `pytest.mark.xfail` instead: https://docs.pytest.org/en/stable/reference/reference.html#marks"
-
+# Moved in SQLAlchemy 2.0
+"sqlalchemy.ext.declarative.declarative_base".msg = "Use `sqlalchemy.orm.declarative_base`. Moved in SQLAlchemy 2.0"
+"sqlalchemy.ext.declarative.as_declarative".msg = "Use `sqlalchemy.orm.as_declarative`. Moved in SQLAlchemy 2.0"
+"sqlalchemy.ext.declarative.has_inherited_table".msg = "Use `sqlalchemy.orm.has_inherited_table`. Moved in SQLAlchemy 2.0"
+"sqlalchemy.ext.declarative.synonym_for".msg = "Use `sqlalchemy.orm.synonym_for`. Moved in SQLAlchemy 2.0"
 
 [tool.ruff.lint.flake8-type-checking]
 exempt-modules = ["typing", "typing_extensions"]