Bump docker version to 7.1.0 (#39839)

* Bump docker and requests versions * fixup! Bump docker and requests versions --------- Co-authored-by: Jarek Potiuk <jarek@potiuk.com> (cherry picked from commit aec3f80)
apache · Jul 8, 2024 · 99a4d3e · 99a4d3e
1 parent 001ae9f
commit 99a4d3e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -1005,12 +1005,9 @@ 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" "requests<2.32.0"
+       "oss2>=2.14.0" "gcloud-aio-auth>=4.0.0,<5.0.0"
     pip check
 }
 

diff --git a/airflow/providers/docker/provider.yaml b/airflow/providers/docker/provider.yaml
@@ -64,14 +64,9 @@ versions:
   - 1.0.0
 
 dependencies:
-  - apache-airflow>=2.6.0
-  - docker>=6
+  - apache-airflow>=2.7.0
+  - docker>=7.1.0
   - 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 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:
   - integration-name: Docker

diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json
@@ -430,10 +430,9 @@
   },
   "docker": {
     "deps": [
-      "apache-airflow>=2.6.0",
-      "docker>=6",
-      "python-dotenv>=0.21.0",
-      "requests>=2.27.0,<2.32.0"
+      "apache-airflow>=2.7.0",
+      "docker>=7.1.0",
+      "python-dotenv>=0.21.0"
     ],
     "devel-deps": [],
     "cross-providers-deps": [],

diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh
@@ -225,12 +225,9 @@ 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" "requests<2.32.0"
+       "oss2>=2.14.0" "gcloud-aio-auth>=4.0.0,<5.0.0"
     pip check
 }