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

jupyter docker: upgrade birdy, pin pandas and geopandas for Era5 Raven notebooks #37

Merged
merged 8 commits into from
Mar 13, 2020
Merged

jupyter docker: upgrade birdy, pin pandas and geopandas for Era5 Raven notebooks #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
533a3ce
docker: install birdy from source to avoid waiting for a full release
tlvu Mar 10, 2020
5b1806e
docker: pin old working geopandas and pandas for Raven notebook gridd…
tlvu Mar 10, 2020
15cf5b2
docker: pin old jupyterlab for ipyleaf marker not displaying in new j…
tlvu Mar 10, 2020
0bafd89
docker: can not pin jupyterlab else have to pin all other extensions …
tlvu Mar 10, 2020
56e4b1d
release: update to use image pavics/workflow-tests:200310
tlvu Mar 10, 2020
cf81f13
docker: install birdy 0.6.9 from pip to try fix DockerHub build
tlvu Mar 12, 2020
46a6fc6
docker: note condition to unpin geopandas and pandas
tlvu Mar 12, 2020
e097769
release: update to use image pavics/workflow-tests:200312
tlvu Mar 12, 2020
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:200309"
image "pavics/workflow-tests:200312"
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:200309
FROM pavics/workflow-tests:200312

USER root

Expand Down
9 changes: 7 additions & 2 deletions docker/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,19 @@ dependencies:
- matplotlib
- xarray
- numpy
- birdy
# - birdy
tlvu marked this conversation as resolved.
Show resolved Hide resolved
- owslib>=0.19.0
- netcdf4
- pydap
- cartopy
- descartes
- rasterio
- gdal # for osgeo
- geopandas
# can unpin geopandas and pandas once there is newer salem release than 0.2.4
# test using Raven notebook gridded_data_subset.ipynb
- geopandas==0.6.2
- pandas==0.25.3
- scikit-image
- ipyleaflet
- threddsclient
# - bokeh
Expand Down Expand Up @@ -49,6 +53,7 @@ dependencies:
# for pip packages
- pip
- pip:
- birdhouse-birdy
- xclim
# visual debugger for Jupyter Notebook, not working with JupyterLab at this moment
- pixiedust
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:200309"
DOCKER_IMAGE="pavics/workflow-tests:200312"
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:200309"
DOCKER_IMAGE="pavics/workflow-tests:200312"
fi

if [ -z "$CONTAINER_NAME" ]; then
Expand Down