Skip to content

Move away from deprecated DAG.following_schedule() method #41773

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.

Sign up for GitHub

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

Merged
potiuk merged 2 commits into from
Aug 28, 2024
Merged

Move away from deprecated DAG.following_schedule() method #41773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bab867f
Move away from deprecated DAG.following_schedule() method
jscheffl Aug 26, 2024
b2739b9
Update mock to changed logic and remove one layer of Pendulum
jscheffl Aug 27, 2024
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
8 changes: 4 additions & 4 deletions airflow/providers/google/cloud/operators/gcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,11 +795,11 @@ def execute(self, context: Context) -> list[str]:
orig_end = context["data_interval_end"]
except KeyError:
orig_start = pendulum.instance(context["execution_date"])
following_execution_date = context["dag"].following_schedule(context["execution_date"])
if following_execution_date is None:
orig_end = None
next_dagrun = context["dag"].next_dagrun_info(last_automated_dagrun=None, restricted=False)
if next_dagrun and next_dagrun.data_interval and next_dagrun.data_interval.end:
orig_end = next_dagrun.data_interval.end
else:
orig_end = pendulum.instance(following_execution_date)
orig_end = None

timespan_start = orig_start
if orig_end is None: # Only possible in Airflow before 2.2.
Expand Down
22 changes: 20 additions & 2 deletions tests/providers/google/cloud/operators/test_gcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from pathlib import Path
from unittest import mock

import pendulum
import pytest

from airflow.providers.common.compat.openlineage.facet import (
Expand All @@ -40,6 +41,7 @@
GCSSynchronizeBucketsOperator,
GCSTimeSpanFileTransformOperator,
)
from airflow.timetables.base import DagRunInfo, DataInterval

TASK_ID = "test-gcs-operator"
TEST_BUCKET = "test-bucket"
Expand Down Expand Up @@ -395,7 +397,15 @@ def test_execute(self, mock_hook, mock_subprocess, mock_tempdir):
timespan_start = datetime(2015, 2, 1, 15, 16, 17, 345, tzinfo=timezone.utc)
timespan_end = timespan_start + timedelta(hours=1)
mock_dag = mock.Mock()
mock_dag.following_schedule = lambda x: x + timedelta(hours=1)
mock_dag.next_dagrun_info.side_effect = [
DagRunInfo(
run_after=pendulum.instance(timespan_start),
data_interval=DataInterval(
start=pendulum.instance(timespan_start),
end=pendulum.instance(timespan_end),
),
),
]
mock_ti = mock.Mock()
context = dict(
execution_date=timespan_start,
Expand Down Expand Up @@ -575,7 +585,15 @@ def test_get_openlineage_facets_on_complete(

timespan_start = datetime(2015, 2, 1, 15, 16, 17, 345, tzinfo=timezone.utc)
mock_dag = mock.Mock()
mock_dag.following_schedule = lambda x: x + timedelta(hours=1)
mock_dag.next_dagrun_info.side_effect = [
DagRunInfo(
run_after=pendulum.instance(timespan_start),
data_interval=DataInterval(
start=pendulum.instance(timespan_start),
end=None,
),
),
]
context = dict(
execution_date=timespan_start,
dag=mock_dag,
Expand Down