Skip to content

Commit

Permalink
Merge pull request #185 from bird-house/new-jupyter-env-for-jupyterla…
Browse files Browse the repository at this point in the history
…b-v3

jupyter: update for JupyterLab v3, fix memory monitor display and RavenPy-0.7.0

See PR Ouranosinc/PAVICS-e2e-workflow-tests#85 for more info.

Relevant changes:
```diff
<   - jupyterlab=2.2.9=pyhd8ed1ab_0
>   - jupyterlab=3.1.0=pyhd8ed1ab_0

<   - jupyterlab_server=1.2.0=py_0
>   - jupyterlab_server=2.6.1=pyhd8ed1ab_0

<   - jupyter-archive=2.2.0=pyhd8ed1ab_0
>   - jupyter-archive=3.0.1=pyhd8ed1ab_0

<   - jupyter_bokeh=2.0.4=pyhd8ed1ab_0
>   - jupyter_bokeh=3.0.2=pyhd8ed1ab_0

<   - jupyterlab-git=0.24.0=pyhd8ed1ab_0
>   - jupyterlab-git=0.31.0=pyhd8ed1ab_0

<   - nbdime=2.1.0=py_0
>   - nbdime=3.1.0=pyhd8ed1ab_0

<     - nbresuse==0.4.0
>   - nbresuse=0.4.0=pyhd8ed1ab_0

>   - nbclassic=0.3.1=pyhd8ed1ab_1

>   - jupyterlab-system-monitor=0.8.0=pyhd8ed1ab_1
>   - jupyter-resource-usage=0.5.1=pyhd8ed1ab_0
>   - jupyterlab-topbar=0.6.1=pyhd8ed1ab_2
>     - jupyterlab-logout=0.5.0

<   - jupyter_conda=5.1.1=hd8ed1ab_0

<   - ravenpy=0.6.0=pyh1bb2064_2
>   - ravenpy=0.7.0=pyh1bb2064_0

<   - pandas=1.2.5=py37h219a48f_0
>   - pandas=1.3.1=py37h219a48f_0

<   - xarray=0.18.2=pyhd8ed1ab_0
>   - xarray=0.19.0=pyhd8ed1ab_1

<   - dask=2021.7.0=pyhd8ed1ab_0
>   - dask=2021.7.1=pyhd8ed1ab_0

<   - regionmask=0.6.2=pyhd8ed1ab_0
>   - regionmask=0.7.0=pyhd8ed1ab_0
```
  • Loading branch information
tlvu authored Jul 29, 2021
2 parents bbfa2a1 + 7036bee commit c5f45c9
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.13.13
current_version = 1.13.14
commit = True
tag = False
tag_name = {new_version}
Expand Down
56 changes: 56 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,62 @@

[//]: # (list changes here, using '-' for each new entry, remove this when items are added)

[1.13.14](https://github.com/bird-house/birdhouse-deploy/tree/1.13.14) (2021-07-29)
------------------------------------------------------------------------------------------------------------------

- jupyter: update for JupyterLab v3, fix memory monitor display and RavenPy-0.7.0

See PR https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/85 for more info.

Relevant changes:
```diff
< - jupyterlab=2.2.9=pyhd8ed1ab_0
> - jupyterlab=3.1.0=pyhd8ed1ab_0

< - jupyterlab_server=1.2.0=py_0
> - jupyterlab_server=2.6.1=pyhd8ed1ab_0

< - jupyter-archive=2.2.0=pyhd8ed1ab_0
> - jupyter-archive=3.0.1=pyhd8ed1ab_0

< - jupyter_bokeh=2.0.4=pyhd8ed1ab_0
> - jupyter_bokeh=3.0.2=pyhd8ed1ab_0

< - jupyterlab-git=0.24.0=pyhd8ed1ab_0
> - jupyterlab-git=0.31.0=pyhd8ed1ab_0

< - nbdime=2.1.0=py_0
> - nbdime=3.1.0=pyhd8ed1ab_0

# Pip to Conda package
< - nbresuse==0.4.0
> - nbresuse=0.4.0=pyhd8ed1ab_0

> - nbclassic=0.3.1=pyhd8ed1ab_1

> - jupyterlab-system-monitor=0.8.0=pyhd8ed1ab_1
> - jupyter-resource-usage=0.5.1=pyhd8ed1ab_0
> - jupyterlab-topbar=0.6.1=pyhd8ed1ab_2
> - jupyterlab-logout=0.5.0

< - jupyter_conda=5.1.1=hd8ed1ab_0

< - ravenpy=0.6.0=pyh1bb2064_2
> - ravenpy=0.7.0=pyh1bb2064_0

< - pandas=1.2.5=py37h219a48f_0
> - pandas=1.3.1=py37h219a48f_0

< - xarray=0.18.2=pyhd8ed1ab_0
> - xarray=0.19.0=pyhd8ed1ab_1

< - dask=2021.7.0=pyhd8ed1ab_0
> - dask=2021.7.1=pyhd8ed1ab_0

< - regionmask=0.6.2=pyhd8ed1ab_0
> - regionmask=0.7.0=pyhd8ed1ab_0
```

[1.13.13](https://github.com/bird-house/birdhouse-deploy/tree/1.13.13) (2021-07-26)
------------------------------------------------------------------------------------------------------------------

Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ for a full-fledged production platform.
* - releases
- | |latest-version| |commits-since|

.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.13.13.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.13.14.svg
:alt: Commits since latest release
:target: https://github.com/bird-house/birdhouse-deploy/compare/1.13.13...master
:target: https://github.com/bird-house/birdhouse-deploy/compare/1.13.14...master

.. |latest-version| image:: https://img.shields.io/badge/tag-1.13.13-blue.svg?style=flat
.. |latest-version| image:: https://img.shields.io/badge/tag-1.13.14-blue.svg?style=flat
:alt: Latest Tag
:target: https://github.com/bird-house/birdhouse-deploy/tree/1.13.13
:target: https://github.com/bird-house/birdhouse-deploy/tree/1.13.14

.. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
:alt: ReadTheDocs Build Status (latest version)
Expand Down
2 changes: 1 addition & 1 deletion birdhouse/default.env
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# All env in this default.env must not depend on any env in env.local.

# Jupyter single-user server images, can be overriden in env.local to have a space separated list of multiple images
export DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:210723"
export DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:210728"

# Name of the image displayed on the JupyterHub image selection page
# Can be overriden in env.local to have a space separated list of multiple images, the name order must correspond
Expand Down

0 comments on commit c5f45c9

Please sign in to comment.