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

New docker full build to get latest RavenPy-0.6.0, Xclim-0.28.0 and latest of everything else #84

Merged
merged 5 commits into from
Jul 26, 2021
Merged

New docker full build to get latest RavenPy-0.6.0, Xclim-0.28.0 and latest of everything else #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b766d3c
docker: unpin cftime, SciTools/nc-time-axis/issues/58 resolved
tlvu Jul 13, 2021
526f9b7
docker: add patch to pull unreleased fixes if needed
tlvu Jul 22, 2021
9d04ca3
docker: pin pandas due to xarray
tlvu Jul 22, 2021
fae5b8f
Merge remote-tracking branch 'origin/master' into new-docker-full-build
tlvu Jul 23, 2021
0250863
release: update to use image pavics/workflow-tests:210723
tlvu Jul 23, 2021
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
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand Down
2 changes: 1 addition & 1 deletion binder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM pavics/workflow-tests:210527.1-update20210705
FROM pavics/workflow-tests:210723

USER root

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions docker/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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')'
Expand Down
2 changes: 1 addition & 1 deletion launchcontainer
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion launchnotebook
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down