Replace unix socket package (#430)

* Replace unix socket package

* Update aiobotocore

Author: mattjala

.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: |

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 = "*"
@@ -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]
 

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",
@@ -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]

requirements.txt

@@ -1,5 +1,5 @@
 aiohttp==3.9.4
-aiobotocore==2.13.0
+aiobotocore>=2.13.0
 aiohttp_cors
 aiofiles
 azure-storage-blob
@@ -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