Skip to content

Commit

Permalink
jupyter: new build for urlpath (#271)
Browse files Browse the repository at this point in the history
See PR Ouranosinc/PAVICS-e2e-workflow-tests#112

- Adds `urlpath` for Ouranosinc/pavics-sdi#268,
fixes Ouranosinc/PAVICS-e2e-workflow-tests#110

- Relevant changes (alphabetical order):
```diff
<   - climpred=2.2.0=pyhd8ed1ab_0
>   - climpred=2.3.0=pyhd8ed1ab_0

<   - dask=2022.11.0=pyhd8ed1ab_0
>   - dask=2022.11.1=pyhd8ed1ab_0

<   - flox=0.6.3=pyhd8ed1ab_0
>   - flox=0.6.4=pyhd8ed1ab_0

<   - h5netcdf=1.0.2=pyhd8ed1ab_0
>   - h5netcdf=1.1.0=pyhd8ed1ab_0

<   - numpy=1.23.4=py38h7042d01_1
>   - numpy=1.23.5=py38h7042d01_0

>   - urlpath=1.2.0=pyhd8ed1ab_0
```
  • Loading branch information
tlvu committed Dec 19, 2022
2 parents 31d9b05 + 0a81fd7 commit 1081124
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.22.5
current_version = 1.22.6
commit = True
tag = False
tag_name = {new_version}
Expand Down Expand Up @@ -30,11 +30,11 @@ search = {current_version}
replace = {new_version}

[bumpversion:file:RELEASE.txt]
search = {current_version} 2022-12-02T03:34:18Z
search = {current_version} 2022-12-19T19:40:46Z
replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}

[bumpversion:part:releaseTime]
values = 2022-12-02T03:34:18Z
values = 2022-12-19T19:40:46Z

[bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template]
search = 'version': '{current_version}'
Expand Down
31 changes: 31 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,37 @@

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

[1.22.6](https://github.com/bird-house/birdhouse-deploy/tree/1.22.6) (2022-12-19)
------------------------------------------------------------------------------------------------------------------

## Changes:

- new Jupyter env for `urlpath`

See PR https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/112

- Adds `urlpath` for https://github.com/Ouranosinc/pavics-sdi/pull/268, fixes https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/issues/110
- Relevant changes (alphabetical order):
```diff
< - climpred=2.2.0=pyhd8ed1ab_0
> - climpred=2.3.0=pyhd8ed1ab_0

< - dask=2022.11.0=pyhd8ed1ab_0
> - dask=2022.11.1=pyhd8ed1ab_0

< - flox=0.6.3=pyhd8ed1ab_0
> - flox=0.6.4=pyhd8ed1ab_0

< - h5netcdf=1.0.2=pyhd8ed1ab_0
> - h5netcdf=1.1.0=pyhd8ed1ab_0

< - numpy=1.23.4=py38h7042d01_1
> - numpy=1.23.5=py38h7042d01_0

> - urlpath=1.2.0=pyhd8ed1ab_0
```


[1.22.5](https://github.com/bird-house/birdhouse-deploy/tree/1.22.5) (2022-12-02)
------------------------------------------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generic variables
override SHELL := bash
override APP_NAME := birdhouse-deploy
override APP_VERSION := 1.22.5
override APP_VERSION := 1.22.6

# utility to remove comments after value of an option variable
override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")
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.22.5.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.22.6.svg
:alt: Commits since latest release
:target: https://github.com/bird-house/birdhouse-deploy/compare/1.22.5...master
:target: https://github.com/bird-house/birdhouse-deploy/compare/1.22.6...master

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

.. |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 RELEASE.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.22.5 2022-12-02T03:34:18Z
1.22.6 2022-12-19T19:40:46Z
8 changes: 4 additions & 4 deletions birdhouse/config/canarie-api/docker_configuration.py.template
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ SERVICES = {
'info': {
'name': 'Node',
'synopsis': 'Nodes are data, compute and index endpoints accessed through the PAVICS platform or external clients. The Node service is the backend that allows: data storage, harvesting, indexation and discovery of local and federated data; authentication and authorization; server registration and management. Node service is therefore composed of several other services.',
'version': '1.22.5',
'releaseTime': '2022-12-02T03:34:18Z',
'version': '1.22.6',
'releaseTime': '2022-12-19T19:40:46Z',
'institution': 'Ouranos',
'researchSubject': 'Climatology',
'supportEmail': '${SUPPORT_EMAIL}',
Expand Down Expand Up @@ -242,8 +242,8 @@ PLATFORMS = {
'info': {
'name': 'PAVICS',
'synopsis': 'The PAVICS (Power Analytics for Visualization of Climate Science) platform is a collection of climate analysis services served through Open Geospatial Consortium (OGC) protocols. These services include data access, processing and visualization. Both data and algorithms can be accessed either programmatically, through OGC-compliant clients such as QGIS or ArcGIS, or a custom web interface.',
'version': '1.22.5',
'releaseTime': '2022-12-02T03:34:18Z',
'version': '1.22.6',
'releaseTime': '2022-12-19T19:40:46Z',
'institution': 'Ouranos',
'researchSubject': 'Climatology',
'supportEmail': '${SUPPORT_EMAIL}',
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:221118.1"
export DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:221130"

# 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
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@
# built documents.
#
# The short X.Y version.
version = '1.22.5'
version = '1.22.6'
# The full version, including alpha/beta/rc tags.
release = '1.22.5'
release = '1.22.6'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down

0 comments on commit 1081124

Please sign in to comment.