Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hooks/build
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ else
fi

# Extras used to build cache and CI image
AIRFLOW_CI_EXTRAS=${AIRFLOW_CI_EXTRAS:="devel_ci"}
AIRFLOW_CI_EXTRAS=${AIRFLOW_CI_EXTRAS:="devel_all"}

# Whether this is a release build
AIRFLOW_RELEASE_BUILD=${AIRFLOW_RELEASE_BUILD:="false"}
Expand Down Expand Up @@ -419,7 +419,7 @@ else
build_python_image "Airflow CI" \
"${AIRFLOW_CI_IMAGE}" \
"main" \
"devel_ci" \
"devel_all" \
"root" \
"/root"

Expand Down
12 changes: 2 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ def write_version(filename: str = os.path.join(*["airflow", "git_version"])):
'grpcio>=1.15.0',
]
hdfs = [
'snakebite>=2.7.8',
'snakebite-py3>=3.0.5',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine for master -- do you know if this py3 module also supports py2, or do we need to have the ;python_version>="3" trick on 1.10.8 to support py2 and 3?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be safer to use "if" in 1.10.8. I will do it when cherry-picking.

]
hive = [
'hmsclient>=0.1.0',
Expand All @@ -260,7 +260,7 @@ def write_version(filename: str = os.path.join(*["airflow", "git_version"])):
kerberos = [
'pykerberos>=1.1.13',
'requests_kerberos>=0.10.0',
'snakebite[kerberos]>=2.7.8',
'snakebite-py3[kerberos]>=3.0.5',
'thrift_sasl>=0.2.0',
]
kubernetes = [
Expand Down Expand Up @@ -416,13 +416,6 @@ def write_version(filename: str = os.path.join(*["airflow", "git_version"])):
password + pinot + redis + salesforce + samba + segment + sendgrid +
sentry + slack + snowflake + ssh + virtualenv + webhdfs + zendesk)

# Snakebite & Google Cloud Dataflow are not Python 3 compatible :'(
if PY3:
devel_ci = [package for package in devel_all if package not in
['snakebite>=2.7.8', 'snakebite[kerberos]>=2.7.8']]
else:
devel_ci = devel_all


def do_setup():
"""Perform the Airflow package setup."""
Expand Down Expand Up @@ -518,7 +511,6 @@ def do_setup():
'databricks': databricks,
'datadog': datadog,
'devel': devel_minreq,
'devel_ci': devel_ci,
'devel_hadoop': devel_hadoop,
'doc': doc,
'docker': docker,
Expand Down