Move symlinked file to live under _shared/ in both dists

Making it clear at import time it's shared code

Author: ashb

airflow-core/src/airflow/_shared/__init__.py

@@ -0,0 +1,16 @@
+# 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.

task-sdk/src/airflow/sdk/timezone.py renamed to airflow-core/src/airflow/_shared/timezone.py

@@ -22,7 +22,7 @@
 import json
 from typing import TYPE_CHECKING
 
-from airflow import timezone
+from airflow._shared import timezone
 from airflow.exceptions import DagNotFound, DagRunAlreadyExists
 from airflow.models import DagBag, DagModel, DagRun
 from airflow.utils.session import NEW_SESSION, provide_session

airflow-core/src/airflow/api/common/trigger_dag.py

@@ -34,7 +34,7 @@
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives.serialization import load_pem_private_key
 
-from airflow import timezone
+from airflow._shared import timezone
 
 if TYPE_CHECKING:
     from jwt.algorithms import AllowedKeys, AllowedPrivateKeys

airflow-core/src/airflow/api_fastapi/auth/tokens.py

@@ -37,7 +37,7 @@
 from sqlalchemy import Column, and_, case, func, not_, or_, select
 from sqlalchemy.inspection import inspect
 
-from airflow import timezone
+from airflow._shared import timezone
 from airflow.api_fastapi.core_api.base import OrmClause
 from airflow.api_fastapi.core_api.security import GetUserDep
 from airflow.models import Base

airflow-core/src/airflow/api_fastapi/common/parameters.py

@@ -30,7 +30,7 @@
     ConfigDict,
 )
 
-from airflow import timezone
+from airflow._shared import timezone
 
 UtcDateTime = Annotated[AwareDatetime, AfterValidator(lambda d: d.astimezone(timezone.utc))]
 """UTCDateTime is a datetime with timezone information"""

airflow-core/src/airflow/api_fastapi/common/types.py

@@ -23,7 +23,7 @@
 
 from pydantic import AliasPath, AwareDatetime, Field, NonNegativeInt, model_validator
 
-from airflow import timezone
+from airflow._shared import timezone
 from airflow.api_fastapi.core_api.base import BaseModel, StrictBaseModel
 from airflow.api_fastapi.core_api.datamodels.dag_versions import DagVersionResponse
 from airflow.models import DagRun

airflow-core/src/airflow/api_fastapi/core_api/datamodels/dag_run.py

@@ -22,7 +22,7 @@
 
 from pydantic import computed_field
 
-from airflow import timezone
+from airflow._shared import timezone
 from airflow.api_fastapi.core_api.base import BaseModel
 from airflow.utils.state import TaskInstanceState
 from airflow.utils.types import DagRunType

airflow-core/src/airflow/api_fastapi/core_api/datamodels/ui/common.py

@@ -24,7 +24,7 @@
 from sqlalchemy import and_, delete, func, select
 from sqlalchemy.orm import joinedload, subqueryload
 
-from airflow import timezone
+from airflow._shared import timezone
 from airflow.api_fastapi.common.dagbag import DagBagDep
 from airflow.api_fastapi.common.db.common import SessionDep, paginated_select
 from airflow.api_fastapi.common.parameters import (

airflow-core/src/airflow/api_fastapi/core_api/routes/public/assets.py

@@ -24,7 +24,7 @@
 from sqlalchemy import select, update
 from sqlalchemy.orm import joinedload
 
-from airflow import timezone
+from airflow._shared import timezone
 from airflow.api_fastapi.auth.managers.models.resource_details import DagAccessEntity
 from airflow.api_fastapi.common.db.common import (
     SessionDep,