Migrate remaining providers to common.compat compatibility layer in singularity (apache#57077)

* Migrate remaining providers to common.compat compatibility layer

* remove extra modification

Author: rich7420

providers/singularity/pyproject.toml

@@ -58,6 +58,7 @@ requires-python = ">=3.10"
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
     "apache-airflow>=2.10.0",
+    "apache-airflow-providers-common-compat>=1.7.4",  # + TODO: bump to next version
     "spython>=0.0.56",
 ]
 
@@ -66,6 +67,7 @@ dev = [
     "apache-airflow",
     "apache-airflow-task-sdk",
     "apache-airflow-devel-common",
+    "apache-airflow-providers-common-compat",
     # Additional devel dependencies (do not remove this line and add extra development dependencies)
 ]
 

providers/singularity/src/airflow/providers/singularity/operators/singularity.py

@@ -26,10 +26,10 @@
 from spython.main import Client
 
 from airflow.exceptions import AirflowException
-from airflow.providers.singularity.version_compat import BaseOperator
+from airflow.providers.common.compat.sdk import BaseOperator
 
 if TYPE_CHECKING:
-    from airflow.providers.singularity.version_compat import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class SingularityOperator(BaseOperator):

providers/singularity/src/airflow/providers/singularity/version_compat.py

@@ -29,11 +29,4 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
 
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseOperator
-    from airflow.sdk.definitions.context import Context
-else:
-    from airflow.models import BaseOperator
-    from airflow.utils.context import Context
-
-__all__ = ["AIRFLOW_V_3_0_PLUS", "BaseOperator", "Context"]
+__all__ = ["AIRFLOW_V_3_0_PLUS"]