Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
cfb92c3
docker: add esgf-pyclient for pavics-sdi esgf-dap.ipynb
tlvu Jan 21, 2023
44b05a1
release: update to use image pavics/workflow-tests:230121
tlvu Jan 21, 2023
7ac0edc
docker: add xncml for gen_catalog refactoring
tlvu Feb 9, 2023
188a83c
release: update to use image pavics/workflow-tests:230209
tlvu Feb 9, 2023
471c81d
Merge remote-tracking branch 'origin/master' into new-docker-build
tlvu Feb 17, 2023
4170b0b
docker: add Globus Connect Personal for transferring files in and out…
tlvu Feb 17, 2023
126df72
release: update to use image pavics/workflow-tests:230217
tlvu Feb 17, 2023
88ad07d
docker: set ESMFMKFILE env var for import xesmf since esmf-8.4.0
tlvu Feb 21, 2023
95bbd6d
release: update to use image pavics/workflow-tests:230217-update230221
tlvu Feb 21, 2023
4f2a88a
docker: attempt to fix proj_create_from_database error
tlvu Feb 21, 2023
401e0cd
docker: real fix for proj_create_from_database error
tlvu Feb 21, 2023
ea2d74a
release: update to use image pavics/workflow-tests:230217-update230221-1
tlvu Feb 21, 2023
be11756
Merge remote-tracking branch 'origin/master' into new-docker-build
tlvu Feb 22, 2023
c325ad7
release: update to use image pavics/workflow-tests:230224
tlvu Feb 24, 2023
eab04b5
release: update to use image pavics/workflow-tests:230301
tlvu Mar 1, 2023
d27fd46
release: update to use image pavics/workflow-tests:230321
tlvu Mar 21, 2023
1ac07d0
Merge remote-tracking branch 'origin/master' into new-docker-build
tlvu Apr 5, 2023
9ba0508
release: update to use image pavics/workflow-tests:230405
tlvu Apr 5, 2023
1bd5957
docker: upgrade to python 3.10 since xarray dropped 3.8
tlvu Apr 19, 2023
c406ac9
release: update to use image pavics/workflow-tests:230419
tlvu Apr 19, 2023
288d681
docker: reduce image size by almost 2GB
tlvu May 4, 2023
70a1af9
release: update to use image pavics/workflow-tests:230503
tlvu May 4, 2023
5355487
docker: pin netcdf4 for https://github.com/Unidata/netcdf4-python/iss…
tlvu May 11, 2023
e15176d
release: update to use image pavics/workflow-tests:230511
tlvu May 11, 2023
6bbcec3
Revert "docker: pin netcdf4 for https://github.com/Unidata/netcdf4-py…
tlvu May 23, 2023
c26f8a6
Revert "release: update to use image pavics/workflow-tests:230511"
tlvu May 23, 2023
a490c3c
release: update to use image pavics/workflow-tests:230523
tlvu May 23, 2023
94a487b
docker: add pyogrio for pavics-sdi notebooks
tlvu May 24, 2023
8aa243f
release: update to use image pavics/workflow-tests:230523-update230524
tlvu May 24, 2023
7da831c
docker: re-install netcdf4 from source as fix for netcdf4 build problem
tlvu May 24, 2023
570e9c8
release: update to use image pavics/workflow-tests:230523-update230524-1
tlvu May 24, 2023
1c91949
docker: prevent geoviews downgrade and force downgrade netcdf4==1.6.0…
tlvu May 25, 2023
b3c3348
release: update to use image pavics/workflow-tests:230523-update230525
tlvu May 25, 2023
d761abc
release: update to use image pavics/workflow-tests:230525
tlvu May 25, 2023
58f5cd8
docker: attempt to fix unable to pip install inside the Jupyter env
tlvu May 26, 2023
ed1d932
docker: downgrade to py39 and pin Panel for our various dashboards
tlvu May 26, 2023
18cfee8
release: update to use image pavics/workflow-tests:230526
tlvu May 26, 2023
9c375e6
docker: pin libnetcdf because of weird warnings in homepage nb 3
tlvu May 26, 2023
e0491d9
docker: remove netcdf4 recompile from source since libnetcdf seems to…
tlvu May 26, 2023
b8bfad0
docker: reference issue with popmean.shape[axis] error
tlvu May 26, 2023
3df811a
release: update to use image pavics/workflow-tests:230526-1
tlvu May 26, 2023
5c773a2
docker: pin numpy for datashade=True with hvplot.quadmesh()
tlvu May 26, 2023
7898ca3
docker: climpred temporary not a dependency of latest ravenpy
tlvu May 26, 2023
11e3c23
docker: climpred back to be a dependency of ravenpy, no need for expl…
tlvu May 29, 2023
6c3585d
docker: add pytest-xdist for Raven nb
tlvu May 29, 2023
a5792c8
release: update to use image pavics/workflow-tests:230529
tlvu May 29, 2023
3a7f12d
nb deploy: add RavenPy notebooks and merge with RavenWPS notebooks
tlvu May 29, 2023
d77b223
jenkins: add RavenPy repo, not activated nightly yet
tlvu May 29, 2023
12811b3
jenkins: add new possible PYTEST_EXTRA_OPTS vars as reminder
tlvu May 29, 2023
f253151
jenkins: pyproject.toml also confuse py.test execution rootdir
tlvu May 29, 2023
dbc97e8
.gitignore: add RavenPy-*/
tlvu May 29, 2023
11f5868
jenkins: raven also have pyproject.toml that needs to be removed
tlvu May 29, 2023
7988732
reorg-notebooks: avoid index.rst on Jupyter env
tlvu May 29, 2023
849a335
reorg-notebooks: do not deploy esgf-compute-api-examples to Jupyter env
tlvu May 29, 2023
483d602
docker: add seaborn for RavenPy Managing_Jupyter_Environments.ipynb
tlvu May 30, 2023
3f45775
docker: add hs_restclient for RavenPy HydroShare_integration.ipynb
tlvu May 30, 2023
aa27b50
release: update to use image pavics/workflow-tests:230529-1
tlvu May 30, 2023
06d8a44
docker: avoid cf_xarray 0.8.1
tlvu May 30, 2023
fa11db8
release: update to use image pavics/workflow-tests:230530
tlvu May 30, 2023
db6e283
docker: add hsclient for RavenPy nb
tlvu May 30, 2023
17fc574
docker: remove hs_restclient, replaced by hsclient
tlvu May 30, 2023
7e14b28
release: update to use image pavics/workflow-tests:230530-1
tlvu May 31, 2023
6acaace
jenkins: add HydroShare client id and token for RavenPy HydroShare_in…
tlvu May 31, 2023
9f372ec
jenkins: use --dist=loadscope --numprocesses=0 for all nb since it do…
tlvu Jun 1, 2023
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
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:221130"
image "pavics/workflow-tests:230217-update230221-1"
label 'linux && docker'
}
}
Expand Down
2 changes: 1 addition & 1 deletion binder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM pavics/workflow-tests:221130
FROM pavics/workflow-tests:230217-update230221-1

