Skip to content

Commit

Permalink
fix(ingest): upgrade feast to avoid build issues (datahub-project#7218)
Browse files Browse the repository at this point in the history
  • Loading branch information
hsheth2 authored and Eric Yomi committed Feb 8, 2023
1 parent a360d66 commit ffa8003
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion metadata-ingestion/build.gradle
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion 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 = '''
Expand Down
15 changes: 8 additions & 7 deletions metadata-ingestion/setup.py
Expand Up @@ -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
Expand Down Expand Up @@ -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
| {
Expand All @@ -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
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit ffa8003

Please sign in to comment.