From ffec4f2c9999c3c83b4189d1211a2b5f5d2ea248 Mon Sep 17 00:00:00 2001
From: Matthew Larson <matthewjlar@gmail.com>
Date: Mon, 30 Jun 2025 15:46:44 -0500
Subject: [PATCH 1/2] Replace unix socket package

---
 .github/workflows/python-package.yml | 5 -----
 Pipfile                              | 4 +++-
 pyproject.toml                       | 6 +++---
 requirements.txt                     | 6 +++---
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 7e24ec14..d79c140f 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -213,11 +213,6 @@ jobs:
         run: |
           pip install -e .
 
-      # Requests 2.32.0 breaks requests-unixsocket, used by HSDS for socket connections
-      # - name: Fix requests version
-      #  run: |
-      #    pip install requests==2.31.0
-
       - name: Run HSDS unit tests
         shell: bash
         run: |
diff --git a/Pipfile b/Pipfile
index 0c0f4f94..0a07fc32 100644
--- a/Pipfile
+++ b/Pipfile
@@ -19,9 +19,11 @@ psutil = "*"
 pyjwt = "*"
 pytz = "*"
 pyyaml = "*"
-requests-unixsocket = "*"
+requests = "<=2.32.4"
+requests-unixsocket2 = {git = "https://gitlab.com/thelabnyc/requests-unixsocket2.git"}
 simplejson = "*"
 s3fs = "*"
+urllib3 = ">=2.4.0,<3.0"
 
 [dev-packages]
 
diff --git a/pyproject.toml b/pyproject.toml
index e74cf1ea..55503e48 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -49,11 +49,11 @@ dependencies = [
     "pyjwt",
     "pytz",
     "pyyaml",
-    "requests <= 2.31.0",
-    "requests-unixsocket",
+    "requests <= 2.32.4",
+    "requests-unixsocket2 @ git+https://gitlab.com/thelabnyc/requests-unixsocket2.git",
     "simplejson",
     "s3fs",
-    "urllib3 < 2.0.0"
+    "urllib3 >= 2.4.0, < 3.0"
 ]
 
 [project.optional-dependencies]
diff --git a/requirements.txt b/requirements.txt
index 5aa9d39b..aade7d60 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,8 +11,8 @@ psutil
 pyjwt
 pytz
 pyyaml
-requests<=2.31.0
-requests-unixsocket
+requests<=2.32.4
+requests-unixsocket2 @ git+https://gitlab.com/thelabnyc/requests-unixsocket2.git
 simplejson
 s3fs
-urllib3<2.0.0
+urllib3>=2.4.0,<3.0

From c071fa4fa237235acab1f845e452e5c63cd67bab Mon Sep 17 00:00:00 2001
From: Matthew Larson <matthewjlar@gmail.com>
Date: Mon, 30 Jun 2025 16:10:32 -0500
Subject: [PATCH 2/2] Update aiobotocore

---
 Pipfile          | 2 +-
 pyproject.toml   | 2 +-
 requirements.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Pipfile b/Pipfile
index 0a07fc32..4f428895 100644
--- a/Pipfile
+++ b/Pipfile
@@ -5,7 +5,7 @@ name = "pypi"
 
 [packages]
 aiohttp = "==3.10.2"
-aiobotocore = "==2.5.0"
+aiobotocore = ">=2.13.0"
 aiohttp-cors = "*"
 aiofiles = "*"
 azure-storage-blob = "*"
diff --git a/pyproject.toml b/pyproject.toml
index 55503e48..e0b6a58b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,7 +35,7 @@ version = "0.9.2"
 
 dependencies = [
     "aiohttp == 3.9.4",
-    "aiobotocore == 2.13.0",
+    "aiobotocore >= 2.13.0",
     "aiohttp_cors",
     "aiofiles",
     "azure-storage-blob",
diff --git a/requirements.txt b/requirements.txt
index aade7d60..1498a92f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 aiohttp==3.9.4
-aiobotocore==2.13.0
+aiobotocore>=2.13.0
 aiohttp_cors
 aiofiles
 azure-storage-blob