From 6774f2692ab983f9ddf05610bcea071d446d5980 Mon Sep 17 00:00:00 2001 From: Hassan Shahid Date: Fri, 11 Mar 2022 09:31:58 -0500 Subject: [PATCH] build(markupsafe): update markupsafe pinning for Airflow compatibility Airflow 2.0.2 - 2.2.2 has a pin on markupsafe as >=1.1.1,<2.0 because of a bug shipped in markupsafe 2.0.x, preventing the ability to integrate datahub and airflow. This patch changes the pinnings to match Airflow. --- metadata-ingestion/setup.py | 3 ++- .../src/datahub/ingestion/source/feast_image/requirements.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py index be0d0aa7f7a0b3..3cd51686e7498d 100644 --- a/metadata-ingestion/setup.py +++ b/metadata-ingestion/setup.py @@ -51,7 +51,8 @@ def get_long_description(): # Markupsafe breaking change broke Jinja and some other libs # Pinning it to a version which works even though we are not using explicitly # https://github.com/aws/aws-sam-cli/issues/3661 - "markupsafe==2.0.1", + # Airflow compatibility: https://github.com/apache/airflow/blob/2.2.2/setup.cfg#L125 + "markupsafe>=1.1.1,<=2.0.1", "Deprecated", "types-Deprecated", } diff --git a/metadata-ingestion/src/datahub/ingestion/source/feast_image/requirements.txt b/metadata-ingestion/src/datahub/ingestion/source/feast_image/requirements.txt index 1c41862b0b9a7b..6a2841e420e2fa 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/feast_image/requirements.txt +++ b/metadata-ingestion/src/datahub/ingestion/source/feast_image/requirements.txt @@ -13,7 +13,7 @@ grpcio==1.38.0; python_full_version >= "3.7.0" idna==2.10; python_full_version >= "3.7.0" jinja2==3.0.1; python_version >= "3.6" and python_full_version >= "3.7.0" jsonschema==3.2.0; python_full_version >= "3.7.0" -markupsafe==2.0.1; python_version >= "3.6" and python_full_version >= "3.7.0" +markupsafe>==1.1.1,<=2.0.1; python_version >= "3.6" and python_full_version >= "3.7.0" mmh3==3.0.0; python_full_version >= "3.7.0" numpy==1.20.3; python_version >= "3.7" and python_full_version >= "3.7.1" packaging==20.9; python_full_version >= "3.7.0"