apache-airflow-providers-common-compat 1.7.4rc1__tar.gz → 1.8.0rc1__tar.gz

{apache_airflow_providers_common_compat-1.7.4rc1 → apache_airflow_providers_common_compat-1.8.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-common-compat
-Version: 1.7.4rc1
+Version: 1.8.0rc1
 Summary: Provider package apache-airflow-providers-common-compat for Apache Airflow
 Keywords: airflow-provider,common.compat,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -24,8 +24,8 @@ Requires-Dist: apache-airflow>=2.10.0rc1
 Requires-Dist: apache-airflow-providers-openlineage ; extra == "openlineage"
 Requires-Dist: apache-airflow-providers-standard ; extra == "standard"
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-common-compat/1.7.4/changelog.html
-Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-common-compat/1.7.4
+Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-common-compat/1.8.0/changelog.html
+Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-common-compat/1.8.0
 Project-URL: Mastodon, https://fosstodon.org/@airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
@@ -58,7 +58,7 @@ Provides-Extra: standard
 
 Package ``apache-airflow-providers-common-compat``
 
-Release: ``1.7.4``
+Release: ``1.8.0``
 
 
 Common Compatibility Provider - providing compatibility code for previous Airflow versions
@@ -71,7 +71,7 @@ This is a provider package for ``common.compat`` provider. All classes for this
 are in ``airflow.providers.common.compat`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-common-compat/1.7.4/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-common-compat/1.8.0/>`_.
 
 Installation
 ------------
@@ -108,7 +108,6 @@ You can install such cross-provider dependencies when installing from PyPI. For
 Dependent package                                                                                               Extra
 ==============================================================================================================  ===============
 `apache-airflow-providers-openlineage <https://airflow.apache.org/docs/apache-airflow-providers-openlineage>`_  ``openlineage``
-`apache-airflow-providers-standard <https://airflow.apache.org/docs/apache-airflow-providers-standard>`_        ``standard``
 ==============================================================================================================  ===============
 
 Optional dependencies
@@ -122,5 +121,5 @@ Extra            Dependencies
 ===============  ========================================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-common-compat/1.7.4/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-common-compat/1.8.0/changelog.html>`_.
 

{apache_airflow_providers_common_compat-1.7.4rc1 → apache_airflow_providers_common_compat-1.8.0rc1}/README.rst

@@ -23,7 +23,7 @@
 
 Package ``apache-airflow-providers-common-compat``
 
-Release: ``1.7.4``
+Release: ``1.8.0``
 
 
 Common Compatibility Provider - providing compatibility code for previous Airflow versions
@@ -36,7 +36,7 @@ This is a provider package for ``common.compat`` provider. All classes for this
 are in ``airflow.providers.common.compat`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-common-compat/1.7.4/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-common-compat/1.8.0/>`_.
 
 Installation
 ------------
@@ -73,7 +73,6 @@ You can install such cross-provider dependencies when installing from PyPI. For
 Dependent package                                                                                               Extra
 ==============================================================================================================  ===============
 `apache-airflow-providers-openlineage <https://airflow.apache.org/docs/apache-airflow-providers-openlineage>`_  ``openlineage``
-`apache-airflow-providers-standard <https://airflow.apache.org/docs/apache-airflow-providers-standard>`_        ``standard``
 ==============================================================================================================  ===============
 
 Optional dependencies
@@ -87,4 +86,4 @@ Extra            Dependencies
 ===============  ========================================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-common-compat/1.7.4/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-common-compat/1.8.0/changelog.html>`_.

{apache_airflow_providers_common_compat-1.7.4rc1 → apache_airflow_providers_common_compat-1.8.0rc1}/docs/changelog.rst

@@ -25,11 +25,35 @@
 Changelog
 ---------
 
-1.7.4
+1.8.0
 .....
 
+Features
+~~~~~~~~
+
+* ``Simplify version-specific imports in the Standard provider (#56867)``
+* ``Add SQLA's 'mapped_column' to common-compat (#56880)``
+* ``Add comprehensive compatibility imports for Airflow 2 to 3 migration (#56790)``
+
+Misc
+~~~~
+
+* ``Common.Compat: Extract reusable compat utilities and rename to sdk (#56884)``
+* ``Simplify version-specific imports in the Google provider (#56793)``
+* ``Migrate Apache providers & Elasticsearch to ''common.compat'' (#57016)``
+
+Doc-only
+~~~~~~~~
+
+* ``Remove placeholder Release Date in changelog and index files (#56056)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Enable PT011 rule to prvoider tests (#56495)``
+
+1.7.4
+.....
 
-Release Date: ``|PypiReleaseDate|``
 
 Misc
 ~~~~

{apache_airflow_providers_common_compat-1.7.4rc1 → apache_airflow_providers_common_compat-1.8.0rc1}/docs/index.rst

@@ -62,7 +62,7 @@ apache-airflow-providers-common-compat package
 Common Compatibility Provider - providing compatibility code for previous Airflow versions
 
 
-Release: 1.7.4
+Release: 1.8.0
 
 Provider package
 ----------------
@@ -105,7 +105,6 @@ You can install such cross-provider dependencies when installing from PyPI. For
 Dependent package                                                                                               Extra
 ==============================================================================================================  ===============
 `apache-airflow-providers-openlineage <https://airflow.apache.org/docs/apache-airflow-providers-openlineage>`_  ``openlineage``
-`apache-airflow-providers-standard <https://airflow.apache.org/docs/apache-airflow-providers-standard>`_        ``standard``
 ==============================================================================================================  ===============
 
 Downloading official packages
@@ -114,5 +113,5 @@ Downloading official packages
 You can download officially released packages and verify their checksums and signatures from the
 `Official Apache Download site <https://downloads.apache.org/airflow/providers/>`_
 
-* `The apache-airflow-providers-common-compat 1.7.4 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_compat-1.7.4.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_compat-1.7.4.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_compat-1.7.4.tar.gz.sha512>`__)
-* `The apache-airflow-providers-common-compat 1.7.4 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_compat-1.7.4-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_compat-1.7.4-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_compat-1.7.4-py3-none-any.whl.sha512>`__)
+* `The apache-airflow-providers-common-compat 1.8.0 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_compat-1.8.0.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_compat-1.8.0.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_compat-1.8.0.tar.gz.sha512>`__)
+* `The apache-airflow-providers-common-compat 1.8.0 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_compat-1.8.0-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_compat-1.8.0-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_compat-1.8.0-py3-none-any.whl.sha512>`__)

