From edbf49c645007d0294378ee0ff0d6400ce3b3e54 Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Mon, 8 Mar 2021 20:27:03 +0100 Subject: [PATCH] Prepare ad-hoc release of the four previously excluded providers (#14655) Documentation update for the four previously excluded providers that got extra fixes/bumping to the latest version of the libraries. * apache.beam * apache.druid * microsoft.azure * snowflake (cherry picked from commit b753c7fa60e8d92bbaab68b557a1fbbdc1ec5dd0) --- Dockerfile | 1 - Dockerfile.ci | 5 ++--- setup.py | 5 +---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index a98b729c19..2d4aad7d7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -275,7 +275,6 @@ ENV INSTALL_FROM_PYPI=${INSTALL_FROM_PYPI} # Force them on the main Airflow package. # * chardet<4 - required to keep snowflake happy # * urllib3 - required to keep boto3 happy -# * pytz<2021.0: required by snowflake provider # * pyjwt<2.0.0: flask-jwt-extended requires it ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="chardet<4 urllib3<1.26 pyjwt<2.0.0" diff --git a/Dockerfile.ci b/Dockerfile.ci index 49c31d6cd0..ad72d704ac 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -343,13 +343,12 @@ COPY airflow/__init__.py ${AIRFLOW_SOURCES}/airflow/__init__.py # Those are additional constraints that are needed for some extras but we do not want to # force them on the main Airflow package. Those limitations are: -# * chardet,<4: required by snowflake provider +# * chardet<4: required by snowflake provider # * lazy-object-proxy<1.5.0: required by astroid -# * pytz<2021.0: required by snowflake provider # * pyOpenSSL: required by snowflake provider https://github.com/snowflakedb/snowflake-connector-python/blob/v2.3.6/setup.py#L201 # * urllib3<1.26: Required to keep boto3 happy # * pyjwt<2.0.0: flask-jwt-extended requires it -ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="chardet<4 lazy-object-proxy<1.5.0 pyOpenSSL<20.0.0 pytz<2021.0 urllib3<1.26 pyjwt<2.0.0" +ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="chardet<4 lazy-object-proxy<1.5.0 pyOpenSSL<20.0.0 urllib3<1.26 pyjwt<2.0.0" ENV EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS=${EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS} ARG CONTINUE_ON_PIP_CHECK_FAILURE="false" diff --git a/setup.py b/setup.py index 0846ec9a02..7db75b86ab 100644 --- a/setup.py +++ b/setup.py @@ -427,10 +427,7 @@ slack = [ 'slack_sdk>=3.0.0,<4.0.0', ] snowflake = [ - # Snowflake connector > 2.3.8 is needed because it has vendored-in, patched urllib and requests libraries - # In earlier versions of the snowflake library, monkey-patching the libraries caused other - # providers to fail (Google, Amazon etc.) - 'snowflake-connector-python>=2.3.8', + 'snowflake-connector-python>=2.4.1', 'snowflake-sqlalchemy>=1.1.0', ] spark = [