diff --git a/Dockerfile.ci b/Dockerfile.ci index e4c095be2f665..1dc88c6966ff5 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1067,6 +1067,8 @@ EOF # The content below is automatically copied from scripts/docker/entrypoint_ci.sh COPY <<"EOF" /entrypoint_ci.sh #!/usr/bin/env bash +export SQLALCHEMY_ENGINE_DEBUG="true" + function set_verbose() { if [[ ${VERBOSE_COMMANDS:="false"} == "true" ]]; then set -x diff --git a/airflow-core/pyproject.toml b/airflow-core/pyproject.toml index 3cf114af0bfc7..c4f1734df75ef 100644 --- a/airflow-core/pyproject.toml +++ b/airflow-core/pyproject.toml @@ -135,8 +135,8 @@ dependencies = [ "rich-argparse>=1.0.0", "rich>=13.6.0", "setproctitle>=1.3.3", - # The issue tracking deprecations for sqlalchemy 2 is https://github.com/apache/airflow/issues/28723 - "sqlalchemy[asyncio]>=1.4.49", + # SQLAlchemy >=2.0.36 fixes Python 3.13 TypingOnly import AssertionError caused by new typing attributes (__static_attributes__, __firstlineno__) + "sqlalchemy[asyncio]>=2.0.36", "sqlalchemy-jsonfield>=1.0", "sqlalchemy-utils>=0.41.2", "svcs>=25.1.0", diff --git a/providers/fab/docs/index.rst b/providers/fab/docs/index.rst index c69c88b46f69c..30e9550ea55ac 100644 --- a/providers/fab/docs/index.rst +++ b/providers/fab/docs/index.rst @@ -116,7 +116,6 @@ PIP package Version required ``flask-session`` ``>=0.8.0; python_version < "3.13"`` ``msgpack`` ``>=1.0.0; python_version < "3.13"`` ``flask-sqlalchemy`` ``>=3.0.5; python_version < "3.13"`` -``sqlalchemy`` ``>=1.4.36,<2; python_version < "3.13"`` ``flask-wtf`` ``>=1.1.0; python_version < "3.13"`` ``connexion[flask]`` ``>=2.14.2,<3.0; python_version < "3.13"`` ``jmespath`` ``>=0.7.0; python_version < "3.13"`` diff --git a/providers/fab/pyproject.toml b/providers/fab/pyproject.toml index 604dd9617eb25..b6fecf6522259 100644 --- a/providers/fab/pyproject.toml +++ b/providers/fab/pyproject.toml @@ -73,12 +73,9 @@ dependencies = [ # In particular, make sure any breaking changes, for example any new methods, are accounted for. "flask-appbuilder==5.0.1; python_version < '3.13'", "flask-login>=0.6.2; python_version < '3.13'", - # Flask-Session 0.6 add new arguments into the SqlAlchemySessionInterface constructor as well as - # all parameters now are mandatory which make AirflowDatabaseSessionInterface incompatible with this version. "flask-session>=0.8.0; python_version < '3.13'", "msgpack>=1.0.0; python_version < '3.13'", "flask-sqlalchemy>=3.0.5; python_version < '3.13'", - "sqlalchemy>=1.4.36,<2; python_version < '3.13'", "flask-wtf>=1.1.0; python_version < '3.13'", "connexion[flask]>=2.14.2,<3.0; python_version < '3.13'", "jmespath>=0.7.0; python_version < '3.13'", diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh index ab339400aea04..49d2b2d12d509 100755 --- a/scripts/docker/entrypoint_ci.sh +++ b/scripts/docker/entrypoint_ci.sh @@ -15,6 +15,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +export SQLALCHEMY_ENGINE_DEBUG="true" + function set_verbose() { if [[ ${VERBOSE_COMMANDS:="false"} == "true" ]]; then set -x