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.

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 Jupyter env build with new xlrd, pre-commit, pin dask, distributed, cf_xarray, latest of everything else #101

Merged
merged 12 commits into from
Apr 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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:220121"
image "pavics/workflow-tests:220401"
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:220121
FROM pavics/workflow-tests:220401

USER root

Expand Down
3 changes: 2 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ RUN wget https://raw.githubusercontent.com/jupyter/docker-stacks/$DOCKER_STACKS_
wget https://raw.githubusercontent.com/jupyter/docker-stacks/$DOCKER_STACKS_COMMIT/base-notebook/jupyter_notebook_config.py --output-document /etc/jupyter/jupyter_notebook_config.py && \
chmod a+rx /usr/local/bin/start.sh /usr/local/bin/start-singleuser.sh /usr/local/bin/start-notebook.sh /usr/local/bin/fix-permissions && \
chmod a+r /etc/jupyter/jupyter_notebook_config.py && \
mkdir /notebook_dir && chown jenkins /notebook_dir
mkdir /notebook_dir && chown jenkins /notebook_dir && \
chmod a+rwX -R /opt/conda/envs/birdy/fonts

# 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
Expand Down
8 changes: 6 additions & 2 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:211221
FROM pavics/workflow-tests:220201

USER root

# Use 'update' for existing and 'install' for new package.
# Keep same channel ordering to not revert anything.
# Pin dask and distributed for slow PAVICStutorial_ClimateDataAnalysis-3Climate-Indicators.ipynb.
# Pin cf_xarray for slow WPS_example.ipynb.
RUN umask 0000 \
&& mamba install -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy "shapely<=1.7.1" "bokeh<=2.3.3"
&& conda install -c conda-forge mamba -n base \
&& mamba install -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy "dask<=2022.1.0" "distributed<=2022.1.0" "cf_xarray<=0.6.3" \
&& conda remove mamba -n base
# && pip uninstall -y ravenpy \
# && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy ravenpy aiohttp

Expand Down
12 changes: 12 additions & 0 deletions docker/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ dependencies:
- xclim >= 0.32.1
- ravenpy >= 0.7.8

# Pin dask and distributed for slow PAVICStutorial_ClimateDataAnalysis-3Climate-Indicators.ipynb.
# Same as in commit https://github.com/bird-house/finch/pull/226/commits/7bf4a7e1bcb12bc88d15bdcbbd484e81106be67c
# See issue https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/issues/100
- dask <= 2022.1.0
- distributed <= 2022.1.0

# Pin cf_xarray for slow WPS_example.ipynb.
- cf_xarray<=0.6.3

- matplotlib
# - xarray # from xclim and ravenpy
# - numpy # from xclim and ravenpy
Expand Down Expand Up @@ -88,6 +97,7 @@ dependencies:
- s3fs
# - shapely # from ravenpy
# PIN shapely due to notebook failure
# See issue https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/issues/99
# PAVICStutorial_ClimateDataAnalysis-5Visualization.ipynb:
# /opt/conda/envs/birdy/lib/python3.7/site-packages/shapely/geometry/base.py in array_interface_base(self)
# 324 "removed in Shapely 2.0.",
Expand Down Expand Up @@ -173,6 +183,8 @@ dependencies:
- scp
- selenium
- geckodriver
- xlrd
- pre-commit
# for pip packages
- pip
- pip:
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:220121"
DOCKER_IMAGE="pavics/workflow-tests:220401"
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:220121"
DOCKER_IMAGE="pavics/workflow-tests:220401"
fi

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