{apache_airflow_providers_common_compat-1.7.4rc1 → apache_airflow_providers_common_compat-1.8.0rc1}/provider.yaml

@@ -22,12 +22,13 @@ description: |
   Common Compatibility Provider - providing compatibility code for previous Airflow versions
 
 state: ready
-source-date-epoch: 1757950105
+source-date-epoch: 1761112092
 # Note that those versions are maintained by release manager - do not update them manually
 # with the exception of case where other provider in sources has >= new provider version.
 # In such case adding >= NEW_VERSION and bumping to NEW_VERSION in a provider have
 # to be done in the same PR
 versions:
+  - 1.8.0
   - 1.7.4
   - 1.7.3
   - 1.7.2

{apache_airflow_providers_common_compat-1.7.4rc1 → apache_airflow_providers_common_compat-1.8.0rc1}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-common-compat"
-version = "1.7.4rc1"
+version = "1.8.0rc1"
 description = "Provider package apache-airflow-providers-common-compat for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -76,7 +76,6 @@ dev = [
     "apache-airflow-task-sdk",
     "apache-airflow-devel-common",
     "apache-airflow-providers-openlineage",
-    "apache-airflow-providers-standard",
     # Additional devel dependencies (do not remove this line and add extra development dependencies)
 ]
 
@@ -106,8 +105,8 @@ apache-airflow-providers-common-sql = {workspace = true}
 apache-airflow-providers-standard = {workspace = true}
 
 [project.urls]
-"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-common-compat/1.7.4"
-"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-common-compat/1.7.4/changelog.html"
+"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-common-compat/1.8.0"
+"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-common-compat/1.8.0/changelog.html"
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
 "Source Code" = "https://github.com/apache/airflow"
 "Slack Chat" = "https://s.apache.org/airflow-slack"

{apache_airflow_providers_common_compat-1.7.4rc1 → apache_airflow_providers_common_compat-1.8.0rc1}/src/airflow/providers/common/compat/__init__.py

@@ -29,7 +29,7 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "1.7.4"
+__version__ = "1.8.0"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "2.10.0"

