Skip to content

Commit

Permalink
Merge pull request #52 from Ouranosinc/install-xclim-using-conda-to-p…
Browse files Browse the repository at this point in the history 
…ull-new-clisops

docker: Install xclim using conda to pull new clisops

Relevant changes:
```diff
>   - clisops=0.3.1=pyh32f6830_1

<     - xclim==0.19.0
>   - xclim=0.20.0=py_0

<   - xarray=0.16.0py_0
>   - xarray=0.16.1=py_0

<   - dask=2.26.0=py_0
>   - dask=2.27.0=py_0

<   - fiona=1.8.13=py37h0492a4a_1
>   - fiona=1.8.17=py37ha3d844c_0

<   - gdal=3.0.4=py37h4b180d9_10
>   - gdal=3.1.2=py37h518339e_2

<   - jupyter_server=0.1.1=py37_0
>   - jupyter_server=1.0.1=py37hc8dfbb8_0

>     - jupyternotify==0.1.15

>     - pytest-tornasync==0.6.0.post2
```

Passing Jenkins build: http://jenkins.ouranos.ca/job/PAVICS-e2e-workflow-tests/job/install-xclim-using-conda-to-pull-new-clisops/7/console

Full `conda env export` diff:
[200914.1-200925.1-conda-env-export.diff.txt](https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/files/5285928/200914.1-200925.1-conda-env-export.diff.txt)

