Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix requirements.txt for codespace #201

Merged
merged 3 commits into from
May 16, 2024
Merged

Fix requirements.txt for codespace #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86cc2e1
remove allowed_methods in httpconn
jreadey May 15, 2024
024c8de
remove h5serv ref from httpconn.py
jreadey May 15, 2024
7aa830d
updated requirements.txt for codespace
jreadey May 16, 2024
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
3 changes: 3 additions & 0 deletions .devcontainer/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ flake8==7.0.0
fonttools==4.51.0
frozenlist==1.4.1
fsspec==2024.3.1
h5netcdf==1.3.0
h5py==3.11.0
h5pyd @ git+https://github.com/hdfgroup/h5pyd
idna==3.7
ipykernel==6.29.4
jmespath==1.0.1
kiwisolver==1.4.5
matplotlib==3.8.4
Expand All @@ -37,4 +39,5 @@ s3fs==2024.3.1
six==1.16.0
urllib3==2.2.1
wrapt==1.16.0
xarray==2024.5.0
yarl==1.9.4
19 changes: 2 additions & 17 deletions h5pyd/_hl/httpconn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright by The HDF Group. #
# All rights reserved. #
# #
# This file is part of H5Serv (HDF5 REST Server) Service, Libraries and #
# This file is part of HSDS (HDF5 REST Server) Service, Libraries and #
# Utilities. The full HDF5 REST Server copyright notice, including #
# terms governing use, modification, and redistribution, is contained in #
# the file COPYING, which can be found at the root of the source code #
Expand Down Expand Up @@ -200,8 +200,6 @@ def __init__(
if endpoint is None:
if "HS_ENDPOINT" in os.environ:
endpoint = os.environ["HS_ENDPOINT"]
elif "H5SERV_ENDPOINT" in os.environ:
endpoint = os.environ["H5SERV_ENDPOINT"]

if not endpoint:
msg = "no endpoint set"
Expand Down Expand Up @@ -265,17 +263,13 @@ def __init__(
if username is None:
if "HS_USERNAME" in os.environ:
username = os.environ["HS_USERNAME"]
elif "H5SERV_USERNAME" in os.environ:
username = os.environ["H5SERV_USERNAME"]
if isinstance(username, str) and (not username or username.upper() == "NONE"):
username = None
self._username = username

if password is None:
if "HS_PASSWORD" in os.environ:
password = os.environ["HS_PASSWORD"]
elif "H5SERV_PASSWORD" in os.environ:
password = os.environ["H5SERV_PASSWORD"]
if isinstance(password, str) and (not password or password.upper() == "NONE"):
password = None
self._password = password
Expand Down Expand Up @@ -718,15 +712,7 @@ def session(self):
backoff_factor = 1
status_forcelist = (500, 502, 503, 504)
lambda_prefix = requests_lambda.LAMBDA_REQ_PREFIX
allowed_methods = [
"HEAD",
"GET",
"PUT",
"DELETE",
"OPTIONS",
"TRACE",
"POST",
] # include POST retries

if self._use_session:
if self._s is None:
if self._endpoint.startswith("http+unix://"):
Expand All @@ -744,7 +730,6 @@ def session(self):
connect=retries,
backoff_factor=backoff_factor,
status_forcelist=status_forcelist,
allowed_methods=allowed_methods,
)

s.mount(
Expand Down