apache_airflow_providers_common_compat-1.8.0rc1/src/airflow/providers/common/compat/_compat_utils.py

@@ -0,0 +1,105 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Reusable utilities for creating compatibility layers with fallback imports.
+
+This module provides the core machinery used by sdk.py and standard/* modules
+to handle import fallbacks between Airflow 3.x and 2.x.
+"""
+
+from __future__ import annotations
+
+import importlib
+
+
+def create_module_getattr(
+    import_map: dict[str, str | tuple[str, ...]],
+    module_map: dict[str, str | tuple[str, ...]] | None = None,
+    rename_map: dict[str, tuple[str, str, str]] | None = None,
+):
+    """
+    Create a __getattr__ function for lazy imports with fallback support.
+
+    :param import_map: Dictionary mapping attribute names to module paths (single or tuple for fallback)
+    :param module_map: Dictionary mapping module names to module paths (single or tuple for fallback)
+    :param rename_map: Dictionary mapping new names to (new_path, old_path, old_name) tuples
+    :return: A __getattr__ function that can be assigned at module level
+    """
+    module_map = module_map or {}
+    rename_map = rename_map or {}
+
+    def __getattr__(name: str):
+        # Check renamed imports first
+        if name in rename_map:
+            new_path, old_path, old_name = rename_map[name]
+
+            rename_error: ImportError | ModuleNotFoundError | AttributeError | None = None
+            # Try new path with new name first (Airflow 3.x)
+            try:
+                module = __import__(new_path, fromlist=[name])
+                return getattr(module, name)
+            except (ImportError, ModuleNotFoundError, AttributeError) as e:
+                rename_error = e
+
+            # Fall back to old path with old name (Airflow 2.x)
+            try:
+                module = __import__(old_path, fromlist=[old_name])
+                return getattr(module, old_name)
+            except (ImportError, ModuleNotFoundError, AttributeError):
+                if rename_error:
+                    raise ImportError(
+                        f"Could not import {name!r} from {new_path!r} or {old_name!r} from {old_path!r}"
+                    ) from rename_error
+                raise
+
+        # Check module imports
+        if name in module_map:
+            value = module_map[name]
+            paths = value if isinstance(value, tuple) else (value,)
+
+            module_error: ImportError | ModuleNotFoundError | None = None
+            for module_path in paths:
+                try:
+                    return importlib.import_module(module_path)
+                except (ImportError, ModuleNotFoundError) as e:
+                    module_error = e
+                    continue
+
+            if module_error:
+                raise ImportError(f"Could not import module {name!r} from any of: {paths}") from module_error
+
+        # Check regular imports
+        if name in import_map:
+            value = import_map[name]
+            paths = value if isinstance(value, tuple) else (value,)
+
+            attr_error: ImportError | ModuleNotFoundError | AttributeError | None = None
+            for module_path in paths:
+                try:
+                    module = __import__(module_path, fromlist=[name])
+                    return getattr(module, name)
+                except (ImportError, ModuleNotFoundError, AttributeError) as e:
+                    attr_error = e
+                    continue
+
+            if attr_error:
+                raise ImportError(f"Could not import {name!r} from any of: {paths}") from attr_error
+
+        raise AttributeError(f"module has no attribute {name!r}")
+
+    return __getattr__

apache_airflow_providers_common_compat-1.8.0rc1/src/airflow/providers/common/compat/sdk.py

@@ -0,0 +1,219 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""
+Airflow compatibility imports for seamless migration from Airflow 2 to Airflow 3.
+
+This module provides lazy imports that automatically try Airflow 3 paths first,
+then fall back to Airflow 2 paths, enabling code to work across both versions.
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    import airflow.sdk.io as io  # noqa: F401
+    import airflow.sdk.timezone as timezone  # noqa: F401
+    from airflow.models.xcom import XCOM_RETURN_KEY as XCOM_RETURN_KEY
+    from airflow.sdk import (
+        DAG as DAG,
+        Asset as Asset,
+        AssetAlias as AssetAlias,
+        AssetAll as AssetAll,
+        AssetAny as AssetAny,
+        BaseHook as BaseHook,
+        BaseNotifier as BaseNotifier,
+        BaseOperator as BaseOperator,
+        BaseOperatorLink as BaseOperatorLink,
+        BaseSensorOperator as BaseSensorOperator,
+        Connection as Connection,
+        Context as Context,
+        DagRunState as DagRunState,
+        EdgeModifier as EdgeModifier,
+        Label as Label,
+        Metadata as Metadata,
+        ObjectStoragePath as ObjectStoragePath,
+        Param as Param,
+        PokeReturnValue as PokeReturnValue,
+        TaskGroup as TaskGroup,
+        TaskInstanceState as TaskInstanceState,
+        TriggerRule as TriggerRule,
+        Variable as Variable,
+        WeightRule as WeightRule,
+        XComArg as XComArg,
+        chain as chain,
+        chain_linear as chain_linear,
+        cross_downstream as cross_downstream,
+        dag as dag,
+        get_current_context as get_current_context,
+        get_parsing_context as get_parsing_context,
+        setup as setup,
+        task as task,
+        task_group as task_group,
+        teardown as teardown,
+    )
+    from airflow.sdk.bases.decorator import (
+        DecoratedMappedOperator as DecoratedMappedOperator,
+        DecoratedOperator as DecoratedOperator,
+        TaskDecorator as TaskDecorator,
+        get_unique_task_id as get_unique_task_id,
+        task_decorator_factory as task_decorator_factory,
+    )
+    from airflow.sdk.bases.sensor import poke_mode_only as poke_mode_only
+    from airflow.sdk.definitions.context import context_merge as context_merge
+    from airflow.sdk.definitions.mappedoperator import MappedOperator as MappedOperator
+    from airflow.sdk.definitions.template import literal as literal
+    from airflow.sdk.execution_time.context import (
+        AIRFLOW_VAR_NAME_FORMAT_MAPPING as AIRFLOW_VAR_NAME_FORMAT_MAPPING,
+        context_to_airflow_vars as context_to_airflow_vars,
+    )
+    from airflow.sdk.execution_time.timeout import timeout as timeout
+    from airflow.sdk.execution_time.xcom import XCom as XCom
+
+from airflow.providers.common.compat._compat_utils import create_module_getattr
+
+# Rename map for classes that changed names between Airflow 2.x and 3.x
+# Format: new_name -> (new_path, old_path, old_name)
+_RENAME_MAP: dict[str, tuple[str, str, str]] = {
+    # Assets: Dataset -> Asset rename in Airflow 3.0
+    "Asset": ("airflow.sdk", "airflow.datasets", "Dataset"),
+    "AssetAlias": ("airflow.sdk", "airflow.datasets", "DatasetAlias"),
+    "AssetAll": ("airflow.sdk", "airflow.datasets", "DatasetAll"),
+    "AssetAny": ("airflow.sdk", "airflow.datasets", "DatasetAny"),
+}
+
+# Import map for classes/functions/constants
+# Format: class_name -> module_path(s)
+# - str: single module path (no fallback)
+# - tuple[str, ...]: multiple module paths (try in order, newest first)
+_IMPORT_MAP: dict[str, str | tuple[str, ...]] = {
+    # ============================================================================
+    # Hooks
+    # ============================================================================
+    "BaseHook": ("airflow.sdk", "airflow.hooks.base"),
+    # ============================================================================
+    # Sensors
+    # ============================================================================
+    "BaseSensorOperator": ("airflow.sdk", "airflow.sensors.base"),
+    "PokeReturnValue": ("airflow.sdk", "airflow.sensors.base"),
+    "poke_mode_only": ("airflow.sdk.bases.sensor", "airflow.sensors.base"),
+    # ============================================================================
+    # Operators
+    # ============================================================================
+    "BaseOperator": ("airflow.sdk", "airflow.models.baseoperator"),
+    # ============================================================================
+    # Decorators
+    # ============================================================================
+    "task": ("airflow.sdk", "airflow.decorators"),
+    "dag": ("airflow.sdk", "airflow.decorators"),
+    "task_group": ("airflow.sdk", "airflow.decorators"),
+    "setup": ("airflow.sdk", "airflow.decorators"),
+    "teardown": ("airflow.sdk", "airflow.decorators"),
+    "TaskDecorator": ("airflow.sdk.bases.decorator", "airflow.decorators"),
+    "task_decorator_factory": ("airflow.sdk.bases.decorator", "airflow.decorators.base"),
+    "get_unique_task_id": ("airflow.sdk.bases.decorator", "airflow.decorators.base"),
+    # ============================================================================
+    # Models
+    # ============================================================================
+    "Connection": ("airflow.sdk", "airflow.models.connection"),
+    "Variable": ("airflow.sdk", "airflow.models.variable"),
+    "XCom": ("airflow.sdk.execution_time.xcom", "airflow.models.xcom"),
+    "DAG": ("airflow.sdk", "airflow.models.dag"),
+    "Param": ("airflow.sdk", "airflow.models.param"),
+    "XComArg": ("airflow.sdk", "airflow.models.xcom_arg"),
+    "DecoratedOperator": ("airflow.sdk.bases.decorator", "airflow.decorators.base"),
+    "DecoratedMappedOperator": ("airflow.sdk.bases.decorator", "airflow.decorators.base"),
+    "MappedOperator": ("airflow.sdk.definitions.mappedoperator", "airflow.models.mappedoperator"),
+    # ============================================================================
+    # Assets (Dataset → Asset rename in Airflow 3.0)
+    # ============================================================================
+    # Note: Asset, AssetAlias, AssetAll, AssetAny are handled by _RENAME_MAP
+    # Metadata moved from airflow.datasets.metadata (2.x) to airflow.sdk (3.x)
+    "Metadata": ("airflow.sdk", "airflow.datasets.metadata"),
+    # ============================================================================
+    # Notifiers
+    # ============================================================================
+    "BaseNotifier": ("airflow.sdk", "airflow.notifications.basenotifier"),
+    # ============================================================================
+    # Operator Links & Task Groups
+    # ============================================================================
+    "BaseOperatorLink": ("airflow.sdk", "airflow.models.baseoperatorlink"),
+    "TaskGroup": ("airflow.sdk", "airflow.utils.task_group"),
+    # ============================================================================
+    # Operator Utilities (chain, cross_downstream, etc.)
+    # ============================================================================
+    "chain": ("airflow.sdk", "airflow.models.baseoperator"),
+    "chain_linear": ("airflow.sdk", "airflow.models.baseoperator"),
+    "cross_downstream": ("airflow.sdk", "airflow.models.baseoperator"),
+    # ============================================================================
+    # Edge Modifiers & Labels
+    # ============================================================================
+    "EdgeModifier": ("airflow.sdk", "airflow.utils.edgemodifier"),
+    "Label": ("airflow.sdk", "airflow.utils.edgemodifier"),
+    # ============================================================================
+    # State Enums
+    # ============================================================================
+    "DagRunState": ("airflow.sdk", "airflow.utils.state"),
+    "TaskInstanceState": ("airflow.sdk", "airflow.utils.state"),
+    "TriggerRule": ("airflow.sdk", "airflow.utils.trigger_rule"),
+    "WeightRule": ("airflow.sdk", "airflow.utils.weight_rule"),
+    # ============================================================================
+    # IO & Storage
+    # ============================================================================
+    "ObjectStoragePath": ("airflow.sdk", "airflow.io.path"),
+    # ============================================================================
+    # Template Utilities
+    # ============================================================================
+    "literal": ("airflow.sdk.definitions.template", "airflow.utils.template"),
+    # ============================================================================
+    # Context & Utilities
+    # ============================================================================
+    "Context": ("airflow.sdk", "airflow.utils.context"),
+    "context_merge": ("airflow.sdk.definitions.context", "airflow.utils.context"),
+    "context_to_airflow_vars": ("airflow.sdk.execution_time.context", "airflow.utils.operator_helpers"),
+    "AIRFLOW_VAR_NAME_FORMAT_MAPPING": (
+        "airflow.sdk.execution_time.context",
+        "airflow.utils.operator_helpers",
+    ),
+    "get_current_context": ("airflow.sdk", "airflow.operators.python"),
+    "get_parsing_context": ("airflow.sdk", "airflow.utils.dag_parsing_context"),
+    # ============================================================================
+    # Timeout Utilities
+    # ============================================================================
+    "timeout": ("airflow.sdk.execution_time.timeout", "airflow.utils.timeout"),
+    # ============================================================================
+    # XCom & Task Communication
+    # ============================================================================
+    "XCOM_RETURN_KEY": "airflow.models.xcom",
+}
+
+# Module map: module_name -> module_path(s)
+# For entire modules that have been moved (e.g., timezone)
+# Usage: from airflow.providers.common.compat.lazy_compat import timezone
+_MODULE_MAP: dict[str, str | tuple[str, ...]] = {
+    "timezone": ("airflow.sdk.timezone", "airflow.utils.timezone"),
+    "io": ("airflow.sdk.io", "airflow.io"),
+}
+
+# Use the shared utility to create __getattr__
+__getattr__ = create_module_getattr(
+    import_map=_IMPORT_MAP,
+    module_map=_MODULE_MAP,
+    rename_map=_RENAME_MAP,
+)
+
+__all__ = list(_RENAME_MAP.keys()) + list(_IMPORT_MAP.keys()) + list(_MODULE_MAP.keys())

apache_airflow_providers_common_compat-1.8.0rc1/src/airflow/providers/common/compat/sqlalchemy/orm.py

@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from __future__ import annotations
+
+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)

apache_airflow_providers_common_compat-1.7.4rc1/src/airflow/providers/common/compat/standard/triggers.py → apache_airflow_providers_common_compat-1.8.0rc1/src/airflow/providers/common/compat/standard/operators.py

@@ -17,15 +17,18 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from airflow.providers.common.compat._compat_utils import create_module_getattr
 
-if TYPE_CHECKING:
-    from airflow.providers.standard.triggers.temporal import TimeDeltaTrigger
-else:
-    try:
-        from airflow.providers.standard.triggers.temporal import TimeDeltaTrigger
-    except ModuleNotFoundError:
-        from airflow.triggers.temporal import TimeDeltaTrigger
+_IMPORT_MAP: dict[str, str | tuple[str, ...]] = {
+    # Re-export from sdk (which handles Airflow 2.x/3.x fallbacks)
+    "BaseOperator": "airflow.providers.common.compat.sdk",
+    "get_current_context": "airflow.providers.common.compat.sdk",
+    # Standard provider items with direct fallbacks
+    "PythonOperator": ("airflow.providers.standard.operators.python", "airflow.operators.python"),
+    "ShortCircuitOperator": ("airflow.providers.standard.operators.python", "airflow.operators.python"),
+    "_SERIALIZERS": ("airflow.providers.standard.operators.python", "airflow.operators.python"),
+}
 
+__getattr__ = create_module_getattr(import_map=_IMPORT_MAP)
 
-__all__ = ["TimeDeltaTrigger"]
+__all__ = sorted(_IMPORT_MAP.keys())

apache_airflow_providers_common_compat-1.8.0rc1/src/airflow/providers/common/compat/standard/triggers.py

@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from __future__ import annotations
+
+from airflow.providers.common.compat._compat_utils import create_module_getattr
+
+_IMPORT_MAP: dict[str, str | tuple[str, ...]] = {
+    "TimeDeltaTrigger": ("airflow.providers.standard.triggers.temporal", "airflow.triggers.temporal"),
+}
+
+__getattr__ = create_module_getattr(import_map=_IMPORT_MAP)
+
+__all__ = sorted(_IMPORT_MAP.keys())

{apache_airflow_providers_common_compat-1.7.4rc1 → apache_airflow_providers_common_compat-1.8.0rc1}/src/airflow/providers/common/compat/standard/utils.py

@@ -17,15 +17,19 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from airflow.providers.common.compat._compat_utils import create_module_getattr
 
-if TYPE_CHECKING:
-    from airflow.providers.standard.utils.python_virtualenv import prepare_virtualenv, write_python_script
-else:
-    try:
-        from airflow.providers.standard.utils.python_virtualenv import prepare_virtualenv, write_python_script
-    except ModuleNotFoundError:
-        from airflow.utils.python_virtualenv import prepare_virtualenv, write_python_script
+_IMPORT_MAP: dict[str, str | tuple[str, ...]] = {
+    "write_python_script": (
+        "airflow.providers.standard.utils.python_virtualenv",
+        "airflow.utils.python_virtualenv",
+    ),
+    "prepare_virtualenv": (
+        "airflow.providers.standard.utils.python_virtualenv",
+        "airflow.utils.python_virtualenv",
+    ),
+}
 
+__getattr__ = create_module_getattr(import_map=_IMPORT_MAP)
 
-__all__ = ["write_python_script", "prepare_virtualenv"]
+__all__ = sorted(_IMPORT_MAP.keys())