From 55581ce6d510cf82f531718c232cce24905b231c Mon Sep 17 00:00:00 2001 From: frankcash Date: Mon, 14 Feb 2022 16:46:09 -0500 Subject: [PATCH 1/8] updates type imports to use typing_compat #21566 --- airflow/providers/amazon/aws/sensors/sqs.py | 2 +- airflow/providers/amazon/aws/transfers/sql_to_s3.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airflow/providers/amazon/aws/sensors/sqs.py b/airflow/providers/amazon/aws/sensors/sqs.py index 9c3b55ae39a9c..9270b489a5682 100644 --- a/airflow/providers/amazon/aws/sensors/sqs.py +++ b/airflow/providers/amazon/aws/sensors/sqs.py @@ -21,11 +21,11 @@ from typing import TYPE_CHECKING, Any, Optional, Sequence from jsonpath_ng import parse -from typing_extensions import Literal from airflow.exceptions import AirflowException from airflow.providers.amazon.aws.hooks.sqs import SqsHook from airflow.sensors.base import BaseSensorOperator +from airflow.typing_compat import Literal if TYPE_CHECKING: from airflow.utils.context import Context diff --git a/airflow/providers/amazon/aws/transfers/sql_to_s3.py b/airflow/providers/amazon/aws/transfers/sql_to_s3.py index 8fe44de268e67..3e513240bf6b5 100644 --- a/airflow/providers/amazon/aws/transfers/sql_to_s3.py +++ b/airflow/providers/amazon/aws/transfers/sql_to_s3.py @@ -23,13 +23,13 @@ import numpy as np import pandas as pd -from typing_extensions import Literal from airflow.exceptions import AirflowException from airflow.hooks.base import BaseHook from airflow.hooks.dbapi import DbApiHook from airflow.models import BaseOperator from airflow.providers.amazon.aws.hooks.s3 import S3Hook +from airflow.typing_compat import Literal if TYPE_CHECKING: from airflow.utils.context import Context From 04e58c90d83382a14935651b0704c30d1acf6c82 Mon Sep 17 00:00:00 2001 From: frankcash Date: Tue, 15 Feb 2022 08:20:39 -0500 Subject: [PATCH 2/8] Revert "updates type imports to use typing_compat #21566" This reverts commit 55581ce6d510cf82f531718c232cce24905b231c. --- airflow/providers/amazon/aws/sensors/sqs.py | 2 +- airflow/providers/amazon/aws/transfers/sql_to_s3.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airflow/providers/amazon/aws/sensors/sqs.py b/airflow/providers/amazon/aws/sensors/sqs.py index 9270b489a5682..9c3b55ae39a9c 100644 --- a/airflow/providers/amazon/aws/sensors/sqs.py +++ b/airflow/providers/amazon/aws/sensors/sqs.py @@ -21,11 +21,11 @@ from typing import TYPE_CHECKING, Any, Optional, Sequence from jsonpath_ng import parse +from typing_extensions import Literal from airflow.exceptions import AirflowException from airflow.providers.amazon.aws.hooks.sqs import SqsHook from airflow.sensors.base import BaseSensorOperator -from airflow.typing_compat import Literal if TYPE_CHECKING: from airflow.utils.context import Context diff --git a/airflow/providers/amazon/aws/transfers/sql_to_s3.py b/airflow/providers/amazon/aws/transfers/sql_to_s3.py index 3e513240bf6b5..8fe44de268e67 100644 --- a/airflow/providers/amazon/aws/transfers/sql_to_s3.py +++ b/airflow/providers/amazon/aws/transfers/sql_to_s3.py @@ -23,13 +23,13 @@ import numpy as np import pandas as pd +from typing_extensions import Literal from airflow.exceptions import AirflowException from airflow.hooks.base import BaseHook from airflow.hooks.dbapi import DbApiHook from airflow.models import BaseOperator from airflow.providers.amazon.aws.hooks.s3 import S3Hook -from airflow.typing_compat import Literal if TYPE_CHECKING: from airflow.utils.context import Context From 35358d4967d9cc05ef829b7441e60ab6372838f6 Mon Sep 17 00:00:00 2001 From: frankcash Date: Tue, 15 Feb 2022 08:23:18 -0500 Subject: [PATCH 3/8] Removes =0.7.5, <0.9 tenacity>=6.2.0 termcolor>=1.1.0 - typing-extensions>=3.7.4;python_version<"3.8" + typing-extensions>=3.7.4 unicodecsv>=0.14.1 werkzeug~=1.0, >=1.0.1 From 0211a390a79e78b7c63b90350390bc42ba80f419 Mon Sep 17 00:00:00 2001 From: frankcash Date: Tue, 15 Feb 2022 09:27:08 -0500 Subject: [PATCH 4/8] adds comments per @potiuk --- setup.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.cfg b/setup.cfg index c1dde6f9d4bda..af743c8c93c2c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -137,6 +137,8 @@ install_requires = tabulate>=0.7.5, <0.9 tenacity>=6.2.0 termcolor>=1.1.0 + # typing-extensions can be removed under two scenarios: dropping support for python 3.7 + # or bumping the minimum version of airflow for providers to 2.2.* which would allow the use of airflow.typing_compat typing-extensions>=3.7.4 unicodecsv>=0.14.1 werkzeug~=1.0, >=1.0.1 From 8deb62ffbee8adaaabc088a34060dbe3c78fad98 Mon Sep 17 00:00:00 2001 From: frankcash Date: Mon, 14 Feb 2022 16:46:09 -0500 Subject: [PATCH 5/8] updates type imports to use typing_compat #21566 --- airflow/providers/amazon/aws/sensors/sqs.py | 2 +- airflow/providers/amazon/aws/transfers/sql_to_s3.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airflow/providers/amazon/aws/sensors/sqs.py b/airflow/providers/amazon/aws/sensors/sqs.py index 9c3b55ae39a9c..9270b489a5682 100644 --- a/airflow/providers/amazon/aws/sensors/sqs.py +++ b/airflow/providers/amazon/aws/sensors/sqs.py @@ -21,11 +21,11 @@ from typing import TYPE_CHECKING, Any, Optional, Sequence from jsonpath_ng import parse -from typing_extensions import Literal from airflow.exceptions import AirflowException from airflow.providers.amazon.aws.hooks.sqs import SqsHook from airflow.sensors.base import BaseSensorOperator +from airflow.typing_compat import Literal if TYPE_CHECKING: from airflow.utils.context import Context diff --git a/airflow/providers/amazon/aws/transfers/sql_to_s3.py b/airflow/providers/amazon/aws/transfers/sql_to_s3.py index 8fe44de268e67..3e513240bf6b5 100644 --- a/airflow/providers/amazon/aws/transfers/sql_to_s3.py +++ b/airflow/providers/amazon/aws/transfers/sql_to_s3.py @@ -23,13 +23,13 @@ import numpy as np import pandas as pd -from typing_extensions import Literal from airflow.exceptions import AirflowException from airflow.hooks.base import BaseHook from airflow.hooks.dbapi import DbApiHook from airflow.models import BaseOperator from airflow.providers.amazon.aws.hooks.s3 import S3Hook +from airflow.typing_compat import Literal if TYPE_CHECKING: from airflow.utils.context import Context From 0686d9f1ba8a973c971a960488a04b4c4870c581 Mon Sep 17 00:00:00 2001 From: frankcash Date: Tue, 15 Feb 2022 08:20:39 -0500 Subject: [PATCH 6/8] Revert "updates type imports to use typing_compat #21566" This reverts commit 55581ce6d510cf82f531718c232cce24905b231c. --- airflow/providers/amazon/aws/sensors/sqs.py | 2 +- airflow/providers/amazon/aws/transfers/sql_to_s3.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airflow/providers/amazon/aws/sensors/sqs.py b/airflow/providers/amazon/aws/sensors/sqs.py index 9270b489a5682..9c3b55ae39a9c 100644 --- a/airflow/providers/amazon/aws/sensors/sqs.py +++ b/airflow/providers/amazon/aws/sensors/sqs.py @@ -21,11 +21,11 @@ from typing import TYPE_CHECKING, Any, Optional, Sequence from jsonpath_ng import parse +from typing_extensions import Literal from airflow.exceptions import AirflowException from airflow.providers.amazon.aws.hooks.sqs import SqsHook from airflow.sensors.base import BaseSensorOperator -from airflow.typing_compat import Literal if TYPE_CHECKING: from airflow.utils.context import Context diff --git a/airflow/providers/amazon/aws/transfers/sql_to_s3.py b/airflow/providers/amazon/aws/transfers/sql_to_s3.py index 3e513240bf6b5..8fe44de268e67 100644 --- a/airflow/providers/amazon/aws/transfers/sql_to_s3.py +++ b/airflow/providers/amazon/aws/transfers/sql_to_s3.py @@ -23,13 +23,13 @@ import numpy as np import pandas as pd +from typing_extensions import Literal from airflow.exceptions import AirflowException from airflow.hooks.base import BaseHook from airflow.hooks.dbapi import DbApiHook from airflow.models import BaseOperator from airflow.providers.amazon.aws.hooks.s3 import S3Hook -from airflow.typing_compat import Literal if TYPE_CHECKING: from airflow.utils.context import Context From 074132fb71de8e9340d2d97ecfd46101fc7ba0a9 Mon Sep 17 00:00:00 2001 From: frankcash Date: Tue, 15 Feb 2022 08:23:18 -0500 Subject: [PATCH 7/8] Removes =0.7.5 tenacity>=6.2.0 termcolor>=1.1.0 - typing-extensions>=3.7.4;python_version<"3.8" + typing-extensions>=3.7.4 unicodecsv>=0.14.1 # Werkzeug is known to cause breaking changes and it is very closely tied with FlaskAppBuilder and other # Flask dependencies and the limit to 1.* line should be reviewed when we upgrade Flask and remove From f3c0ef6aa819495ef7f9c566810f094384c09d38 Mon Sep 17 00:00:00 2001 From: frankcash Date: Tue, 15 Feb 2022 09:27:08 -0500 Subject: [PATCH 8/8] adds comments per @potiuk --- setup.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.cfg b/setup.cfg index bd5be7e33d0ae..7c0abb5024679 100644 --- a/setup.cfg +++ b/setup.cfg @@ -163,6 +163,8 @@ install_requires = tabulate>=0.7.5 tenacity>=6.2.0 termcolor>=1.1.0 + # typing-extensions can be removed under two scenarios: dropping support for python 3.7 + # or bumping the minimum version of airflow for providers to 2.2.* which would allow the use of airflow.typing_compat typing-extensions>=3.7.4 unicodecsv>=0.14.1 # Werkzeug is known to cause breaking changes and it is very closely tied with FlaskAppBuilder and other