diff --git a/Jenkinsfile b/Jenkinsfile index c69f3b65..8877b1ba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { // https://jenkins.io/doc/book/pipeline/syntax/ agent { docker { - image "pavics/workflow-tests:210527.1-update20210705" + image "pavics/workflow-tests:210723" label 'linux && docker' } } diff --git a/binder/Dockerfile b/binder/Dockerfile index dde3928d..e702d7dd 100644 --- a/binder/Dockerfile +++ b/binder/Dockerfile @@ -1,4 +1,4 @@ -FROM pavics/workflow-tests:210527.1-update20210705 +FROM pavics/workflow-tests:210723 USER root diff --git a/docker/Dockerfile b/docker/Dockerfile index 700e743b..152f3ab2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,7 +4,7 @@ RUN conda update conda # to checkout other notebooks and to run pip install RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y git mercurial gcc unzip fonts-humor-sans && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y git mercurial gcc unzip patch fonts-humor-sans && \ apt-get clean COPY environment.yml /environment.yml diff --git a/docker/environment.yml b/docker/environment.yml index 8cf44c39..5612a01d 100644 --- a/docker/environment.yml +++ b/docker/environment.yml @@ -23,7 +23,9 @@ dependencies: - rasterio - gdal # for osgeo - geopandas - - pandas + # Pin pandas due to xarray + # https://github.com/pydata/xarray/issues/5588#issuecomment-885271773 + - pandas==1.2.5 - rioxarray - scikit-image - ipyleaflet @@ -44,8 +46,7 @@ dependencies: # pinning hvplot did not solve the problem with violin plot. - hvplot - nc-time-axis - # Pin cftime because of https://github.com/SciTools/nc-time-axis/issues/58 - - cftime==1.4.1 + - cftime - statsmodels # for ravenpy # for error 'ImportError: HTTPFileSystem requires "requests" and "aiohttp" to # be installed' with call 'fsspec.filesystem('https')' diff --git a/launchcontainer b/launchcontainer index 3ac5e6ca..6f680d63 100755 --- a/launchcontainer +++ b/launchcontainer @@ -1,7 +1,7 @@ #!/bin/sh -x if [ -z "$DOCKER_IMAGE" ]; then - DOCKER_IMAGE="pavics/workflow-tests:210527.1-update20210705" + DOCKER_IMAGE="pavics/workflow-tests:210723" fi if [ -z "$CONTAINER_NAME" ]; then diff --git a/launchnotebook b/launchnotebook index 4157aee1..be86e4a5 100755 --- a/launchnotebook +++ b/launchnotebook @@ -7,7 +7,7 @@ if [ -z "$PORT" ]; then fi if [ -z "$DOCKER_IMAGE" ]; then - DOCKER_IMAGE="pavics/workflow-tests:210527.1-update20210705" + DOCKER_IMAGE="pavics/workflow-tests:210723" fi if [ -z "$CONTAINER_NAME" ]; then