Simplify checks for package versions

Replaces more complex package version checks with one-liners.

airflow/utils/pydantic.py

@@ -24,19 +24,15 @@
 
 from __future__ import annotations
 
+from importlib.metadata import PackageNotFoundError, version
 
-def is_pydantic_2_installed() -> bool:
-    import sys
+from pkg_resources import parse_version
 
-    from packaging.version import Version
 
-    if sys.version_info >= (3, 9):
-        from importlib.metadata import distribution
-    else:
-        from importlib_metadata import distribution
+def is_pydantic_2_installed() -> bool:
     try:
-        return Version(distribution("pydantic").version) >= Version("2.0.0")
-    except ImportError:
+        return parse_version(version("pydantic")).major == 2
+    except PackageNotFoundError:
         return False
 
 

airflow/utils/sqlalchemy.py

@@ -26,7 +26,7 @@
 from typing import TYPE_CHECKING, Any, Generator, Iterable, overload
 
 from dateutil import relativedelta
-from packaging.version import Version, parse as parse_version
+from packaging.version import parse as parse_version
 from sqlalchemy import TIMESTAMP, PickleType, event, nullsfirst, tuple_
 from sqlalchemy.dialects import mysql
 from sqlalchemy.types import JSON, Text, TypeDecorator
@@ -555,10 +555,5 @@ def get_orm_mapper():
     return sqlalchemy.orm.mapper if is_sqlalchemy_v1() else sqlalchemy.orm.Mapper
 
 
-def _get_lib_major_version(lib_name: str) -> int:
-    ver: Version = parse_version(version(lib_name))
-    return ver.major
-
-
 def is_sqlalchemy_v1() -> bool:
-    return _get_lib_major_version("sqlalchemy") == 1
+    return parse_version(version("sqlalchemy")).major == 1