```diff
21c21
<   - bleach=3.1.5=pyh9f0ad1d_0
---
>   - bleach=3.2.1=pyh9f0ad1d_0
24a25
>   - boltons=20.2.1=pyh9f0ad1d_0
25a27
>   - bottleneck=1.3.2=py37h03ebfcd_1
34c36
<   - cartopy=0.18.0=py37h4b180d9_0
---
>   - cartopy=0.18.0=py37h0f91b66_2
40c42
<   - cffi=1.14.1=py37h2b28604_0
---
>   - cffi=1.14.3=py37h2b28604_0
43c45
<   - chardet=3.0.4=py37hc8dfbb8_1006
---
>   - chardet=3.0.4=py37hc8dfbb8_1007
47a50
>   - clisops=0.3.1=pyh32f6830_1
53,54c56,57
<   - cryptography=3.1=py37hb09aad4_0
<   - curl=7.71.1=he644dc0_5
---
>   - cryptography=3.1.1=py37hb09aad4_0
>   - curl=7.71.1=he644dc0_6
56,58c59,61
<   - cytoolz=0.10.1=py37h516909a_0
<   - dash=1.16.0=pyh9f0ad1d_0
<   - dash-core-components=1.12.0=pyh9f0ad1d_0
---
>   - cytoolz=0.11.0=py37h8f50634_0
>   - dash=1.16.1=pyh9f0ad1d_0
>   - dash-core-components=1.12.1=pyh9f0ad1d_0
60c63
<   - dash-renderer=1.8.0=pyh9f0ad1d_0
---
>   - dash-renderer=1.8.1=pyh9f0ad1d_0
62,63c65,66
<   - dask=2.26.0=py_0
<   - dask-core=2.26.0=py_0
---
>   - dask=2.27.0=py_0
>   - dask-core=2.27.0=py_0
71c74
<   - distributed=2.26.0=py37hc8dfbb8_0
---
>   - distributed=2.27.0=py37hc8dfbb8_0
80c83
<   - fiona=1.8.13=py37h0492a4a_1
---
>   - fiona=1.8.17=py37ha3d844c_0
89c92
<   - gdal=3.0.4=py37h4b180d9_10
---
>   - gdal=3.1.2=py37h518339e_2
90a94
>   - geojson=2.5.0=py_0
93,95c97,99
<   - geotiff=1.6.0=h05acad5_0
<   - geoviews=1.8.1=py_0
<   - geoviews-core=1.8.1=py_0
---
>   - geotiff=1.6.0=ha04d9d0_1
>   - geoviews=1.8.2=py_0
>   - geoviews-core=1.8.2=py_0
97c101
<   - ghostscript=9.22=hf484d3e_1001
---
>   - ghostscript=9.53.1=he1b5a44_0
111c115
<   - holoviews=1.13.3=pyh9f0ad1d_0
---
>   - holoviews=1.13.4=pyh9f0ad1d_0
117,118c121,123
<   - importlib-metadata=1.7.0=py37hc8dfbb8_0
<   - importlib_metadata=1.7.0=0
---
>   - importlib-metadata=2.0.0=py37hc8dfbb8_0
>   - importlib_metadata=2.0.0=0
>   - importlib_resources=3.0.0=py37hc8dfbb8_0
127c132
<   - jedi=0.15.2=py37_0
---
>   - jedi=0.17.2=py37hc8dfbb8_0
128a134
>   - joblib=0.16.0=py_0
131c137
<   - json5=0.9.4=pyh9f0ad1d_0
---
>   - json5=0.9.5=pyh9f0ad1d_0
133d138
<   - jupyter=1.0.0=py_2
140c145
<   - jupyter_server=0.1.1=py37_0
---
>   - jupyter_server=1.0.1=py37hc8dfbb8_0
144c149
<   - jupyterlab=2.2.7=py_0
---
>   - jupyterlab=2.2.8=py_0
162c167
<   - libcurl=7.71.1=hcdd3856_5
---
>   - libcurl=7.71.1=hcdd3856_6
170c175
<   - libgdal=3.0.4=he6a97d6_10
---
>   - libgdal=3.1.2=hf6fc319_2
185c190
<   - libsodium=1.0.18=h516909a_0
---
>   - libsodium=1.0.18=h516909a_1
187c192
<   - libspatialite=4.3.0a=h2482549_1038
---
>   - libspatialite=4.3.0a=h57f1b35_1039
207,208c212,213
<   - matplotlib=3.3.1=1
<   - matplotlib-base=3.3.1=py37hd478181_1
---
>   - matplotlib=3.3.2=0
>   - matplotlib-base=3.3.2=py37hd478181_0
216c221
<   - nbconvert=5.6.1=py37hc8dfbb8_1
---
>   - nbclient=0.5.0=py_0
221a227
>   - nest-asyncio=1.4.0=py_1
228,229c234,235
<   - nspr=4.28=he1b5a44_0
<   - nss=3.56=he751ad9_0
---
>   - nspr=4.29=he1b5a44_0
>   - nss=3.57=he751ad9_0
237c243
<   - openssl=1.1.1g=h516909a_1
---
>   - openssl=1.1.1h=h516909a_0
251a258
>   - pint=0.16.1=py_0
257c264
<   - poppler=0.87.0=h4190859_1
---
>   - poppler=0.89.0=h4190859_1
260c267
<   - proj=7.0.0=h966b41f_5
---
>   - proj=7.1.0=h966b41f_1
277c284
<   - pygments=2.7.0=py_0
---
>   - pygments=2.7.1=py_0
281c288
<   - pyproj=2.6.1.post1=py37h34dd122_0
---
>   - pyproj=2.6.1.post1=py37hb5dadc3_1
300c307
<   - rasterio=1.1.5=py37h0492a4a_1
---
>   - rasterio=1.1.6=py37ha3d844c_1
309a317
>   - scikit-learn=0.23.2=py37h6785257_0
312c320
<   - setuptools=49.6.0=py37hc8dfbb8_0
---
>   - setuptools=49.6.0=py37hc8dfbb8_1
325c333
<   - terminado=0.8.3=py37hc8dfbb8_1
---
>   - terminado=0.9.1=py37hc8dfbb8_0
326a335
>   - threadpoolctl=2.1.0=pyh5ca1d4c_0
328,329c337,338
<   - tifffile=2020.9.3=py_0
<   - tiledb=1.7.7=h8efa9f0_3
---
>   - tifffile=2020.9.22=py_0
>   - tiledb=2.0.8=h3effe38_0
332c341
<   - toolz=0.10.0=py_0
---
>   - toolz=0.11.1=py_0
335,336c344,345
<   - traitlets=4.3.3=py37hc8dfbb8_1
<   - traittypes=0.2.1=py_1
---
>   - traitlets=5.0.4=py_1
>   - traittypes=0.2.1=pyh9f0ad1d_2
342c351
<   - voila=0.1.23=py_0
---
>   - voila=0.2.3=py_0
344c353
<   - wcwidth=0.2.5=pyh9f0ad1d_1
---
>   - wcwidth=0.2.5=pyh9f0ad1d_2
352,353c361,363
<   - xarray=0.16.0=py_0
<   - xerces-c=3.2.2=h8412b87_1004
---
>   - xarray=0.16.1=py_0
>   - xclim=0.20.0=py_0
>   - xerces-c=3.2.3=h8412b87_0
355c365
<   - xeus-python=0.8.4=py37h99015e2_0
---
>   - xeus-python=0.8.4=py37h99015e2_1
372c382
<   - zipp=3.1.0=py_0
---
>   - zipp=3.2.0=py_0
378,379d387
<     - boltons==20.2.1
<     - bottleneck==1.3.2
383,384c391,392
<     - geojson==2.5.0
<     - handcalcs==0.8.1
---
>     - handcalcs==1.0.3
>     - innerscope==0.2.0
386c394,395
<     - joblib==0.16.0
---
>     - jupyter==1.0.0
>     - jupyternotify==0.1.15
388c397,398
<     - pint==0.16
---
>     - nbconvert==5.6.1
>     - nbresuse==0.3.6
392a403
>     - pytest-tornasync==0.6.0.post2
395,396d405
<     - scikit-learn==0.23.2
<     - threadpoolctl==2.1.0
398d406
<     - xclim==0.19.0
```

