From 31091ac4e5202765bd52a0d5bafdbdd7c62babaa Mon Sep 17 00:00:00 2001
From: Elad Kalif <45845474+eladkal@users.noreply.github.com>
Date: Sun, 26 May 2024 09:08:34 +0300
Subject: [PATCH 1/2] Bump docker and requests versions

---
 Dockerfile.ci                          | 5 +----
 airflow/providers/docker/provider.yaml | 7 +------
 scripts/docker/entrypoint_ci.sh        | 5 +----
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Dockerfile.ci b/Dockerfile.ci
index 423c0e3de6c0..daba5aaab888 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1007,12 +1007,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
index 9e08a6d3bcc8..0df390d762f9 100644
--- a/airflow/providers/docker/provider.yaml
+++ b/airflow/providers/docker/provider.yaml
@@ -68,13 +68,8 @@ versions:
 
 dependencies:
   - apache-airflow>=2.7.0
-  - docker>=6
+  - 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/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh
index a81449f4f5a8..8e68887f34d7 100755
--- a/scripts/docker/entrypoint_ci.sh
+++ b/scripts/docker/entrypoint_ci.sh
@@ -227,12 +227,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
 }
 

From aba3cce5b993212774ca0e6f662c3d6c3195af29 Mon Sep 17 00:00:00 2001
From: Jarek Potiuk <jarek@potiuk.com>
Date: Sun, 26 May 2024 16:25:13 +0200
Subject: [PATCH 2/2] fixup! Bump docker and requests versions

---
 generated/provider_dependencies.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json
index 1ae5dc50bf11..1e0e5dff2f4c 100644
--- a/generated/provider_dependencies.json
+++ b/generated/provider_dependencies.json
@@ -479,9 +479,8 @@
   "docker": {
     "deps": [
       "apache-airflow>=2.7.0",
-      "docker>=6",
-      "python-dotenv>=0.21.0",
-      "requests>=2.27.0,<2.32.0"
+      "docker>=7.1.0",
+      "python-dotenv>=0.21.0"
     ],
     "devel-deps": [],
     "plugins": [],