From d8cd7a92ffab87db4107d8197b9c5b9a3ab72b63 Mon Sep 17 00:00:00 2001 From: Andrey Anshin Date: Mon, 18 Dec 2023 20:14:59 +0400 Subject: [PATCH 1/4] Add support of Pendulum 3 --- airflow/models/dag.py | 6 +- .../kubernetes/pod_launcher_deprecated.py | 6 +- airflow/serialization/serialized_objects.py | 9 ++- airflow/serialization/serializers/datetime.py | 14 ++-- airflow/serialization/serializers/timezone.py | 7 +- airflow/settings.py | 11 ++- airflow/timetables/_cron.py | 10 +-- airflow/timetables/trigger.py | 18 ++++- airflow/utils/sqlalchemy.py | 5 +- airflow/utils/timezone.py | 37 +++++++-- .../test_kubernetes_pod_operator.py | 5 +- pyproject.toml | 4 +- .../endpoints/test_dag_endpoint.py | 10 +-- .../api_connexion/schemas/test_dag_schema.py | 2 +- tests/cli/commands/test_dag_command.py | 6 +- tests/models/test_dag.py | 9 ++- .../openlineage/plugins/test_utils.py | 6 +- tests/sensors/test_time_sensor.py | 19 ++--- .../serializers/test_serializers.py | 80 ++++++++++++++++++- .../serialization/test_serialized_objects.py | 2 +- tests/triggers/test_temporal.py | 6 +- tests/utils/test_timezone.py | 47 ++++++++++- 22 files changed, 229 insertions(+), 90 deletions(-) diff --git a/airflow/models/dag.py b/airflow/models/dag.py index 395898f367f9b..859d78b0ab688 100644 --- a/airflow/models/dag.py +++ b/airflow/models/dag.py @@ -139,7 +139,7 @@ if TYPE_CHECKING: from types import ModuleType - from pendulum.tz.timezone import Timezone + from pendulum.tz.timezone import FixedTimezone, Timezone from sqlalchemy.orm.query import Query from sqlalchemy.orm.session import Session @@ -214,7 +214,7 @@ def _get_model_data_interval( return DataInterval(start, end) -def create_timetable(interval: ScheduleIntervalArg, timezone: Timezone) -> Timetable: +def create_timetable(interval: ScheduleIntervalArg, timezone: Timezone | FixedTimezone) -> Timetable: """Create a Timetable instance from a ``schedule_interval`` argument.""" if interval is NOTSET: return DeltaDataIntervalTimetable(DEFAULT_SCHEDULE_INTERVAL) @@ -533,7 +533,7 @@ def __init__( tzinfo = None if date.tzinfo else settings.TIMEZONE tz = pendulum.instance(date, tz=tzinfo).timezone - self.timezone: Timezone = tz or settings.TIMEZONE + self.timezone: Timezone | FixedTimezone = tz or settings.TIMEZONE # Apply the timezone we settled on to end_date if it wasn't supplied if "end_date" in self.default_args and self.default_args["end_date"]: diff --git a/airflow/providers/cncf/kubernetes/pod_launcher_deprecated.py b/airflow/providers/cncf/kubernetes/pod_launcher_deprecated.py index 18799ed920e71..6c5f038b0abe1 100644 --- a/airflow/providers/cncf/kubernetes/pod_launcher_deprecated.py +++ b/airflow/providers/cncf/kubernetes/pod_launcher_deprecated.py @@ -21,7 +21,7 @@ import math import time import warnings -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, cast import pendulum import tenacity @@ -148,13 +148,13 @@ def monitor_pod(self, pod: V1Pod, get_logs: bool) -> tuple[State, str | None]: """ if get_logs: read_logs_since_sec = None - last_log_time = None + last_log_time: pendulum.DateTime | None = None while True: logs = self.read_pod_logs(pod, timestamps=True, since_seconds=read_logs_since_sec) for line in logs: timestamp, message = self.parse_log_line(line.decode("utf-8")) if timestamp: - last_log_time = pendulum.parse(timestamp) + last_log_time = cast(pendulum.DateTime, pendulum.parse(timestamp)) self.log.info(message) time.sleep(1) diff --git a/airflow/serialization/serialized_objects.py b/airflow/serialization/serialized_objects.py index 48aa595933466..ccd4022953b0e 100644 --- a/airflow/serialization/serialized_objects.py +++ b/airflow/serialization/serialized_objects.py @@ -65,6 +65,7 @@ from airflow.utils.module_loading import import_string, qualname from airflow.utils.operator_resources import Resources from airflow.utils.task_group import MappedTaskGroup, TaskGroup +from airflow.utils.timezone import parse_timezone from airflow.utils.types import NOTSET, ArgNotSet if TYPE_CHECKING: @@ -144,7 +145,7 @@ def decode_relativedelta(var: dict[str, Any]) -> relativedelta.relativedelta: return relativedelta.relativedelta(**var) -def encode_timezone(var: Timezone) -> str | int: +def encode_timezone(var: Timezone | FixedTimezone) -> str | int: """ Encode a Pendulum Timezone for serialization. @@ -167,9 +168,9 @@ def encode_timezone(var: Timezone) -> str | int: ) -def decode_timezone(var: str | int) -> Timezone: +def decode_timezone(var: str | int): """Decode a previously serialized Pendulum Timezone.""" - return pendulum.tz.timezone(var) + return parse_timezone(var) def _get_registered_timetable(importable_string: str) -> type[Timetable] | None: @@ -607,7 +608,7 @@ def deserialize(cls, encoded_var: Any, use_pydantic_models=False) -> Any: raise TypeError(f"Invalid type {type_!s} in deserialization.") _deserialize_datetime = pendulum.from_timestamp - _deserialize_timezone = pendulum.tz.timezone + _deserialize_timezone = parse_timezone @classmethod def _deserialize_timedelta(cls, seconds: int) -> datetime.timedelta: diff --git a/airflow/serialization/serializers/datetime.py b/airflow/serialization/serializers/datetime.py index d32dd8897bce0..69058b8c02a8b 100644 --- a/airflow/serialization/serializers/datetime.py +++ b/airflow/serialization/serializers/datetime.py @@ -24,6 +24,7 @@ serialize as serialize_timezone, ) from airflow.utils.module_loading import qualname +from airflow.utils.timezone import parse_timezone if TYPE_CHECKING: import datetime @@ -62,23 +63,22 @@ def deserialize(classname: str, version: int, data: dict | str) -> datetime.date import datetime from pendulum import DateTime - from pendulum.tz import fixed_timezone, timezone tz: datetime.tzinfo | None = None if isinstance(data, dict) and TIMEZONE in data: if version == 1: # try to deserialize unsupported timezones timezone_mapping = { - "EDT": fixed_timezone(-4 * 3600), - "CDT": fixed_timezone(-5 * 3600), - "MDT": fixed_timezone(-6 * 3600), - "PDT": fixed_timezone(-7 * 3600), - "CEST": timezone("CET"), + "EDT": parse_timezone(-4 * 3600), + "CDT": parse_timezone(-5 * 3600), + "MDT": parse_timezone(-6 * 3600), + "PDT": parse_timezone(-7 * 3600), + "CEST": parse_timezone("CET"), } if data[TIMEZONE] in timezone_mapping: tz = timezone_mapping[data[TIMEZONE]] else: - tz = timezone(data[TIMEZONE]) + tz = parse_timezone(data[TIMEZONE]) else: tz = ( deserialize_timezone(data[TIMEZONE][1], data[TIMEZONE][2], data[TIMEZONE][0]) diff --git a/airflow/serialization/serializers/timezone.py b/airflow/serialization/serializers/timezone.py index 23901b9d444e8..0f580adef83f5 100644 --- a/airflow/serialization/serializers/timezone.py +++ b/airflow/serialization/serializers/timezone.py @@ -74,7 +74,7 @@ def serialize(o: object) -> tuple[U, str, int, bool]: def deserialize(classname: str, version: int, data: object) -> Any: - from pendulum.tz import fixed_timezone, timezone + from airflow.utils.timezone import parse_timezone if not isinstance(data, (str, int)): raise TypeError(f"{data} is not of type int or str but of {type(data)}") @@ -82,9 +82,6 @@ def deserialize(classname: str, version: int, data: object) -> Any: if version > __version__: raise TypeError(f"serialized {version} of {classname} > {__version__}") - if isinstance(data, int): - return fixed_timezone(data) - if "zoneinfo.ZoneInfo" in classname: try: from zoneinfo import ZoneInfo @@ -93,7 +90,7 @@ def deserialize(classname: str, version: int, data: object) -> Any: return ZoneInfo(data) - return timezone(data) + return parse_timezone(data) # ported from pendulum.tz.timezone._get_tzinfo_name diff --git a/airflow/settings.py b/airflow/settings.py index 773f83caf8720..a1b9c32a99423 100644 --- a/airflow/settings.py +++ b/airflow/settings.py @@ -26,7 +26,6 @@ import warnings from typing import TYPE_CHECKING, Any, Callable -import pendulum import pluggy from sqlalchemy import create_engine, exc, text from sqlalchemy.orm import scoped_session, sessionmaker @@ -39,6 +38,7 @@ from airflow.logging_config import configure_logging from airflow.utils.orm_event_handlers import setup_event_handlers from airflow.utils.state import State +from airflow.utils.timezone import local_timezone, parse_timezone, utc if TYPE_CHECKING: from sqlalchemy.engine import Engine @@ -49,13 +49,12 @@ log = logging.getLogger(__name__) try: - tz = conf.get_mandatory_value("core", "default_timezone") - if tz == "system": - TIMEZONE = pendulum.tz.local_timezone() + if (tz := conf.get_mandatory_value("core", "default_timezone")) != "system": + TIMEZONE = parse_timezone(tz) else: - TIMEZONE = pendulum.tz.timezone(tz) + TIMEZONE = local_timezone() except Exception: - TIMEZONE = pendulum.tz.timezone("UTC") + TIMEZONE = utc log.info("Configured default timezone %s", TIMEZONE) diff --git a/airflow/timetables/_cron.py b/airflow/timetables/_cron.py index 45bfe3640fed5..15e4f820ea8fc 100644 --- a/airflow/timetables/_cron.py +++ b/airflow/timetables/_cron.py @@ -19,17 +19,15 @@ import datetime from typing import TYPE_CHECKING, Any -import pendulum from cron_descriptor import CasingTypeEnum, ExpressionDescriptor, FormatException, MissingFieldException from croniter import CroniterBadCronError, CroniterBadDateError, croniter from airflow.exceptions import AirflowTimetableInvalid from airflow.utils.dates import cron_presets -from airflow.utils.timezone import convert_to_utc, make_aware, make_naive +from airflow.utils.timezone import convert_to_utc, make_aware, make_naive, parse_timezone if TYPE_CHECKING: - from pendulum import DateTime - from pendulum.tz.timezone import Timezone + from pendulum import DateTime, FixedTimezone, Timezone def _covers_every_hour(cron: croniter) -> bool: @@ -63,11 +61,11 @@ def _covers_every_hour(cron: croniter) -> bool: class CronMixin: """Mixin to provide interface to work with croniter.""" - def __init__(self, cron: str, timezone: str | Timezone) -> None: + def __init__(self, cron: str, timezone: str | Timezone | FixedTimezone) -> None: self._expression = cron_presets.get(cron, cron) if isinstance(timezone, str): - timezone = pendulum.tz.timezone(timezone) + timezone = parse_timezone(timezone) self._timezone = timezone try: diff --git a/airflow/timetables/trigger.py b/airflow/timetables/trigger.py index 95d29238037c4..2a0df645dacaa 100644 --- a/airflow/timetables/trigger.py +++ b/airflow/timetables/trigger.py @@ -26,7 +26,7 @@ if TYPE_CHECKING: from dateutil.relativedelta import relativedelta - from pendulum.tz.timezone import Timezone + from pendulum.tz.timezone import FixedTimezone, Timezone from airflow.timetables.base import TimeRestriction @@ -48,7 +48,7 @@ def __init__( self, cron: str, *, - timezone: str | Timezone, + timezone: str | Timezone | FixedTimezone, interval: datetime.timedelta | relativedelta = datetime.timedelta(), ) -> None: super().__init__(cron, timezone) @@ -77,7 +77,12 @@ def serialize(self) -> dict[str, Any]: return {"expression": self._expression, "timezone": timezone, "interval": interval} def infer_manual_data_interval(self, *, run_after: DateTime) -> DataInterval: - return DataInterval(run_after - self._interval, run_after) + return DataInterval( + # pendulum.Datetime ± timedelta should return pendulum.Datetime + # however mypy decide that output would be datetime.datetime + run_after - self._interval, # type: ignore[arg-type] + run_after, + ) def next_dagrun_info( self, @@ -101,4 +106,9 @@ def next_dagrun_info( next_start_time = max(start_time_candidates) if restriction.latest is not None and restriction.latest < next_start_time: return None - return DagRunInfo.interval(next_start_time - self._interval, next_start_time) + return DagRunInfo.interval( + # pendulum.Datetime ± timedelta should return pendulum.Datetime + # however mypy decide that output would be datetime.datetime + next_start_time - self._interval, # type: ignore[arg-type] + next_start_time, + ) diff --git a/airflow/utils/sqlalchemy.py b/airflow/utils/sqlalchemy.py index d335ab940df40..9d9b248ec7c1b 100644 --- a/airflow/utils/sqlalchemy.py +++ b/airflow/utils/sqlalchemy.py @@ -24,7 +24,6 @@ import logging from typing import TYPE_CHECKING, Any, Generator, Iterable, overload -import pendulum from dateutil import relativedelta from sqlalchemy import TIMESTAMP, PickleType, event, nullsfirst, tuple_ from sqlalchemy.dialects import mysql @@ -32,7 +31,7 @@ from airflow.configuration import conf from airflow.serialization.enums import Encoding -from airflow.utils.timezone import make_naive +from airflow.utils.timezone import make_naive, utc if TYPE_CHECKING: from kubernetes.client.models.v1_pod import V1Pod @@ -44,8 +43,6 @@ log = logging.getLogger(__name__) -utc = pendulum.tz.timezone("UTC") - class UtcDateTime(TypeDecorator): """ diff --git a/airflow/utils/timezone.py b/airflow/utils/timezone.py index 12c75bef5976b..fb32c093f84c4 100644 --- a/airflow/utils/timezone.py +++ b/airflow/utils/timezone.py @@ -23,9 +23,10 @@ import pendulum from dateutil.relativedelta import relativedelta from pendulum.datetime import DateTime +from pendulum.tz.timezone import FixedTimezone, Timezone # UTC time zone as a tzinfo instance. -utc = pendulum.tz.timezone("UTC") +utc = Timezone("UTC") def is_localized(value): @@ -135,12 +136,10 @@ def make_aware(value: dt.datetime | None, timezone: dt.tzinfo | None = None) -> # Check that we won't overwrite the timezone of an aware datetime. if is_localized(value): raise ValueError(f"make_aware expects a naive datetime, got {value}") - if hasattr(value, "fold"): - # In case of python 3.6 we want to do the same that pendulum does for python3.5 - # i.e in case we move clock back we want to schedule the run at the time of the second - # instance of the same clock time rather than the first one. - # Fold parameter has no impact in other cases so we can safely set it to 1 here - value = value.replace(fold=1) + # In case we move clock back we want to schedule the run at the time of the second + # instance of the same clock time rather than the first one. + # Fold parameter has no impact in other cases, so we can safely set it to 1 here + value = value.replace(fold=1) localized = getattr(timezone, "localize", None) if localized is not None: # This method is available for pytz time zones @@ -273,3 +272,27 @@ def _format_part(key: str) -> str: if not joined: return "<1s" return joined + + +def parse_timezone(name: str | int) -> FixedTimezone | Timezone: + """ + Parse timezone and return one of the pendulum Timezone. + + Provide the same interface as ``pendulum.timezone(name)`` + + :param name: Either IANA timezone or offset to UTC in seconds. + + :meta private: + """ + return pendulum.timezone(name) + + +def local_timezone() -> FixedTimezone | Timezone: + """ + Return local timezone. + + Provide the same interface as ``pendulum.tz.local_timezone()`` + + :meta private: + """ + return pendulum.tz.local_timezone() diff --git a/kubernetes_tests/test_kubernetes_pod_operator.py b/kubernetes_tests/test_kubernetes_pod_operator.py index 13ae3835aad51..eb50adda687ed 100644 --- a/kubernetes_tests/test_kubernetes_pod_operator.py +++ b/kubernetes_tests/test_kubernetes_pod_operator.py @@ -26,7 +26,6 @@ from unittest.mock import ANY, MagicMock from uuid import uuid4 -import pendulum import pytest from kubernetes import client from kubernetes.client import V1EnvVar, V1PodSecurityContext, V1SecurityContext, models as k8s @@ -53,7 +52,9 @@ def create_context(task) -> Context: dag = DAG(dag_id="dag") - execution_date = timezone.datetime(2016, 1, 1, 1, 0, 0, tzinfo=pendulum.tz.timezone("Europe/Amsterdam")) + execution_date = timezone.datetime( + 2016, 1, 1, 1, 0, 0, tzinfo=timezone.parse_timezone("Europe/Amsterdam") + ) dag_run = DagRun( dag_id=dag.dag_id, execution_date=execution_date, diff --git a/pyproject.toml b/pyproject.toml index 65730eac15df4..e9d31bd893549 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -119,9 +119,7 @@ dependencies = [ "opentelemetry-exporter-otlp", "packaging>=14.0", "pathspec>=0.9.0", - # When (if) pendulum 3 released it would introduce changes in module/objects imports, - # since we are tightly coupled with pendulum library internally it will breaks Airflow functionality. - "pendulum>=2.0,<3.0", + "pendulum>=3.0,<4.0", "pluggy>=1.0", "psutil>=4.2.0", "pydantic>=2.3.0", diff --git a/tests/api_connexion/endpoints/test_dag_endpoint.py b/tests/api_connexion/endpoints/test_dag_endpoint.py index c02e8b0ff3fca..19504b8894678 100644 --- a/tests/api_connexion/endpoints/test_dag_endpoint.py +++ b/tests/api_connexion/endpoints/test_dag_endpoint.py @@ -316,7 +316,7 @@ def test_should_respond_200(self, url_safe_serializer): "tags": [], "template_searchpath": None, "timetable_description": None, - "timezone": "Timezone('UTC')", + "timezone": "UTC", } assert response.json == expected @@ -367,7 +367,7 @@ def test_should_response_200_with_doc_md_none(self, url_safe_serializer): "tags": [], "template_searchpath": None, "timetable_description": None, - "timezone": "Timezone('UTC')", + "timezone": "UTC", } assert response.json == expected @@ -418,7 +418,7 @@ def test_should_response_200_for_null_start_date(self, url_safe_serializer): "tags": [], "template_searchpath": None, "timetable_description": None, - "timezone": "Timezone('UTC')", + "timezone": "UTC", } assert response.json == expected @@ -478,7 +478,7 @@ def test_should_respond_200_serialized(self, url_safe_serializer): "tags": [], "template_searchpath": None, "timetable_description": None, - "timezone": "Timezone('UTC')", + "timezone": "UTC", } response = self.client.get( f"/api/v1/dags/{self.dag_id}/details", environ_overrides={"REMOTE_USER": "test"} @@ -539,7 +539,7 @@ def test_should_respond_200_serialized(self, url_safe_serializer): "tags": [], "template_searchpath": None, "timetable_description": None, - "timezone": "Timezone('UTC')", + "timezone": "UTC", } expected.update({"last_parsed": response.json["last_parsed"]}) assert response.json == expected diff --git a/tests/api_connexion/schemas/test_dag_schema.py b/tests/api_connexion/schemas/test_dag_schema.py index f3e54c0a96119..4d3f5abfd1b24 100644 --- a/tests/api_connexion/schemas/test_dag_schema.py +++ b/tests/api_connexion/schemas/test_dag_schema.py @@ -184,7 +184,7 @@ def test_serialize_test_dag_detail_schema(url_safe_serializer): "start_date": "2020-06-19T00:00:00+00:00", "tags": [{"name": "example1"}, {"name": "example2"}], "template_searchpath": None, - "timezone": "Timezone('UTC')", + "timezone": "UTC", "max_active_runs": 16, "pickle_id": None, "end_date": None, diff --git a/tests/cli/commands/test_dag_command.py b/tests/cli/commands/test_dag_command.py index 0518e35b0d1ad..6bd94b29233bc 100644 --- a/tests/cli/commands/test_dag_command.py +++ b/tests/cli/commands/test_dag_command.py @@ -162,7 +162,7 @@ def test_backfill(self, mock_run): ) output = stdout.getvalue() - assert f"Dry run of DAG example_bash_operator on {DEFAULT_DATE.isoformat()}\n" in output + assert f"Dry run of DAG example_bash_operator on {DEFAULT_DATE.isoformat(sep=' ')}\n" in output assert "Task runme_0 located in DAG example_bash_operator\n" in output mock_run.assert_not_called() # Dry run shouldn't run the backfill @@ -237,10 +237,10 @@ def test_backfill(self, mock_run): assert ( f"Dry run of DAG example_branch_python_operator_decorator on " - f"{DEFAULT_DATE.isoformat()}\n" in output + f"{DEFAULT_DATE.isoformat(sep=' ')}\n" in output ) assert "Task run_this_first located in DAG example_branch_python_operator_decorator\n" in output - assert f"Dry run of DAG example_branch_operator on {DEFAULT_DATE.isoformat()}\n" in output + assert f"Dry run of DAG example_branch_operator on {DEFAULT_DATE.isoformat(sep=' ')}\n" in output assert "Task run_this_first located in DAG example_branch_operator\n" in output @mock.patch("airflow.cli.commands.dag_command.get_dag") diff --git a/tests/models/test_dag.py b/tests/models/test_dag.py index f7bf1ad6d0c91..de7fa87d5add7 100644 --- a/tests/models/test_dag.py +++ b/tests/models/test_dag.py @@ -37,6 +37,7 @@ import pytest import time_machine from dateutil.relativedelta import relativedelta +from pendulum.tz.timezone import Timezone from sqlalchemy import inspect from airflow import settings @@ -676,8 +677,8 @@ def test_following_previous_schedule(self): """ Make sure DST transitions are properly observed """ - local_tz = pendulum.timezone("Europe/Zurich") - start = local_tz.convert(datetime.datetime(2018, 10, 28, 2, 55), dst_rule=pendulum.PRE_TRANSITION) + local_tz = Timezone("Europe/Zurich") + start = local_tz.convert(datetime.datetime(2018, 10, 28, 2, 55, fold=0)) assert start.isoformat() == "2018-10-28T02:55:00+02:00", "Pre-condition: start date is in DST" utc = timezone.convert_to_utc(start) @@ -706,7 +707,7 @@ def test_following_previous_schedule_daily_dag_cest_to_cet(self): Make sure DST transitions are properly observed """ local_tz = pendulum.timezone("Europe/Zurich") - start = local_tz.convert(datetime.datetime(2018, 10, 27, 3), dst_rule=pendulum.PRE_TRANSITION) + start = local_tz.convert(datetime.datetime(2018, 10, 27, 3, fold=0)) utc = timezone.convert_to_utc(start) @@ -735,7 +736,7 @@ def test_following_previous_schedule_daily_dag_cet_to_cest(self): Make sure DST transitions are properly observed """ local_tz = pendulum.timezone("Europe/Zurich") - start = local_tz.convert(datetime.datetime(2018, 3, 25, 2), dst_rule=pendulum.PRE_TRANSITION) + start = local_tz.convert(datetime.datetime(2018, 3, 25, 2, fold=0)) utc = timezone.convert_to_utc(start) diff --git a/tests/providers/openlineage/plugins/test_utils.py b/tests/providers/openlineage/plugins/test_utils.py index 54710bcd9e47a..b7ced7a37cb47 100644 --- a/tests/providers/openlineage/plugins/test_utils.py +++ b/tests/providers/openlineage/plugins/test_utils.py @@ -23,7 +23,6 @@ from json import JSONEncoder from typing import Any -import pendulum import pytest from attrs import define from openlineage.client.utils import RedactMixin @@ -39,6 +38,7 @@ to_json_encodable, url_to_https, ) +from airflow.utils import timezone from airflow.utils.log.secrets_masker import _secrets_masker from airflow.utils.state import State @@ -86,8 +86,8 @@ def test_get_dagrun_start_end(): state=State.NONE, run_id=run_id, data_interval=dag.get_next_data_interval(dag_model) ) assert dagrun.data_interval_start is not None - start_date_tz = datetime.datetime(2022, 1, 1, tzinfo=pendulum.tz.timezone("UTC")) - end_date_tz = datetime.datetime(2022, 1, 1, hour=2, tzinfo=pendulum.tz.timezone("UTC")) + start_date_tz = datetime.datetime(2022, 1, 1, tzinfo=timezone.utc) + end_date_tz = datetime.datetime(2022, 1, 1, hour=2, tzinfo=timezone.utc) assert dagrun.data_interval_start, dagrun.data_interval_end == (start_date_tz, end_date_tz) diff --git a/tests/sensors/test_time_sensor.py b/tests/sensors/test_time_sensor.py index 935d1cb128176..54a0212a247a9 100644 --- a/tests/sensors/test_time_sensor.py +++ b/tests/sensors/test_time_sensor.py @@ -18,12 +18,10 @@ from __future__ import annotations from datetime import datetime, time -from unittest.mock import patch import pendulum import pytest import time_machine -from pendulum.tz.timezone import UTC from airflow.exceptions import TaskDeferred from airflow.models.dag import DAG @@ -33,7 +31,7 @@ DEFAULT_TIMEZONE = "Asia/Singapore" # UTC+08:00 DEFAULT_DATE_WO_TZ = datetime(2015, 1, 1) -DEFAULT_DATE_WITH_TZ = datetime(2015, 1, 1, tzinfo=pendulum.tz.timezone(DEFAULT_TIMEZONE)) +DEFAULT_DATE_WITH_TZ = datetime(2015, 1, 1, tzinfo=timezone.parse_timezone(DEFAULT_TIMEZONE)) class TestTimeSensor: @@ -46,11 +44,11 @@ class TestTimeSensor: ], ) @time_machine.travel(timezone.datetime(2020, 1, 1, 23, 0).replace(tzinfo=timezone.utc)) - def test_timezone(self, default_timezone, start_date, expected): - with patch("airflow.settings.TIMEZONE", pendulum.timezone(default_timezone)): - dag = DAG("test", default_args={"start_date": start_date}) - op = TimeSensor(task_id="test", target_time=time(10, 0), dag=dag) - assert op.poke(None) == expected + def test_timezone(self, default_timezone, start_date, expected, monkeypatch): + monkeypatch.setattr("airflow.settings.TIMEZONE", timezone.parse_timezone(default_timezone)) + dag = DAG("test", default_args={"start_date": start_date}) + op = TimeSensor(task_id="test", target_time=time(10, 0), dag=dag) + assert op.poke(None) == expected class TestTimeSensorAsync: @@ -72,8 +70,7 @@ def test_target_time_aware(self): with DAG("test_target_time_aware", start_date=timezone.datetime(2020, 1, 1, 23, 0)): aware_time = time(0, 1).replace(tzinfo=pendulum.local_timezone()) op = TimeSensorAsync(task_id="test", target_time=aware_time) - assert hasattr(op.target_datetime.tzinfo, "offset") - assert op.target_datetime.tzinfo.offset == 0 + assert op.target_datetime.tzinfo == timezone.utc def test_target_time_naive_dag_timezone(self): """ @@ -85,4 +82,4 @@ def test_target_time_naive_dag_timezone(self): ): op = TimeSensorAsync(task_id="test", target_time=pendulum.time(9, 0)) assert op.target_datetime.time() == pendulum.time(1, 0) - assert op.target_datetime.tzinfo == UTC + assert op.target_datetime.tzinfo == timezone.utc diff --git a/tests/serialization/serializers/test_serializers.py b/tests/serialization/serializers/test_serializers.py index 32e9787ccf6a6..5099bbfbcd5fe 100644 --- a/tests/serialization/serializers/test_serializers.py +++ b/tests/serialization/serializers/test_serializers.py @@ -21,11 +21,13 @@ from unittest.mock import patch import numpy as np +import pendulum import pendulum.tz import pytest from dateutil.tz import tzutc from deltalake import DeltaTable -from pendulum import DateTime +from pendulum import DateTime, Timezone +from pendulum.tz.timezone import FixedTimezone from pyiceberg.catalog import Catalog from pyiceberg.io import FileIO from pyiceberg.table import Table @@ -39,6 +41,8 @@ else: from backports.zoneinfo import ZoneInfo +PENDULUM3 = pendulum.__version__.startswith("3") + class TestSerializers: def test_datetime(self): @@ -227,3 +231,77 @@ def test_deltalake(self, mock_table_uri, mock_version, mock_deltalake, mock_meta assert i.version() == d.version() assert i._storage_options == d._storage_options assert d._storage_options is None + + @pytest.mark.skipif(not PENDULUM3, reason="Test case for pendulum~=3") + @pytest.mark.parametrize( + "ser_value, expected", + [ + pytest.param( + { + "__classname__": "pendulum.datetime.DateTime", + "__version__": 2, + "__data__": { + "timestamp": 1680307200.0, + "tz": { + "__classname__": "builtins.tuple", + "__version__": 1, + "__data__": ["UTC", "pendulum.tz.timezone.FixedTimezone", 1, True], + }, + }, + }, + pendulum.datetime(2023, 4, 1, tz=Timezone("UTC")), + id="in-utc-timezone", + ), + pytest.param( + { + "__classname__": "pendulum.datetime.DateTime", + "__version__": 2, + "__data__": { + "timestamp": 1680292800.0, + "tz": { + "__classname__": "builtins.tuple", + "__version__": 1, + "__data__": ["Asia/Tbilisi", "pendulum.tz.timezone.Timezone", 1, True], + }, + }, + }, + pendulum.datetime(2023, 4, 1, tz=Timezone("Asia/Tbilisi")), + id="non-dts-timezone", + ), + pytest.param( + { + "__classname__": "pendulum.datetime.DateTime", + "__version__": 2, + "__data__": { + "timestamp": 1680303600.0, + "tz": { + "__classname__": "builtins.tuple", + "__version__": 1, + "__data__": ["Europe/London", "pendulum.tz.timezone.Timezone", 1, True], + }, + }, + }, + pendulum.datetime(2023, 4, 1, tz=Timezone("Europe/London")), + id="dts-timezone", + ), + pytest.param( + { + "__classname__": "pendulum.datetime.DateTime", + "__version__": 2, + "__data__": { + "timestamp": 1680310800.0, + "tz": { + "__classname__": "builtins.tuple", + "__version__": 1, + "__data__": [-3600, "pendulum.tz.timezone.FixedTimezone", 1, True], + }, + }, + }, + pendulum.datetime(2023, 4, 1, tz=FixedTimezone(-3600)), + id="offset-timezone", + ), + ], + ) + def test_pendulum_2_to_3(self, ser_value, expected): + """Test deserialize objects in pendulum 3 which serialised in pendulum 2.""" + assert deserialize(ser_value) == expected diff --git a/tests/serialization/test_serialized_objects.py b/tests/serialization/test_serialized_objects.py index c059a8d236e79..96b196357991a 100644 --- a/tests/serialization/test_serialized_objects.py +++ b/tests/serialization/test_serialized_objects.py @@ -142,7 +142,7 @@ def equal_time(a: datetime, b: datetime) -> bool: (1, None, equals), (datetime.utcnow(), DAT.DATETIME, equal_time), (timedelta(minutes=2), DAT.TIMEDELTA, equals), - (pendulum.tz.timezone("UTC"), DAT.TIMEZONE, lambda a, b: a.name == b.name), + (pendulum.tz.Timezone("UTC"), DAT.TIMEZONE, lambda a, b: a.name == b.name), (relativedelta.relativedelta(hours=+1), DAT.RELATIVEDELTA, lambda a, b: a.hours == b.hours), ({"test": "dict", "test-1": 1}, None, equals), (["array_item", 2], None, equals), diff --git a/tests/triggers/test_temporal.py b/tests/triggers/test_temporal.py index 655910394fb8c..52cc2c64f6736 100644 --- a/tests/triggers/test_temporal.py +++ b/tests/triggers/test_temporal.py @@ -64,9 +64,9 @@ def test_timedelta_trigger_serialization(): @pytest.mark.parametrize( "tz", [ - pendulum.tz.timezone("UTC"), - pendulum.tz.timezone("Europe/Paris"), - pendulum.tz.timezone("America/Toronto"), + timezone.parse_timezone("UTC"), + timezone.parse_timezone("Europe/Paris"), + timezone.parse_timezone("America/Toronto"), ], ) @pytest.mark.asyncio diff --git a/tests/utils/test_timezone.py b/tests/utils/test_timezone.py index ff5ad26f5a31d..df8af04604234 100644 --- a/tests/utils/test_timezone.py +++ b/tests/utils/test_timezone.py @@ -21,13 +21,14 @@ import pendulum import pytest +from pendulum.tz.timezone import Timezone from airflow.utils import timezone -from airflow.utils.timezone import coerce_datetime +from airflow.utils.timezone import coerce_datetime, parse_timezone -CET = pendulum.tz.timezone("Europe/Paris") -EAT = pendulum.tz.timezone("Africa/Nairobi") # Africa/Nairobi -ICT = pendulum.tz.timezone("Asia/Bangkok") # Asia/Bangkok +CET = Timezone("Europe/Paris") +EAT = Timezone("Africa/Nairobi") # Africa/Nairobi +ICT = Timezone("Asia/Bangkok") # Asia/Bangkok UTC = timezone.utc @@ -117,3 +118,41 @@ def test_td_format(self): ) def test_coerce_datetime(input_datetime, output_datetime): assert output_datetime == coerce_datetime(input_datetime) + + +@pytest.mark.parametrize( + "tz_name", + [ + pytest.param("Europe/Paris", id="CET"), + pytest.param("Africa/Nairobi", id="EAT"), + pytest.param("Asia/Bangkok", id="ICT"), + ], +) +def test_parse_timezone_iana(tz_name: str): + tz = parse_timezone(tz_name) + assert tz.name == tz_name + assert parse_timezone(tz_name) is tz + + +@pytest.mark.parametrize("tz_name", ["utc", "UTC", "uTc"]) +def test_parse_timezone_utc(tz_name): + tz = parse_timezone(tz_name) + assert tz.name == "UTC" + assert parse_timezone(tz_name) is tz + assert tz is timezone.utc, "Expected that UTC timezone is same object as `airflow.utils.timezone.utc`" + + +@pytest.mark.parametrize( + "tz_offset, expected_offset, expected_name", + [ + pytest.param(0, 0, "+00:00", id="zero-offset"), + pytest.param(-3600, -3600, "-01:00", id="1-hour-behind"), + pytest.param(19800, 19800, "+05:30", id="5.5-hours-ahead"), + ], +) +def test_parse_timezone_offset(tz_offset: int, expected_offset, expected_name): + tz = parse_timezone(tz_offset) + assert hasattr(tz, "offset") + assert tz.offset == expected_offset + assert tz.name == expected_name + assert parse_timezone(tz_offset) is tz From 63ddfd5bae9b24dac9448a3e227403c4917c7210 Mon Sep 17 00:00:00 2001 From: Andrey Anshin Date: Sat, 23 Dec 2023 18:23:34 +0400 Subject: [PATCH 2/4] Add backcompat to pendulum 2 --- .github/workflows/ci.yml | 92 ++++++++++++++++++- Dockerfile.ci | 13 +++ airflow/timetables/_cron.py | 3 +- airflow/utils/timezone.py | 19 +++- .../airflow_breeze/commands/common_options.py | 6 ++ .../commands/developer_commands.py | 4 + .../commands/developer_commands_config.py | 1 + .../commands/testing_commands.py | 6 ++ .../commands/testing_commands_config.py | 3 + .../src/airflow_breeze/params/shell_params.py | 2 + images/breeze/output_shell.svg | 44 +++++---- images/breeze/output_shell.txt | 2 +- images/breeze/output_testing_db-tests.svg | 26 +++--- images/breeze/output_testing_db-tests.txt | 2 +- images/breeze/output_testing_non-db-tests.svg | 26 +++--- images/breeze/output_testing_non-db-tests.txt | 2 +- images/breeze/output_testing_tests.svg | 26 +++--- images/breeze/output_testing_tests.txt | 2 +- pyproject.toml | 2 +- scripts/ci/docker-compose/devcontainer.env | 1 + scripts/docker/entrypoint_ci.sh | 14 +++ .../endpoints/test_dag_endpoint.py | 12 ++- .../api_connexion/schemas/test_dag_schema.py | 5 +- tests/cli/commands/test_dag_command.py | 13 +-- .../serializers/test_serializers.py | 78 +++++++++++++++- .../serialization/test_serialized_objects.py | 4 +- 26 files changed, 326 insertions(+), 82 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b3bbb8c0d4a00..45c2ccf7ef36c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1166,11 +1166,61 @@ jobs: breeze testing db-tests --parallel-test-types "${{needs.build-info.outputs.parallel-test-types-list-as-string}}" - name: > - Post Tests success: ${{needs.build-info.outputs.default-python-version}}:Boto" + Post Tests success: ${{needs.build-info.outputs.default-python-version}}:MinSQLAlchemy" uses: ./.github/actions/post_tests_success if: success() - name: > - Post Tests failure: ${{needs.build-info.outputs.default-python-version}}:Boto" + Post Tests failure: ${{needs.build-info.outputs.default-python-version}}:MinSQLAlchemy" + uses: ./.github/actions/post_tests_failure + if: failure() + + tests-postgres-pendulum-2: + timeout-minutes: 130 + name: > + DB:Postgres${{needs.build-info.outputs.default-postgres-version}}, + Pendulum2,Py${{needs.build-info.outputs.default-python-version}}: + ${{needs.build-info.outputs.parallel-test-types-list-as-string}} + runs-on: ${{fromJSON(needs.build-info.outputs.runs-on)}} + needs: [build-info, wait-for-ci-images] + env: + RUNS_ON: "${{needs.build-info.outputs.runs-on}}" + PARALLEL_TEST_TYPES: "${{needs.build-info.outputs.parallel-test-types-list-as-string}}" + PR_LABELS: "${{needs.build-info.outputs.pull-request-labels}}" + FULL_TESTS_NEEDED: "${{needs.build-info.outputs.full-tests-needed}}" + DEBUG_RESOURCES: "${{needs.build-info.outputs.debug-resources}}" + BACKEND: "postgres" + ENABLE_COVERAGE: "${{needs.build-info.outputs.run-coverage}}" + PYTHON_MAJOR_MINOR_VERSION: "${{needs.build-info.outputs.default-python-version}}" + PYTHON_VERSION: "${needs.build-info.outputs.default-python-version}}" + POSTGRES_VERSION: "${{needs.build-info.outputs.default-postgres-version}}" + BACKEND_VERSION: "${{needs.build-info.outputs.default-postgres-version}}" + DOWNGRADE_PENDULUM: "true" + JOB_ID: > + postgres-pendulum-2-${{needs.build-info.outputs.default-python-version}}- + ${{needs.build-info.outputs.default-postgres-version}} + if: needs.build-info.outputs.run-tests == 'true' + steps: + - name: Cleanup repo + shell: bash + run: docker run -v "${GITHUB_WORKSPACE}:/workspace" -u 0:0 bash -c "rm -rf /workspace/*" + - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" + uses: actions/checkout@v4 + with: + persist-credentials: false + - name: > + Prepare breeze & CI image: ${{needs.build-info.outputs.default-python-version}}:${{env.IMAGE_TAG}} + uses: ./.github/actions/prepare_breeze_and_image + - name: > + Tests: ${{matrix.python-version}}:${{needs.build-info.outputs.parallel-test-types-list-as-string}} + run: > + breeze testing db-tests + --parallel-test-types "${{needs.build-info.outputs.parallel-test-types-list-as-string}}" + - name: > + Post Tests success: ${{needs.build-info.outputs.default-python-version}}:Pendulum2" + uses: ./.github/actions/post_tests_success + if: success() + - name: > + Post Tests failure: ${{needs.build-info.outputs.default-python-version}}:Pendulum2" uses: ./.github/actions/post_tests_failure if: failure() @@ -1542,6 +1592,44 @@ jobs: uses: ./.github/actions/post_tests_failure if: failure() + tests-no-db-pendulum-2: + timeout-minutes: 60 + name: > + Non-DB: Pendulum2, Py${{needs.build-info.outputs.default-python-version}}: + ${{needs.build-info.outputs.parallel-test-types-list-as-string}} + runs-on: ${{fromJSON(needs.build-info.outputs.runs-on)}} + needs: [build-info, wait-for-ci-images] + env: + RUNS_ON: "${{needs.build-info.outputs.runs-on}}" + PR_LABELS: "${{needs.build-info.outputs.pull-request-labels}}" + PYTHON_MAJOR_MINOR_VERSION: "${{needs.build-info.outputs.default-python-version}}" + DEBUG_RESOURCES: "${{needs.build-info.outputs.debug-resources}}" + JOB_ID: "quarantined-${{needs.build-info.outputs.default-python-version}}" + ENABLE_COVERAGE: "${{needs.build-info.outputs.run-coverage}}" + DOWNGRADE_PENDULUM: "true" + if: needs.build-info.outputs.run-tests == 'true' + steps: + - name: Cleanup repo + shell: bash + run: docker run -v "${GITHUB_WORKSPACE}:/workspace" -u 0:0 bash -c "rm -rf /workspace/*" + - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" + uses: actions/checkout@v4 + with: + persist-credentials: false + - name: > + Prepare breeze & CI image: ${{needs.build-info.outputs.default-python-version}}:${{env.IMAGE_TAG}} + uses: ./.github/actions/prepare_breeze_and_image + - name: "Tests: ${{matrix.python-version}}:Non-DB-Pendulum2" + run: > + breeze testing non-db-tests + --parallel-test-types "${{needs.build-info.outputs.parallel-test-types-list-as-string}}" + - name: "Post Tests success: Non-DB-Pendulum2" + uses: ./.github/actions/post_tests_success + if: success() + - name: "Post Tests failure: Non-DB-Pendulum2" + uses: ./.github/actions/post_tests_failure + if: failure() + summarize-warnings: timeout-minutes: 15 name: "Summarize warnings" diff --git a/Dockerfile.ci b/Dockerfile.ci index 8e32b09a71460..8d8aef97c408b 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -909,6 +909,18 @@ function check_download_sqlalchemy() { pip check } +function check_download_pendulum() { + if [[ ${DOWNGRADE_PENDULUM=} != "true" ]]; then + return + fi + min_pendulum_version=$(grep "\"pendulum>=" pyproject.toml | sed "s/.*>=\([0-9\.]*\).*/\1/" | xargs) + echo + echo "${COLOR_BLUE}Downgrading pendulum to minimum supported version: ${min_pendulum_version}${COLOR_RESET}" + echo + pip install --root-user-action ignore "pendulum==${min_pendulum_version}" + pip check +} + function check_run_tests() { if [[ ${RUN_TESTS=} != "true" ]]; then return @@ -938,6 +950,7 @@ determine_airflow_to_use environment_initialization check_boto_upgrade check_download_sqlalchemy +check_download_pendulum check_run_tests "${@}" exec /bin/bash "${@}" diff --git a/airflow/timetables/_cron.py b/airflow/timetables/_cron.py index 15e4f820ea8fc..9dd6cad7fe515 100644 --- a/airflow/timetables/_cron.py +++ b/airflow/timetables/_cron.py @@ -27,7 +27,8 @@ from airflow.utils.timezone import convert_to_utc, make_aware, make_naive, parse_timezone if TYPE_CHECKING: - from pendulum import DateTime, FixedTimezone, Timezone + from pendulum import DateTime + from pendulum.tz.timezone import FixedTimezone, Timezone def _covers_every_hour(cron: croniter) -> bool: diff --git a/airflow/utils/timezone.py b/airflow/utils/timezone.py index fb32c093f84c4..8ac9a49e0e8bc 100644 --- a/airflow/utils/timezone.py +++ b/airflow/utils/timezone.py @@ -18,15 +18,20 @@ from __future__ import annotations import datetime as dt -from typing import overload +from typing import TYPE_CHECKING, overload import pendulum from dateutil.relativedelta import relativedelta from pendulum.datetime import DateTime -from pendulum.tz.timezone import FixedTimezone, Timezone -# UTC time zone as a tzinfo instance. -utc = Timezone("UTC") +if TYPE_CHECKING: + from pendulum.tz.timezone import FixedTimezone, Timezone + +_PENDULUM3 = pendulum.__version__.startswith("3") +# UTC Timezone as a tzinfo instance. Actual value depends on pendulum version: +# - Timezone("UTC") in pendulum 3 +# - FixedTimezone(0, "UTC") in pendulum 2 +utc = pendulum.UTC def is_localized(value): @@ -284,7 +289,11 @@ def parse_timezone(name: str | int) -> FixedTimezone | Timezone: :meta private: """ - return pendulum.timezone(name) + if _PENDULUM3: + # This only presented in pendulum 3 and code do not reached into the pendulum 2 + return pendulum.timezone(name) # type: ignore[operator] + # In pendulum 2 this refers to the function, in pendulum 3 refers to the module + return pendulum.tz.timezone(name) # type: ignore[operator] def local_timezone() -> FixedTimezone | Timezone: diff --git a/dev/breeze/src/airflow_breeze/commands/common_options.py b/dev/breeze/src/airflow_breeze/commands/common_options.py index d8ca0f5d4d448..35a46999ab48b 100644 --- a/dev/breeze/src/airflow_breeze/commands/common_options.py +++ b/dev/breeze/src/airflow_breeze/commands/common_options.py @@ -150,6 +150,12 @@ def _set_default_from_parent(ctx: click.core.Context, option: click.core.Option, is_flag=True, envvar="DOWNGRADE_SQLALCHEMY", ) +option_downgrade_pendulum = click.option( + "--downgrade-pendulum", + help="Downgrade Pendulum to minimum supported version.", + is_flag=True, + envvar="DOWNGRADE_PENDULUM", +) option_dry_run = click.option( "-D", "--dry-run", diff --git a/dev/breeze/src/airflow_breeze/commands/developer_commands.py b/dev/breeze/src/airflow_breeze/commands/developer_commands.py index 899eba05a26cc..92882a781a367 100644 --- a/dev/breeze/src/airflow_breeze/commands/developer_commands.py +++ b/dev/breeze/src/airflow_breeze/commands/developer_commands.py @@ -39,6 +39,7 @@ option_database_isolation, option_db_reset, option_docker_host, + option_downgrade_pendulum, option_downgrade_sqlalchemy, option_dry_run, option_forward_credentials, @@ -247,6 +248,7 @@ def run(self): @option_db_reset @option_docker_host @option_downgrade_sqlalchemy +@option_downgrade_pendulum @option_dry_run @option_executor_shell @option_force_build @@ -292,6 +294,7 @@ def shell( database_isolation: bool, db_reset: bool, downgrade_sqlalchemy: bool, + downgrade_pendulum: bool, docker_host: str | None, executor: str, extra_args: tuple, @@ -351,6 +354,7 @@ def shell( database_isolation=database_isolation, db_reset=db_reset, downgrade_sqlalchemy=downgrade_sqlalchemy, + downgrade_pendulum=downgrade_pendulum, docker_host=docker_host, executor=executor, extra_args=extra_args if not max_time else ["exit"], diff --git a/dev/breeze/src/airflow_breeze/commands/developer_commands_config.py b/dev/breeze/src/airflow_breeze/commands/developer_commands_config.py index fc0247b9d5f81..11b81756f7203 100644 --- a/dev/breeze/src/airflow_breeze/commands/developer_commands_config.py +++ b/dev/breeze/src/airflow_breeze/commands/developer_commands_config.py @@ -157,6 +157,7 @@ "options": [ "--upgrade-boto", "--downgrade-sqlalchemy", + "--downgrade-pendulum", ], }, { diff --git a/dev/breeze/src/airflow_breeze/commands/testing_commands.py b/dev/breeze/src/airflow_breeze/commands/testing_commands.py index c0cea0ee3667a..beb1254823248 100644 --- a/dev/breeze/src/airflow_breeze/commands/testing_commands.py +++ b/dev/breeze/src/airflow_breeze/commands/testing_commands.py @@ -29,6 +29,7 @@ option_backend, option_db_reset, option_debug_resources, + option_downgrade_pendulum, option_downgrade_sqlalchemy, option_dry_run, option_forward_credentials, @@ -469,6 +470,7 @@ def _verify_parallelism_parameters( @option_excluded_parallel_test_types @option_upgrade_boto @option_downgrade_sqlalchemy +@option_downgrade_pendulum @option_collect_only @option_remove_arm_packages @option_skip_docker_compose_down @@ -510,6 +512,7 @@ def command_for_tests(**kwargs): @option_excluded_parallel_test_types @option_upgrade_boto @option_downgrade_sqlalchemy +@option_downgrade_pendulum @option_collect_only @option_remove_arm_packages @option_skip_docker_compose_down @@ -545,6 +548,7 @@ def command_for_db_tests(**kwargs): @option_collect_only @option_debug_resources @option_downgrade_sqlalchemy +@option_downgrade_pendulum @option_dry_run @option_enable_coverage @option_excluded_parallel_test_types @@ -586,6 +590,7 @@ def _run_test_command( db_reset: bool, debug_resources: bool, downgrade_sqlalchemy: bool, + downgrade_pendulum: bool, enable_coverage: bool, excluded_parallel_test_types: str, extra_pytest_args: tuple, @@ -628,6 +633,7 @@ def _run_test_command( backend=backend, collect_only=collect_only, downgrade_sqlalchemy=downgrade_sqlalchemy, + downgrade_pendulum=downgrade_pendulum, enable_coverage=enable_coverage, forward_credentials=forward_credentials, forward_ports=False, diff --git a/dev/breeze/src/airflow_breeze/commands/testing_commands_config.py b/dev/breeze/src/airflow_breeze/commands/testing_commands_config.py index 84976c4f854d0..09daa0b4510df 100644 --- a/dev/breeze/src/airflow_breeze/commands/testing_commands_config.py +++ b/dev/breeze/src/airflow_breeze/commands/testing_commands_config.py @@ -78,6 +78,7 @@ "--mount-sources", "--upgrade-boto", "--downgrade-sqlalchemy", + "--downgrade-pendulum", "--remove-arm-packages", "--skip-docker-compose-down", ], @@ -125,6 +126,7 @@ "--mount-sources", "--upgrade-boto", "--downgrade-sqlalchemy", + "--downgrade-pendulum", "--remove-arm-packages", "--skip-docker-compose-down", ], @@ -175,6 +177,7 @@ "--mount-sources", "--upgrade-boto", "--downgrade-sqlalchemy", + "--downgrade-pendulum", "--remove-arm-packages", "--skip-docker-compose-down", ], diff --git a/dev/breeze/src/airflow_breeze/params/shell_params.py b/dev/breeze/src/airflow_breeze/params/shell_params.py index 2cf35cd42c13e..24203bdbff5c8 100644 --- a/dev/breeze/src/airflow_breeze/params/shell_params.py +++ b/dev/breeze/src/airflow_breeze/params/shell_params.py @@ -136,6 +136,7 @@ class ShellParams: dev_mode: bool = False docker_host: str | None = os.environ.get("DOCKER_HOST") downgrade_sqlalchemy: bool = False + downgrade_pendulum: bool = False dry_run: bool = False enable_coverage: bool = False executor: str = START_AIRFLOW_DEFAULT_ALLOWED_EXECUTOR @@ -482,6 +483,7 @@ def env_variables_for_docker_commands(self) -> dict[str, str]: _set_var(_env, "DEV_MODE", self.dev_mode) _set_var(_env, "DOCKER_IS_ROOTLESS", self.rootless_docker) _set_var(_env, "DOWNGRADE_SQLALCHEMY", self.downgrade_sqlalchemy) + _set_var(_env, "DOWNGRADE_PENDULUM", self.downgrade_pendulum) _set_var(_env, "ENABLED_SYSTEMS", None, "") _set_var(_env, "FLOWER_HOST_PORT", None, FLOWER_HOST_PORT) _set_var(_env, "GITHUB_ACTIONS", self.github_actions) diff --git a/images/breeze/output_shell.svg b/images/breeze/output_shell.svg index 84844cf1ac41e..a8edc07feb786 100644 --- a/images/breeze/output_shell.svg +++ b/images/breeze/output_shell.svg @@ -1,4 +1,4 @@ - +