New `conda env export`:
[200925.1-conda-env-export.yml.txt](https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/files/5285931/200925.1-conda-env-export.yml.txt)
```
name: birdy
channels:
  - plotly
  - cdat
  - conda-forge
  - defaults
dependencies:
  - _libgcc_mutex=0.1=conda_forge
  - _openmp_mutex=4.5=1_gnu
  - affine=2.3.0=py_0
  - alembic=1.4.3=pyh9f0ad1d_0
  - ansi2html=1.5.2=py37hc8dfbb8_1
  - appdirs=1.4.3=py_1
  - argon2-cffi=20.1.0=py37h8f50634_1
  - async_generator=1.10=py_0
  - attrs=20.2.0=pyh9f0ad1d_0
  - backcall=0.2.0=pyh9f0ad1d_0
  - backports=1.0=py_2
  - backports.functools_lru_cache=1.6.1=py_0
  - beautifulsoup4=4.9.1=py_1
  - bleach=3.2.1=pyh9f0ad1d_0
  - blinker=1.4=py_1
  - blosc=1.20.1=he1b5a44_0
  - bokeh=2.2.1=py37hc8dfbb8_0
  - boltons=20.2.1=pyh9f0ad1d_0
  - boost-cpp=1.72.0=h8e57a91_0
  - bottleneck=1.3.2=py37h03ebfcd_1
  - branca=0.3.1=py_0
  - brotli=1.0.9=he1b5a44_0
  - brotlipy=0.7.0=py37h8f50634_1000
  - brunsli=0.1=he1b5a44_0
  - bzip2=1.0.8=h516909a_3
  - c-ares=1.16.1=h516909a_3
  - ca-certificates=2020.6.20=hecda079_0
  - cairo=1.16.0=hcf35c78_1003
  - cartopy=0.18.0=py37h0f91b66_2
  - cdat_info=8.2.1=pyh9f0ad1d_1
  - cdtime=3.1.4=py37hd741776_0
  - cdutil=8.2.1=pyh9f0ad1d_0
  - certifi=2020.6.20=py37hc8dfbb8_0
  - certipy=0.1.3=py_0
  - cffi=1.14.3=py37h2b28604_0
  - cfitsio=3.470=hce51eda_6
  - cftime=1.2.1=py37h03ebfcd_0
  - chardet=3.0.4=py37hc8dfbb8_1007
  - charls=2.1.0=he1b5a44_2
  - click=7.1.2=pyh9f0ad1d_0
  - click-plugins=1.1.1=py_0
  - cligj=0.5.0=py_0
  - clisops=0.3.1=pyh32f6830_1
  - cloudpickle=1.6.0=py_0
  - colorama=0.4.3=py_0
  - colorcet=2.0.1=py_0
  - configurable-http-proxy=4.2.1=node13_he01fd0c_0
  - coverage=5.3=py37h8f50634_0
  - cryptography=3.1.1=py37hb09aad4_0
  - curl=7.71.1=he644dc0_6
  - cycler=0.10.0=py_2
  - cytoolz=0.11.0=py37h8f50634_0
  - dash=1.16.1=pyh9f0ad1d_0
  - dash-core-components=1.12.1=pyh9f0ad1d_0
  - dash-html-components=1.1.1=pyh9f0ad1d_0
  - dash-renderer=1.8.1=pyh9f0ad1d_0
  - dash-table=4.10.1=pyh9f0ad1d_0
  - dask=2.27.0=py_0
  - dask-core=2.27.0=py_0
  - datashader=0.11.1=pyh9f0ad1d_0
  - datashape=0.5.4=py_1
  - dbus=1.13.6=he372182_0
  - decorator=4.4.2=py_0
  - defusedxml=0.6.0=py_0
  - descartes=1.1.0=py_4
  - distarray=2.12.2=py_1
  - distributed=2.27.0=py37hc8dfbb8_0
  - docopt=0.6.2=py_1
  - dv3d=8.2.1=pyh9f0ad1d_0
  - entrypoints=0.3=py37hc8dfbb8_1001
  - esgf-compute-api=2.3.4=py_0
  - esmf=8.0.1=nompi_hbeb3ca6_0
  - esmpy=8.0.1=nompi_py37h777d1d2_0
  - expat=2.2.9=he1b5a44_2
  - ffmpeg=4.2.3=h167e202_0
  - fiona=1.8.17=py37ha3d844c_0
  - flask=1.1.2=pyh9f0ad1d_0
  - flask-compress=1.5.0=pyh9f0ad1d_0
  - fontconfig=2.13.1=h86ecdb6_1001
  - freetype=2.10.2=he06d7ca_0
  - freexl=1.0.5=h516909a_1002
  - fsspec=0.8.2=py_0
  - future=0.18.2=py37hc8dfbb8_1
  - g2clib=1.6.0=hf3f1b0b_9
  - gdal=3.1.2=py37h518339e_2
  - genutil=8.2.1=py37h161383b_0
  - geojson=2.5.0=py_0
  - geopandas=0.8.1=py_0
  - geos=3.8.1=he1b5a44_0
  - geotiff=1.6.0=ha04d9d0_1
  - geoviews=1.8.2=py_0
  - geoviews-core=1.8.2=py_0
  - gettext=0.19.8.1=hc5be6a0_1002
  - ghostscript=9.53.1=he1b5a44_0
  - giflib=5.2.1=h516909a_2
  - gitdb=4.0.5=py_0
  - gitpython=3.1.8=py_0
  - glib=2.66.0=h0dae87d_0
  - gmp=6.2.0=he1b5a44_2
  - gnutls=3.6.13=h79a8f9a_0
  - gst-plugins-base=1.14.5=h0935bb2_2
  - gstreamer=1.14.5=h36ae1b5_2
  - h5netcdf=0.8.1=py_0
  - h5py=2.10.0=nompi_py37h90cd8ad_104
  - hdf4=4.2.13=hf30be14_1003
  - hdf5=1.10.6=nompi_h3c11f04_101
  - heapdict=1.0.1=py_0
  - holoviews=1.13.4=pyh9f0ad1d_0
  - hvplot=0.6.0=pyh9f0ad1d_0
  - icu=64.2=he1b5a44_1
  - idna=2.10=pyh9f0ad1d_0
  - imagecodecs=2020.5.30=py37hda6ee5b_2
  - imageio=2.9.0=py_0
  - importlib-metadata=2.0.0=py37hc8dfbb8_0
  - importlib_metadata=2.0.0=0
  - importlib_resources=3.0.0=py37hc8dfbb8_0
  - iniconfig=1.0.1=pyh9f0ad1d_0
  - ipykernel=5.3.4=py37h43977f1_0
  - ipyleaflet=0.13.3=pyh9f0ad1d_0
  - ipython=7.18.1=py37hc6149b9_0
  - ipython_genutils=0.2.0=py_1
  - ipywidgets=7.5.1=pyh9f0ad1d_1
  - itsdangerous=1.1.0=py_0
  - jasper=1.900.1=h07fcdf6_1006
  - jedi=0.17.2=py37hc8dfbb8_0
  - jinja2=2.11.2=pyh9f0ad1d_0
  - joblib=0.16.0=py_0
  - jpeg=9d=h516909a_0
  - json-c=0.13.1=hbfbb72e_1002
  - json5=0.9.5=pyh9f0ad1d_0
  - jsonschema=3.2.0=py37hc8dfbb8_1
  - jupyter-archive=0.7.0=py_0
  - jupyter-dash=0.3.0=py_0
  - jupyter_bokeh=2.0.3=py_0
  - jupyter_client=6.1.7=py_0
  - jupyter_console=6.2.0=py_0
  - jupyter_core=4.6.3=py37hc8dfbb8_1
  - jupyter_server=1.0.1=py37hc8dfbb8_0
  - jupyter_telemetry=0.0.5=py_0
  - jupyterhub=1.1.0=py37hc8dfbb8_4
  - jupyterhub-base=1.1.0=py37hc8dfbb8_4
  - jupyterlab=2.2.8=py_0
  - jupyterlab_pygments=0.1.1=pyh9f0ad1d_0
  - jupyterlab_server=1.2.0=py_0
  - jxrlib=1.1=h516909a_2
  - kealib=1.4.13=h33137a7_1
  - kiwisolver=1.2.0=py37h99015e2_0
  - krb5=1.17.1=hfafb76e_3
  - lame=3.100=h14c3975_1001
  - lazy-object-proxy=1.5.1=py37h8f50634_0
  - lcms2=2.11=hbd6801e_0
  - ld_impl_linux-64=2.35=h769bd43_9
  - lerc=2.2=he1b5a44_0
  - libaec=1.0.4=he1b5a44_1
  - libblas=3.8.0=17_openblas
  - libcblas=3.8.0=17_openblas
  - libcdms=3.1.2=h054cd8a_112
  - libcf=1.0.3=py37hda0e254_108
  - libclang=9.0.1=default_hde54327_0
  - libcurl=7.71.1=hcdd3856_6
  - libdap4=3.20.6=h1d1bd15_1
  - libdrs=3.1.2=hc2e2db3_112
  - libdrs_f=3.1.2=hae7e664_110
  - libedit=3.1.20191231=he28a2e2_2
  - libev=4.33=h516909a_1
  - libffi=3.2.1=he1b5a44_1007
  - libgcc-ng=9.3.0=h24d8f2e_16
  - libgdal=3.1.2=hf6fc319_2
  - libgfortran-ng=7.5.0=hdf63c60_16
  - libgomp=9.3.0=h24d8f2e_16
  - libiconv=1.16=h516909a_0
  - libidn2=2.3.0=h516909a_0
  - libkml=1.3.0=hd79254b_1012
  - liblapack=3.8.0=17_openblas
  - libllvm10=10.0.1=he513fc3_3
  - libllvm9=9.0.1=he513fc3_1
  - libnetcdf=4.7.4=nompi_h84807e1_105
  - libnghttp2=1.41.0=h8cfc5f6_2
  - libopenblas=0.3.10=pthreads_hb3c22a3_4
  - libpng=1.6.37=hed695b0_2
  - libpq=12.3=h5513abc_0
  - libprotobuf=3.13.0=h8b12597_0
  - libsodium=1.0.18=h516909a_1
  - libspatialindex=1.9.3=he1b5a44_3
  - libspatialite=4.3.0a=h57f1b35_1039
  - libssh2=1.9.0=hab1572f_5
  - libstdcxx-ng=9.3.0=hdf63c60_16
  - libtiff=4.1.0=hc7e4089_6
  - libunistring=0.9.10=h14c3975_0
  - libuuid=2.32.1=h14c3975_1000
  - libuv=1.34.0=h516909a_0
  - libwebp-base=1.1.0=h516909a_3
  - libxcb=1.13=h14c3975_1002
  - libxkbcommon=0.10.0=he1b5a44_0
  - libxml2=2.9.10=hee79883_0
  - libxslt=1.1.33=h31b3aaa_0
  - libzopfli=1.0.3=he1b5a44_0
  - llvmlite=0.34.0=py37h5202443_1
  - locket=0.2.0=py_2
  - lxml=4.5.2=py37he3881c9_0
  - lz4-c=1.9.2=he1b5a44_3
  - mako=1.1.3=pyh9f0ad1d_0
  - markdown=3.2.2=py_0
  - markupsafe=1.1.1=py37h8f50634_1
  - matplotlib=3.3.2=0
  - matplotlib-base=3.3.2=py37hd478181_0
  - mechanicalsoup=0.12.0=py_0
  - mesalib=18.3.1=h590aaf7_0
  - mistune=0.8.4=py37h8f50634_1001
  - more-itertools=8.5.0=py_0
  - msgpack-python=1.0.0=py37h99015e2_1
  - multipledispatch=0.6.0=py_0
  - munch=2.5.0=py_0
  - nbclient=0.5.0=py_0
  - nbdime=2.0.0=py_1
  - nbformat=5.0.7=py_0
  - nbval=0.9.6=pyh9f0ad1d_0
  - nc-time-axis=1.2.0=py_1
  - ncurses=6.2=he1b5a44_1
  - nest-asyncio=1.4.0=py_1
  - netcdf-fortran=4.5.3=nompi_hfef6a68_100
  - netcdf4=1.5.4=nompi_py37hcbfd489_102
  - nettle=3.4.1=h1bed415_1002
  - networkx=2.5=py_0
  - nodejs=13.13.0=hf5d1a2b_0
  - notebook=6.1.4=py37hc8dfbb8_0
  - nspr=4.29=he1b5a44_0
  - nss=3.57=he751ad9_0
  - numba=0.51.2=py37h9fdb41a_0
  - numpy=1.19.1=py37h7ea13bd_2
  - oauthlib=3.0.1=py_0
  - olefile=0.46=py_0
  - openblas=0.3.10=pthreads_hf183345_4
  - openh264=2.1.1=h8b12597_0
  - openjpeg=2.3.1=h981e76c_3
  - openssl=1.1.1h=h516909a_0
  - owslib=0.20.0=py_0
  - packaging=20.4=pyh9f0ad1d_0
  - pamela=1.0.0=py_0
  - pandas=1.1.2=py37h3340039_0
  - pandoc=2.10.1=h516909a_0
  - pandocfilters=1.4.2=py_1
  - panel=0.9.7=py_0
  - param=1.9.3=py_0
  - parso=0.7.1=pyh9f0ad1d_0
  - partd=1.1.0=py_0
  - pcre=8.44=he1b5a44_0
  - pexpect=4.8.0=py37hc8dfbb8_1
  - pickleshare=0.7.5=py37hc8dfbb8_1001
  - pillow=7.2.0=py37h718be6c_1
  - pint=0.16.1=py_0
  - pip=20.2.3=py_0
  - pixman=0.38.0=h516909a_1003
  - plotly=4.10.0=pyh9f0ad1d_0
  - pluggy=0.13.1=py37hc8dfbb8_2
  - pooch=1.2.0=py_0
  - poppler=0.89.0=h4190859_1
  - poppler-data=0.4.9=1
  - postgresql=12.3=h8573dbc_0
  - proj=7.1.0=h966b41f_1
  - prometheus_client=0.8.0=pyh9f0ad1d_0
  - prompt-toolkit=3.0.7=py_0
  - prompt_toolkit=3.0.7=0
  - protobuf=3.13.0=py37h3340039_0
  - pscript=0.7.4=pyh9f0ad1d_0
  - psutil=5.7.2=py37h8f50634_0
  - pthread-stubs=0.4=h14c3975_1001
  - ptvsd=4.3.2=py37h516909a_1
  - ptyprocess=0.6.0=py_1001
  - py=1.9.0=pyh9f0ad1d_0
  - pycparser=2.20=pyh9f0ad1d_2
  - pyct=0.4.6=py_0
  - pyct-core=0.4.6=py_0
  - pycurl=7.43.0.5=py37hce7685b_2
  - pydap=3.2.2=py37_1000
  - pyepsg=0.4.0=py_0
  - pygments=2.7.1=py_0
  - pyjwt=1.7.1=py_0
  - pyopenssl=19.1.0=py_1
  - pyparsing=2.4.7=pyh9f0ad1d_0
  - pyproj=2.6.1.post1=py37hb5dadc3_1
  - pyqt=5.12.3=py37h8685d9f_3
  - pyrsistent=0.17.3=py37h8f50634_0
  - pyshp=2.1.2=pyh9f0ad1d_0
  - pysocks=1.7.1=py37hc8dfbb8_1
  - pytest=6.0.2=py37hc8dfbb8_0
  - python=3.7.8=h6f2ec95_1_cpython
  - python-dateutil=2.8.1=py_0
  - python-editor=1.0.4=py_0
  - python-json-logger=0.1.11=py_0
  - python_abi=3.7=1_cp37m
  - pytz=2020.1=pyh9f0ad1d_0
  - pyviz_comms=0.7.6=pyh9f0ad1d_0
  - pywavelets=1.1.1=py37h161383b_2
  - pyyaml=5.3.1=py37h8f50634_0
  - pyzmq=19.0.2=py37hac76be4_0
  - qt=5.12.5=hd8c4c69_1
  - qtconsole=4.7.7=pyh9f0ad1d_0
  - qtpy=1.9.0=py_0
  - rasterio=1.1.6=py37ha3d844c_1
  - readline=8.0=he28a2e2_2
  - regionmask=0.6.1=py_0
  - requests=2.24.0=pyh9f0ad1d_0
  - retrying=1.3.3=py_2
  - rioxarray=0.0.31=py_0
  - rtree=0.9.4=py37h8526d28_1
  - ruamel.yaml=0.16.12=py37h8f50634_0
  - ruamel.yaml.clib=0.2.2=py37h8f50634_0
  - scikit-image=0.17.2=py37h9fdb41a_2
  - scikit-learn=0.23.2=py37h6785257_0
  - scipy=1.5.2=py37hb14ef9d_0
  - send2trash=1.5.0=py_0
  - setuptools=49.6.0=py37hc8dfbb8_1
  - shapely=1.7.1=py37hedb1597_0
  - siphon=0.8.0=py37hc8dfbb8_1003
  - six=1.15.0=pyh9f0ad1d_0
  - smmap=3.0.4=pyh9f0ad1d_0
  - snappy=1.1.8=he1b5a44_3
  - snuggs=1.4.7=py_0
  - sortedcontainers=2.2.2=pyh9f0ad1d_0
  - soupsieve=2.0.1=py_1
  - sqlalchemy=1.3.19=py37h8f50634_0
  - sqlite=3.33.0=h4cf870e_0
  - tbb=2020.2=hc9558a2_0
  - tblib=1.6.0=py_0
  - terminado=0.9.1=py37hc8dfbb8_0
  - testpath=0.4.4=py_0
  - threadpoolctl=2.1.0=pyh5ca1d4c_0
  - threddsclient=0.4.2=py_0
  - tifffile=2020.9.22=py_0
  - tiledb=2.0.8=h3effe38_0
  - tk=8.6.10=hed695b0_0
  - toml=0.10.1=pyh9f0ad1d_0
  - toolz=0.11.1=py_0
  - tornado=6.0.4=py37h8f50634_1
  - tqdm=4.49.0=pyh9f0ad1d_0
  - traitlets=5.0.4=py_1
  - traittypes=0.2.1=pyh9f0ad1d_2
  - typing_extensions=3.7.4.2=py_0
  - tzcode=2020a=h516909a_0
  - udunits2=2.2.27.6=h4e0c4b3_1001
  - urllib3=1.25.10=py_0
  - vcs=8.2.1=pyh9f0ad1d_0
  - voila=0.2.3=py_0
  - vtk-cdat=8.2.0.8.2=py37_mesalibhead77ed_0
  - wcwidth=0.2.5=pyh9f0ad1d_2
  - webencodings=0.5.1=py_1
  - webob=1.8.6=py_0
  - werkzeug=1.0.1=pyh9f0ad1d_0
  - wget=1.20.1=h22169c7_0
  - wheel=0.35.1=pyh9f0ad1d_0
  - widgetsnbextension=3.5.1=py37hc8dfbb8_1
  - x264=1!152.20180806=h14c3975_0
  - xarray=0.16.1=py_0
  - xclim=0.20.0=py_0
  - xerces-c=3.2.3=h8412b87_0
  - xeus=0.24.1=h4d8c418_0
  - xeus-python=0.8.4=py37h99015e2_1
  - xorg-kbproto=1.0.7=h14c3975_1002
  - xorg-libice=1.0.10=h516909a_0
  - xorg-libsm=1.2.3=h84519dc_1000
  - xorg-libx11=1.6.12=h516909a_0
  - xorg-libxau=1.0.9=h14c3975_0
  - xorg-libxdmcp=1.1.3=h516909a_0
  - xorg-libxext=1.3.4=h516909a_0
  - xorg-libxrender=0.9.10=h516909a_1002
  - xorg-renderproto=0.11.1=h14c3975_1002
  - xorg-xextproto=7.3.0=h14c3975_1002
  - xorg-xproto=7.0.31=h14c3975_1007
  - xz=5.2.5=h516909a_1
  - yaml=0.2.5=h516909a_0
  - zeromq=4.3.2=he1b5a44_3
  - zfp=0.5.5=he1b5a44_1
  - zict=2.0.0=py_0
  - zipp=3.2.0=py_0
  - zlib=1.2.11=h516909a_1009
  - zstd=1.4.5=h6597ccf_2
  - pip:
    - astunparse==1.6.3
    - birdhouse-birdy==0.6.9
    - cdms2==3.1.5
    - colour==0.1.5
    - funcsigs==1.0.2
    - handcalcs==1.0.3
    - innerscope==0.2.0
    - ipython-blocking==0.2.1
    - jupyter==1.0.0
    - jupyternotify==0.1.15
    - mpld3==0.5.1
    - nbconvert==5.6.1
    - nbresuse==0.3.6
    - pixiedust==1.1.18
    - pyqt5-sip==4.19.18
    - pyqtchart==5.12
    - pyqtwebengine==5.12.1
    - pytest-tornasync==0.6.0.post2
    - regrid2==3.1.5
    - requests-magpie==0.1.1
    - wrapt==1.12.1
prefix: /opt/conda/envs/birdy
```
  • Loading branch information
