Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove old lineage stuff #45260

Merged
merged 4 commits into from
Jan 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,8 @@ An Operator inside the Airflow DAG can be annotated with inlets and outlets like
import pendulum

from airflow import DAG
from airflow.providers.common.compat.lineage.entities import Table, File, Column, User
from airflow.providers.standard.operators.bash import BashOperator
from airflow.lineage.entities import Table, File, Column, User


t1 = Table(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ works.
import pendulum

from airflow.lineage import AUTO
from airflow.lineage.entities import File
from airflow.models import DAG
from airflow.providers.common.compat.lineage.entities import File
from airflow.providers.standard.operators.bash import BashOperator
from airflow.operators.empty import EmptyOperator

Expand Down
4 changes: 3 additions & 1 deletion generated/provider_dependencies.json
Original file line number Diff line number Diff line change
Expand Up @@ -1047,7 +1047,9 @@
],
"devel-deps": [],
"plugins": [],
"cross-providers-deps": [],
"cross-providers-deps": [
"common.compat"
],
"excluded-python-versions": [],
"state": "ready"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
if TYPE_CHECKING:
from openlineage.client.event_v2 import Dataset

from airflow.lineage.entities import Table
from airflow.models import Operator
from airflow.providers.common.compat.lineage.entities import Table


def _iter_extractor_types() -> Iterator[type[BaseExtractor]]:
Expand Down Expand Up @@ -293,7 +293,7 @@ def convert_to_ol_dataset_from_table(table: Table) -> Dataset:
def convert_to_ol_dataset(obj) -> Dataset | None:
from openlineage.client.event_v2 import Dataset

from airflow.lineage.entities import File, Table
from airflow.providers.common.compat.lineage.entities import File, Table

if isinstance(obj, Dataset):
return obj
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import attr
import papermill as pm

from airflow.lineage.entities import File
from airflow.models import BaseOperator
from airflow.providers.common.compat.lineage.entities import File
from airflow.providers.papermill.hooks.kernel import REMOTE_KERNEL_ENGINE, KernelHook

if TYPE_CHECKING:
Expand Down
2 changes: 1 addition & 1 deletion providers/tests/openlineage/extractors/test_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
)

from airflow.io.path import ObjectStoragePath
from airflow.lineage.entities import Column, File, Table, User
from airflow.models.baseoperator import BaseOperator
from airflow.models.taskinstance import TaskInstance
from airflow.providers.common.compat.lineage.entities import Column, File, Table, User
from airflow.providers.openlineage.extractors import OperatorLineage
from airflow.providers.openlineage.extractors.manager import ExtractorManager
from airflow.providers.openlineage.utils.utils import Asset
Expand Down
2 changes: 1 addition & 1 deletion tests/lineage/test_lineage.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@

from airflow.lineage import AUTO, apply_lineage, get_backend, prepare_lineage
from airflow.lineage.backend import LineageBackend
from airflow.lineage.entities import File
from airflow.models import TaskInstance as TI
from airflow.operators.empty import EmptyOperator
from airflow.providers.common.compat.lineage.entities import File
from airflow.sdk.definitions.context import Context
from airflow.utils import timezone
from airflow.utils.types import DagRunType
Expand Down
2 changes: 1 addition & 1 deletion tests/models/test_baseoperator.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

from airflow.decorators import task as task_decorator
from airflow.exceptions import AirflowException, TaskDeferralTimeout
from airflow.lineage.entities import File
from airflow.models.baseoperator import (
BaseOperator,
chain,
Expand All @@ -37,6 +36,7 @@
from airflow.models.dagrun import DagRun
from airflow.models.taskinstance import TaskInstance
from airflow.models.trigger import TriggerFailureReason
from airflow.providers.common.compat.lineage.entities import File
from airflow.providers.common.sql.operators import sql
from airflow.utils.edgemodifier import Label
from airflow.utils.task_group import TaskGroup
Expand Down
2 changes: 1 addition & 1 deletion tests/www/views/test_views_grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
from dateutil.tz import UTC

from airflow.decorators import task_group
from airflow.lineage.entities import File
from airflow.models import DagBag
from airflow.models.asset import AssetDagRunQueue, AssetEvent, AssetModel
from airflow.operators.empty import EmptyOperator
from airflow.providers.common.compat.lineage.entities import File
from airflow.sdk.definitions.asset import Asset
from airflow.utils import timezone
from airflow.utils.state import DagRunState, TaskInstanceState
Expand Down