From 1c0b1ec3611d8268164df552636bb4fb670bd63f Mon Sep 17 00:00:00 2001 From: Devin Cowan Date: Thu, 20 Feb 2025 14:36:11 -0500 Subject: [PATCH] Update hsclient to version 1.1.3 in multiple Dockerfiles and requirements files --- singleuser/base/Dockerfile.base | 4 ++-- singleuser/python3-scientific/requirements.txt | 2 +- singleuser/si-2023/gpu/requirements.txt | 2 +- singleuser/si-2023/python/Dockerfile.python | 2 +- singleuser/si-2023/python/requirements.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/singleuser/base/Dockerfile.base b/singleuser/base/Dockerfile.base index fe0973e..caffbb2 100644 --- a/singleuser/base/Dockerfile.base +++ b/singleuser/base/Dockerfile.base @@ -34,8 +34,8 @@ RUN conda config --append envs_dirs /home/jovyan/data/conda-envs # install nbfetch, hstools, hsclient RUN pip install hs_restclient \ hstools \ - hsclient[all]==0.3.4 \ - "pydantic<2.0" # this is necessary until pydantic is pinned in hsmodels + hsclient[all]==1.1.3 \ + pydantic==2.7.* RUN pip install -U --no-cache-dir --upgrade-strategy only-if-needed \ git+https://github.com/hydroshare/nbfetch.git@v0.6.2 \ diff --git a/singleuser/python3-scientific/requirements.txt b/singleuser/python3-scientific/requirements.txt index 6f011a7..0533e2c 100644 --- a/singleuser/python3-scientific/requirements.txt +++ b/singleuser/python3-scientific/requirements.txt @@ -3,7 +3,7 @@ tabulate==0.8.10 pynhd==0.16.3 jenkspy==0.2.0 pyhydroqc==0.0.4 -hsclient[all]==1.0.1 +hsclient[all]==1.1.3 pygeohydro==0.16.5 cartopy==0.23.0 geoviews==1.12.0 diff --git a/singleuser/si-2023/gpu/requirements.txt b/singleuser/si-2023/gpu/requirements.txt index 07dd746..56d1354 100644 --- a/singleuser/si-2023/gpu/requirements.txt +++ b/singleuser/si-2023/gpu/requirements.txt @@ -2,4 +2,4 @@ jupyterlab-topbar jupyterlab-system-monitor jupyter-resource-usage dask-labextension -hsclient[all]==0.3.4 +hsclient[all]==1.1.3 diff --git a/singleuser/si-2023/python/Dockerfile.python b/singleuser/si-2023/python/Dockerfile.python index aade933..92e7de0 100644 --- a/singleuser/si-2023/python/Dockerfile.python +++ b/singleuser/si-2023/python/Dockerfile.python @@ -55,7 +55,7 @@ RUN pip install --src=/opt/src/clawpack_src --user -e \ # HydroShare packages # install nbfetch, hstools, hsclient -#RUN pip install hs_restclient hstools hsclient==0.3.1 \ +#RUN pip install hs_restclient hstools hsclient==1.1.3 \ RUN pip install -U --no-cache-dir --upgrade-strategy only-if-needed git+https://github.com/hydroshare/nbfetch.git@v0.6.2 # && jupyter server extension enable --py nbfetch --sys-prefix diff --git a/singleuser/si-2023/python/requirements.txt b/singleuser/si-2023/python/requirements.txt index d8fc933..c095e53 100644 --- a/singleuser/si-2023/python/requirements.txt +++ b/singleuser/si-2023/python/requirements.txt @@ -3,4 +3,4 @@ jupyterlab-topbar jupyterlab-system-monitor jupyter-resource-usage dask-labextension -hsclient[all]==0.3.4 +hsclient[all]==1.1.3