Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 4 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "*"
Expand All @@ -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]

Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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]
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
aiohttp==3.9.4
aiobotocore==2.13.0
aiobotocore>=2.13.0
aiohttp_cors
aiofiles
azure-storage-blob
Expand All @@ -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
Loading