Skip to content
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
4 changes: 4 additions & 0 deletions airflow-core/src/airflow/config_templates/unit_tests.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ ssl_assert_hostname = False
ssl_show_warn = False
ca_certs =

[elasticsearch_configs]
verify_certs = True
http_compress = False


[example_section]
# This section is used to test coercions of configuration values retrieval
Expand Down
2 changes: 1 addition & 1 deletion providers/elasticsearch/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,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.11.0",
"apache-airflow-providers-common-compat>=1.11.0",
"apache-airflow-providers-common-compat>=1.11.0", # use next version
"apache-airflow-providers-common-sql>=1.27.0",
"elasticsearch>=8.10,<9",
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,9 @@
from elasticsearch import helpers
from elasticsearch.exceptions import NotFoundError

from airflow.configuration import conf
from airflow.models.dagrun import DagRun
from airflow.providers.common.compat.module_loading import import_string
from airflow.providers.common.compat.sdk import AirflowException, timezone
from airflow.providers.common.compat.sdk import AirflowException, conf, timezone
from airflow.providers.elasticsearch.log.es_json_formatter import ElasticsearchJSONFormatter
from airflow.providers.elasticsearch.log.es_response import ElasticSearchResponse, Hit
from airflow.providers.elasticsearch.version_compat import AIRFLOW_V_3_0_PLUS
Expand Down Expand Up @@ -158,7 +157,7 @@ def __init__(
offset_field: str = "offset",
host: str = "http://localhost:9200",
frontend: str = "localhost:5601",
index_patterns: str = conf.get("elasticsearch", "index_patterns"),
index_patterns: str = conf.get("elasticsearch", "index_patterns", fallback="_all"),
index_patterns_callable: str = conf.get("elasticsearch", "index_patterns_callable", fallback=""),
es_kwargs: dict | None | Literal["default_es_kwargs"] = "default_es_kwargs",
max_bytes: int = 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import pendulum
import pytest

from airflow.configuration import conf
from airflow.providers.common.compat.sdk import conf
from airflow.providers.elasticsearch.log.es_response import ElasticSearchResponse
from airflow.providers.elasticsearch.log.es_task_handler import (
VALID_ES_CONFIG_KEYS,
Expand Down
2 changes: 1 addition & 1 deletion providers/microsoft/azure/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,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.11.0",
"apache-airflow-providers-common-compat>=1.11.0",
"apache-airflow-providers-common-compat>=1.11.0", #use next version
"adlfs>=2023.10.0",
"azure-batch>=8.0.0",
"azure-cosmos>=4.6.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import attrs
from azure.core.exceptions import HttpResponseError

from airflow.configuration import conf
from airflow.providers.common.compat.sdk import conf
from airflow.providers.microsoft.azure.version_compat import AIRFLOW_V_3_0_PLUS
from airflow.utils.log.file_task_handler import FileTaskHandler
from airflow.utils.log.logging_mixin import LoggingMixin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
from functools import cached_property
from typing import TYPE_CHECKING

from airflow.configuration import conf
from airflow.providers.common.compat.sdk import BaseOperator
from airflow.providers.common.compat.sdk import BaseOperator, conf
from airflow.providers.microsoft.azure.hooks.adx import AzureDataExplorerHook

if TYPE_CHECKING:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
from functools import cached_property
from typing import TYPE_CHECKING, Any

from airflow.configuration import conf
from airflow.providers.common.compat.sdk import (
AirflowException,
BaseHook,
BaseOperator,
BaseOperatorLink,
XCom,
conf,
)
from airflow.providers.microsoft.azure.hooks.data_factory import (
AzureDataFactoryHook,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
from functools import cached_property
from typing import TYPE_CHECKING

from airflow.configuration import conf
from airflow.providers.common.compat.sdk import AirflowException, BaseSensorOperator
from airflow.providers.common.compat.sdk import AirflowException, BaseSensorOperator, conf
from airflow.providers.microsoft.azure.hooks.data_factory import (
AzureDataFactoryHook,
AzureDataFactoryPipelineRunException,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
from datetime import timedelta
from typing import TYPE_CHECKING

from airflow.configuration import conf
from airflow.providers.common.compat.sdk import AirflowException, BaseSensorOperator
from airflow.providers.common.compat.sdk import AirflowException, BaseSensorOperator, conf
from airflow.providers.microsoft.azure.hooks.wasb import WasbHook
from airflow.providers.microsoft.azure.triggers.wasb import WasbBlobSensorTrigger, WasbPrefixSensorTrigger

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import pytest
import sqlalchemy

from airflow.configuration import conf
from airflow.models import Connection
from airflow.providers.common.compat.sdk import conf
from airflow.providers.microsoft.mssql.dialects.mssql import MsSqlDialect

from tests_common.test_utils.file_loading import load_file_from_resources
Expand Down
2 changes: 1 addition & 1 deletion providers/microsoft/winrm/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,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.11.0",
"apache-airflow-providers-common-compat>=1.10.1",
"apache-airflow-providers-common-compat>=1.10.1", # use next version
"pywinrm>=0.5.0",
]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
from collections.abc import Sequence
from typing import TYPE_CHECKING

from airflow.configuration import conf
from airflow.providers.common.compat.sdk import AirflowException, BaseOperator
from airflow.providers.common.compat.sdk import AirflowException, BaseOperator, conf
from airflow.providers.microsoft.winrm.hooks.winrm import WinRMHook

if TYPE_CHECKING:
Expand Down
2 changes: 1 addition & 1 deletion providers/opensearch/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,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.11.0",
"apache-airflow-providers-common-compat>=1.11.0",
"apache-airflow-providers-common-compat>=1.11.0", # use next version
"opensearch-py>=2.2.0",
]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,9 @@
from opensearchpy import OpenSearch
from opensearchpy.exceptions import NotFoundError

from airflow.configuration import conf
from airflow.models import DagRun
from airflow.providers.common.compat.module_loading import import_string
from airflow.providers.common.compat.sdk import AirflowException
from airflow.providers.common.compat.sdk import AirflowException, conf
from airflow.providers.opensearch.log.os_json_formatter import OpensearchJSONFormatter
from airflow.providers.opensearch.log.os_response import Hit, OpensearchResponse
from airflow.providers.opensearch.version_compat import AIRFLOW_V_3_0_PLUS
Expand Down Expand Up @@ -105,7 +104,6 @@ def _ensure_ti(ti: TaskInstanceKey | TaskInstance, session) -> TaskInstance:
def get_os_kwargs_from_config() -> dict[str, Any]:
open_search_config = conf.getsection("opensearch_configs")
kwargs_dict = {key: value for key, value in open_search_config.items()} if open_search_config else {}

return kwargs_dict


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import pytest
from opensearchpy.exceptions import NotFoundError

from airflow.configuration import conf
from airflow.providers.common.compat.sdk import conf
from airflow.providers.opensearch.log.os_response import OpensearchResponse
from airflow.providers.opensearch.log.os_task_handler import (
OpensearchTaskHandler,
Expand Down
2 changes: 1 addition & 1 deletion providers/standard/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,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.11.0",
"apache-airflow-providers-common-compat>=1.10.1",
"apache-airflow-providers-common-compat>=1.10.1", # use next version
]

# The optional dependencies should be modified in place in the generated file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from typing import TYPE_CHECKING, Any
from urllib.parse import ParseResult, urlencode, urlparse, urlunparse

from airflow.configuration import conf
from airflow.providers.common.compat.sdk import conf
from airflow.providers.standard.exceptions import HITLRejectException, HITLTimeoutError, HITLTriggerEventError
from airflow.providers.standard.operators.branch import BranchMixIn
from airflow.providers.standard.triggers.hitl import HITLTrigger, HITLTriggerEventSuccessPayload
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
from sqlalchemy.orm.exc import NoResultFound

from airflow.api.common.trigger_dag import trigger_dag
from airflow.configuration import conf
from airflow.exceptions import DagNotFound, DagRunAlreadyExists
from airflow.models.dag import DagModel
from airflow.models.dagrun import DagRun
Expand All @@ -38,6 +37,7 @@
AirflowSkipException,
BaseOperatorLink,
XCom,
conf,
timezone,
)
from airflow.providers.standard.triggers.external_task import DagStateTrigger
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,13 @@
from collections.abc import Callable, Collection, Iterable, Sequence
from typing import TYPE_CHECKING, ClassVar

from airflow.configuration import conf
from airflow.models.dag import DagModel
from airflow.providers.common.compat.sdk import AirflowSkipException, BaseOperatorLink, BaseSensorOperator
from airflow.providers.common.compat.sdk import (
AirflowSkipException,
BaseOperatorLink,
BaseSensorOperator,
conf,
)
from airflow.providers.standard.exceptions import (
DuplicateStateError,
ExternalDagDeletedError,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
from glob import glob
from typing import TYPE_CHECKING, Any

from airflow.configuration import conf
from airflow.providers.common.compat.sdk import AirflowException, BaseSensorOperator
from airflow.providers.common.compat.sdk import AirflowException, BaseSensorOperator, conf
from airflow.providers.standard.hooks.filesystem import FSHook
from airflow.providers.standard.triggers.file import FileTrigger

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@
from dataclasses import dataclass
from typing import TYPE_CHECKING, Any

from airflow.configuration import conf
from airflow.exceptions import AirflowProviderDeprecationWarning
from airflow.providers.common.compat.sdk import BaseSensorOperator, timezone
from airflow.providers.common.compat.sdk import BaseSensorOperator, conf, timezone
from airflow.providers.standard.triggers.temporal import DateTimeTrigger

try:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@
from deprecated.classic import deprecated
from packaging.version import Version

from airflow.configuration import conf
from airflow.exceptions import AirflowProviderDeprecationWarning
from airflow.providers.common.compat.sdk import AirflowSkipException, BaseSensorOperator, timezone
from airflow.providers.common.compat.sdk import AirflowSkipException, BaseSensorOperator, conf, timezone
from airflow.providers.standard.triggers.temporal import DateTimeTrigger, TimeDeltaTrigger
from airflow.providers.standard.version_compat import AIRFLOW_V_3_0_PLUS

Expand Down Expand Up @@ -194,9 +193,11 @@ def __init__(
def execute(self, context: Context) -> None:
if self.deferrable:
self.defer(
trigger=TimeDeltaTrigger(self.time_to_wait, end_from_trigger=True)
if AIRFLOW_V_3_0_PLUS
else TimeDeltaTrigger(self.time_to_wait),
trigger=(
TimeDeltaTrigger(self.time_to_wait, end_from_trigger=True)
if AIRFLOW_V_3_0_PLUS
else TimeDeltaTrigger(self.time_to_wait)
),
method_name="execute_complete",
)
else:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import jinja2
from jinja2 import select_autoescape

from airflow.configuration import conf
from airflow.providers.common.compat.sdk import conf


def _is_uv_installed() -> bool:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,12 @@
import time_machine
from sqlalchemy import delete, select, update

from airflow.configuration import conf
from airflow.exceptions import DagRunAlreadyExists
from airflow.models.dag import DagModel
from airflow.models.dagrun import DagRun
from airflow.models.log import Log
from airflow.models.taskinstance import TaskInstance
from airflow.providers.common.compat.sdk import AirflowException, TaskDeferred
from airflow.providers.common.compat.sdk import AirflowException, TaskDeferred, conf
from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunOperator
from airflow.providers.standard.triggers.external_task import DagStateTrigger
from airflow.utils.session import create_session
Expand Down
Loading