@tlvu
tlvu committed Sep 28, 2020
2 parents 02333bf + 9d6eb15 commit 18c8397
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Expand Up @@ -10,7 +10,7 @@ pipeline {
// https://jenkins.io/doc/book/pipeline/syntax/
agent {
docker {
image "pavics/workflow-tests:200914.1"
image "pavics/workflow-tests:200925.1"
label 'linux && docker'
}
}
Expand Down
2 changes: 1 addition & 1 deletion binder/Dockerfile
View file
@@ -1,4 +1,4 @@
FROM pavics/workflow-tests:200914.1
FROM pavics/workflow-tests:200925.1

USER root

Expand Down
7 changes: 6 additions & 1 deletion docker/Dockerfile
View file
Expand Up @@ -38,7 +38,12 @@ RUN jupyter labextension install @jupyter-widgets/jupyterlab-manager \
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager jupyter-leaflet \
&& jupyter labextension install @bokeh/jupyter_bokeh \
&& jupyter labextension install @pyviz/jupyterlab_pyviz \
&& jupyter labextension install @jupyterlab/debugger
&& jupyter labextension install @jupyterlab/debugger \
&& jupyter labextension install jupyterlab-topbar-extension \
jupyterlab-system-monitor \
jupyterlab-topbar-text \
jupyterlab-logout \
jupyterlab-theme-toggle
# && jupyter labextension install jupyterlab-clipboard


Expand Down
13 changes: 9 additions & 4 deletions docker/environment.yml
View file
Expand Up @@ -40,9 +40,7 @@ dependencies:
# pinning hvplot did not solve the problem with violin plot.
- hvplot
- nc-time-axis
# can re-enable xclim from conda once we have write access to
# https://github.com/conda-forge/xclim-feedstock
# - xclim
- xclim
# for esgf notebooks
- esgf-compute-api
- cdms2
Expand Down Expand Up @@ -72,7 +70,6 @@ dependencies:
- pip
- pip:
- birdhouse-birdy
- xclim
# visual debugger for Jupyter Notebook, not working with JupyterLab at this moment
- pixiedust
- requests-magpie
Expand All @@ -82,3 +79,11 @@ dependencies:
# pencil: write the symbolic formula, followed by numeric substitutions,
# and then the result.
- handcalcs
# https://github.com/ShopRunner/jupyter-notify
# Jupyter Magic For Browser Notifications of Cell Completion.
- jupyternotify
# Needed for https://github.com/jtpio/jupyterlab-topbar
- nbresuse
# Needed to run notebook tests. Missing indirect recursive dependencies
# somewhere, should not need to manually add it here.
- pytest-tornasync
2 changes: 1 addition & 1 deletion launchcontainer
View file
@@ -1,7 +1,7 @@
#!/bin/sh -x

if [ -z "$DOCKER_IMAGE" ]; then
DOCKER_IMAGE="pavics/workflow-tests:200914.1"
DOCKER_IMAGE="pavics/workflow-tests:200925.1"
fi

if [ -z "$CONTAINER_NAME" ]; then
Expand Down
2 changes: 1 addition & 1 deletion launchnotebook
View file
Expand Up @@ -7,7 +7,7 @@ if [ -z "$PORT" ]; then
fi

if [ -z "$DOCKER_IMAGE" ]; then
DOCKER_IMAGE="pavics/workflow-tests:200914.1"
DOCKER_IMAGE="pavics/workflow-tests:200925.1"
fi

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

0 comments on commit 18c8397

Please sign in to comment.