USER root

Expand Down
16 changes: 15 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,25 @@ RUN wget https://raw.githubusercontent.com/jupyter/docker-stacks/$DOCKER_STACKS_
mkdir /notebook_dir && chown jenkins /notebook_dir && \
chmod a+rwX -R /opt/conda/envs/birdy/fonts && \
chmod a+rwX -R /opt/conda/pkgs/cache && \
chown jenkins:jenkins -R /opt/conda/pkgs/cache
chown jenkins:jenkins -R /opt/conda/pkgs/cache && \
mkdir -p /usr/local/bin && \
wget https://downloads.globus.org/globus-connect-personal/linux/stable/globusconnectpersonal-latest.tgz -O /usr/local/bin/globusconnectpersonal-latest.tgz && \
tar xzf /usr/local/bin/globusconnectpersonal-latest.tgz -C /usr/local/bin/ && \
ln -vs /usr/local/bin/globusconnectpersonal*/globusconnectpersonal /usr/local/bin/globusconnectpersonal && \
rm -v /usr/local/bin/globusconnectpersonal-latest.tgz

# For jupyter-panel-proxy launcher.
ENV BOKEH_ALLOW_WS_ORIGIN "*"

# For import xesmf since esmf-8.4.0, see
# https://github.com/conda-forge/esmf-feedstock/issues/91
ENV ESMFMKFILE="/opt/conda/envs/birdy/lib/esmf.mk"

# To avoid error "PROJ: proj_create_from_database: Open of
# /opt/conda/envs/birdy/share/proj failed"
# This simulates a real `conda activate birdy`.
ENV PROJ_DATA="/opt/conda/envs/birdy/share/proj"

# problem running start-notebook.sh when being root
# the jupyter/base-notebook image also do not default to root user so we do the same here
USER jenkins
Expand Down
14 changes: 9 additions & 5 deletions docker/Dockerfile.testing
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
# For testing quickly without having to do a full rebuild.

FROM pavics/workflow-tests:220728
FROM pavics/workflow-tests:230217

USER root
ENV ESMFMKFILE="/opt/conda/envs/birdy/lib/esmf.mk"

ENV PROJ_DATA="/opt/conda/envs/birdy/share/proj"

#USER root

# Use 'update' for existing and 'install' for new package.
# Keep same channel ordering to not revert anything.
RUN umask 0000 \
&& mamba install -c conda-forge -c cdat -c bokeh -c plotly -c pyston -c pyviz/label/dev -c defaults -n birdy geopy
#RUN umask 0000 \
# && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c pyston -c pyviz/label/dev -c defaults -n birdy geopy
# && pip uninstall -y ravenpy \
# && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy ravenpy aiohttp

Expand All @@ -20,4 +24,4 @@ RUN umask 0000 \
#RUN umask 0000 \
# && pip install https://github.com/CSHS-CWRA/RavenPy/archive/refs/heads/master.zip

USER jenkins
#USER jenkins
5 changes: 5 additions & 0 deletions docker/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ dependencies:
- memory_profiler
# for esgf notebooks
- esgf-compute-api
# https://anaconda.org/conda-forge/esgf-pyclient (for pavics-sdi esgf-dap.ipynb)
- esgf-pyclient
- cdms2
# Disable vcs because it was forcing python downgrade to below 3.9.
# See https://github.com/CDAT/vcs/issues/457
Expand Down Expand Up @@ -192,6 +194,9 @@ dependencies:
# for pip packages
- pip
- pip:
# https://pypi.org/project/xncml/
# Tools for manipulating and opening NCML (NetCDF Markup) files with/for xarray
- xncml
# visual debugger for Jupyter Notebook, not working with JupyterLab at this moment
- pixiedust
# block execution of 'run_all_cells' until user input finished
Expand Down
2 changes: 1 addition & 1 deletion launchcontainer
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:221130"
DOCKER_IMAGE="pavics/workflow-tests:230217-update230221-1"
fi

if [ -z "$CONTAINER_NAME" ]; then
Expand Down
2 changes: 1 addition & 1 deletion launchnotebook
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:221130"
DOCKER_IMAGE="pavics/workflow-tests:230217-update230221-1"
fi

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