From 1fd0310d2da19626326fd99ed2c0aacf90946fba Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Thu, 2 Feb 2023 09:24:28 -0500
Subject: [PATCH] fix(ingest): upgrade feast to avoid build issues (#7218)

---
 metadata-ingestion/build.gradle   |  2 +-
 metadata-ingestion/pyproject.toml |  2 +-
 metadata-ingestion/setup.py       | 15 ++++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/metadata-ingestion/build.gradle b/metadata-ingestion/build.gradle
index 45d8d330b9ca2f..2328d7652d5187 100644
--- a/metadata-ingestion/build.gradle
+++ b/metadata-ingestion/build.gradle
@@ -18,7 +18,7 @@ task checkPythonVersion(type: Exec) {
 task environmentSetup(type: Exec, dependsOn: checkPythonVersion) {
   inputs.file file('setup.py')
   outputs.dir("${venv_name}")
-  commandLine 'bash', '-c', "${python_executable} -m venv ${venv_name} && ${venv_name}/bin/python -m pip install --upgrade pip wheel setuptools==57.5.0"
+  commandLine 'bash', '-c', "${python_executable} -m venv ${venv_name} && ${venv_name}/bin/python -m pip install --upgrade pip wheel setuptools>=63.0.0"
 }
 
 task runPreFlightScript(type: Exec, dependsOn: environmentSetup) {
diff --git a/metadata-ingestion/pyproject.toml b/metadata-ingestion/pyproject.toml
index 225805940b1150..2b6c87926c6c46 100644
--- a/metadata-ingestion/pyproject.toml
+++ b/metadata-ingestion/pyproject.toml
@@ -1,6 +1,6 @@
 [build-system]
 build-backend = "setuptools.build_meta"
-requires = ["setuptools>=54.0.0", "wheel", "pip>=21.0.0"]
+requires = ["setuptools>=63.0.0", "wheel"]
 
 [tool.black]
 extend-exclude = '''
diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
index 04bfd06e2c1230..da2b6f2c1a830e 100644
--- a/metadata-ingestion/setup.py
+++ b/metadata-ingestion/setup.py
@@ -57,10 +57,7 @@ def get_long_description():
     "requests_file",
 }
 
-rest_common = {
-    "requests",
-    "requests_file"
-}
+rest_common = {"requests", "requests_file"}
 
 kafka_common = {
     # The confluent_kafka package provides a number of pre-built wheels for
@@ -265,7 +262,12 @@ def get_long_description():
     "azure-ad": set(),
     "bigquery": sql_common
     | bigquery_common
-    | {sqllineage_lib, "sql_metadata", "sqlalchemy-bigquery>=1.4.1", "google-cloud-datacatalog-lineage==0.2.0"},
+    | {
+        sqllineage_lib,
+        "sql_metadata",
+        "sqlalchemy-bigquery>=1.4.1",
+        "google-cloud-datacatalog-lineage==0.2.0",
+    },
     "bigquery-beta": sql_common
     | bigquery_common
     | {
@@ -286,7 +288,7 @@ def get_long_description():
     # https://www.elastic.co/guide/en/elasticsearch/client/python-api/current/release-notes.html#rn-7-14-0
     # https://github.com/elastic/elasticsearch-py/issues/1639#issuecomment-883587433
     "elasticsearch": {"elasticsearch==7.13.4"},
-    "feast": {"feast~=0.26.0", "flask-openid>=1.3.0"},
+    "feast": {"feast~=0.29.0", "flask-openid>=1.3.0"},
     "glue": aws_common,
     # hdbcli is supported officially by SAP, sqlalchemy-hana is built on top but not officially supported
     "hana": sql_common
@@ -633,7 +635,6 @@ def get_long_description():
         "datahub": ["py.typed"],
         "datahub.metadata": ["schema.avsc"],
         "datahub.metadata.schemas": ["*.avsc"],
-        "datahub.ingestion.source.feast_image": ["Dockerfile", "requirements.txt"],
         "datahub.ingestion.source.powerbi": ["powerbi-lexical-grammar.rule"],
     },
     entry_points=entry_points,