This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 39269d6a71 Limit requests in botocore upgrade test (#39747)
39269d6a71 is described below
commit 39269d6a71f9696cbe0053e23fb965a59ca555c7
Author: Jarek Potiuk <[email protected]>
AuthorDate: Wed May 22 09:10:25 2024 -0400
Limit requests in botocore upgrade test (#39747)
The botocore upgrade test brings also requests to latest version
even if it is limited in `[docker]` extra after #39740. This PR
adds similar limit when botocore is upgraded.
---
Dockerfile.ci | 6 +++++-
airflow/providers/docker/provider.yaml | 3 ++-
scripts/docker/entrypoint_ci.sh | 6 +++++-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Dockerfile.ci b/Dockerfile.ci
index ff95970371..02857c4467 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1005,8 +1005,12 @@ function check_boto_upgrade() {
${PACKAGING_TOOL_CMD} uninstall ${EXTRA_UNINSTALL_FLAGS} aiobotocore s3fs
|| true
# We need to include oss2 as dependency as otherwise jmespath will be
bumped and it will not pass
# the pip check test, Similarly gcloud-aio-auth limit is needed to be
included as it bumps cryptography
+ # Also until docker-py compatibility with requests 2.32 is fixed we need
to limit requests version
+ # Should be removed after https://github.com/docker/docker-py/issues/3256
together with removal of similar
+ # limitation in providers/docker/pyproject.toml
# shellcheck disable=SC2086
- ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade boto3
botocore "oss2>=2.14.0" "gcloud-aio-auth>=4.0.0,<5.0.0"
+ ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade boto3
botocore \
+ "oss2>=2.14.0" "gcloud-aio-auth>=4.0.0,<5.0.0" "requests<2.32.0"
pip check
}
diff --git a/airflow/providers/docker/provider.yaml
b/airflow/providers/docker/provider.yaml
index a9b83439bf..e8e6bd0ae3 100644
--- a/airflow/providers/docker/provider.yaml
+++ b/airflow/providers/docker/provider.yaml
@@ -71,7 +71,8 @@ dependencies:
- python-dotenv>=0.21.0
# requests 2.32.0 has an incompatibility with python lib docker
# https://github.com/psf/requests/issues/6707 and
https://github.com/docker/docker-py/issues/3256
- # once resolved remove this dependency
+ # once resolved remove this dependency and bump docker-py version
+ # !!!!! Make sure to also remove it from the scripts/docker/entrypoint_ci.sh
!!!!!
- requests>=2.27.0,<2.32.0
integrations:
diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh
index 3c1699acbc..a81449f4f5 100755
--- a/scripts/docker/entrypoint_ci.sh
+++ b/scripts/docker/entrypoint_ci.sh
@@ -227,8 +227,12 @@ function check_boto_upgrade() {
${PACKAGING_TOOL_CMD} uninstall ${EXTRA_UNINSTALL_FLAGS} aiobotocore s3fs
|| true
# We need to include oss2 as dependency as otherwise jmespath will be
bumped and it will not pass
# the pip check test, Similarly gcloud-aio-auth limit is needed to be
included as it bumps cryptography
+ # Also until docker-py compatibility with requests 2.32 is fixed we need
to limit requests version
+ # Should be removed after https://github.com/docker/docker-py/issues/3256
together with removal of similar
+ # limitation in providers/docker/pyproject.toml
# shellcheck disable=SC2086
- ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade boto3
botocore "oss2>=2.14.0" "gcloud-aio-auth>=4.0.0,<5.0.0"
+ ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade boto3
botocore \
+ "oss2>=2.14.0" "gcloud-aio-auth>=4.0.0,<5.0.0" "requests<2.32.0"
pip check
}
