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
2 changes: 1 addition & 1 deletion airflow/emr_serverless/hooks/emr.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
# under the License.
from __future__ import annotations

from functools import cached_property
from time import sleep
from typing import Any, Callable

from botocore.config import Config

from airflow.compat.functools import cached_property
from airflow.exceptions import AirflowException
from airflow.providers.amazon.aws.hooks.base_aws import AwsBaseHook

Expand Down
9 changes: 1 addition & 8 deletions airflow/emr_serverless/operators/emr.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# under the License.
from __future__ import annotations

import sys
from functools import cached_property
from typing import TYPE_CHECKING, Dict, Optional, Sequence
from uuid import uuid4

Expand All @@ -29,15 +29,8 @@
if TYPE_CHECKING:
from airflow.utils.context import Context

from airflow.compat.functools import cached_property

DEFAULT_CONN_ID = "aws_default"

if sys.version_info >= (3, 8):
from functools import cached_property
else:
from cached_property import cached_property


class EmrServerlessCreateApplicationOperator(BaseOperator):
"""
Expand Down
8 changes: 4 additions & 4 deletions airflow/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apache-airflow~=2.2.2
apache-airflow-providers-amazon~=4.0
pytest~=7.1.2
boto3>=1.23.9,~=1.23
apache-airflow~=2.11.0
apache-airflow-providers-amazon~=9.22
pytest~=9.0
boto3>=1.23.9,~=1.23
Loading