Skip to content

Commit

Permalink
Merge pull request #233 from bird-house/new-release-to-pin-dask-distr…
Browse files Browse the repository at this point in the history
…ibuted

release 0.8.3: proper pin of dask and distributed for the Finch docker image

Pin `dask` and `distributed` for the performance problem observed in Ouranosinc/PAVICS-e2e-workflow-tests#100.

This is the same pin as commit 7bf4a7e but in file `environment.yml` for Docker build.

Our nightly Jenkins has also been consistently falling at the notebook `subset-user-input.ipynb` with the following error and leave scrap in the WPS queue:
```
21:01:21  ServiceException: <?xml version="1.0" encoding="utf-8"?>
21:01:21  <ExceptionReport version="1.0.0"
21:01:21      xmlns="http://www.opengis.net/ows/1.1"
21:01:21      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21:01:21      xsi:schemaLocation="http://www.opengis.net/ows/1.1 http://schemas.opengis.net/ows/1.1.0/owsExceptionReport.xsd">
21:01:21      <Exception exceptionCode="NoApplicableCode" locator="NotAcceptable">
21:01:21          <ExceptionText>Request failed: (&#x27;Connection aborted.&#x27;, RemoteDisconnected(&#x27;Remote end closed connection without response&#x27;))</ExceptionText>
21:01:21      </Exception>
21:01:21  </ExceptionReport>
```

Will perform release procedure at https://github.com/bird-house/finch/blob/master/docs/source/dev_guide.rst#bump-a-new-version once this PR approved.
  • Loading branch information
tlvu committed Apr 21, 2022
2 parents 56ab163 + 643b92a commit 168fa52
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .cruft.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"project_repo_name": "finch",
"project_readthedocs_name": "finch",
"project_short_description": "A Web Processing Service for Climate Indicators.",
"version": "0.8.2",
"version": "0.8.3",
"open_source_license": "Apache Software License 2.0",
"http_port": "5000",
"_copy_without_render": [
Expand Down
3 changes: 2 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
Changes
*******

0.8.3 (unreleased)
0.8.3 (2022-04-21)
==================
* Preserve RCP dimension in ensemble processes, even when only RCP is selected.
* Pin ``dask`` and ``distributed`` at ``2022.1.0``, see https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/issues/100

0.8.2 (2022-02-07)
==================
Expand Down
10 changes: 6 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
# vim:set ft=dockerfile:
FROM continuumio/miniconda3
MAINTAINER https://github.com/bird-house/finch
LABEL Description="Finch WPS" Vendor="Birdhouse" Version="0.8.2"
LABEL Description="Finch WPS" Vendor="Birdhouse" Version="0.8.3"

# Update Debian system
RUN apt-get update && apt-get install -y \
build-essential git \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/* \
&& conda update conda -n base \
&& conda install mamba -n base -c defaults -c conda-forge

WORKDIR /code

COPY environment.yml .
RUN conda config --add channels conda-forge \
&& conda env create -n finch -f environment.yml \
&& conda install -c conda-forge -n finch gunicorn psycopg2 \
&& mamba env create -n finch -f environment.yml \
&& mamba install -c conda-forge -n finch gunicorn psycopg2 \
&& rm -rf /opt/conda/pkgs/*

COPY . .
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@
# the built documents.
#
# The short X.Y version.
version = "0.8.2"
version = "0.8.3"
# The full version, including alpha/beta/rc tags.
release = "0.8.2"
release = "0.8.3"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ dependencies:
- psutil
- netcdf4
- unidecode
- dask >=2.9
- distributed
- dask <= 2022.1.0
- distributed <= 2022.1.0
- xarray >=0.18.2
- numpy
- geopandas
Expand Down
2 changes: 1 addition & 1 deletion finch/__version__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

__author__ = """David Huard"""
__email__ = "huard.david@ouranos.ca"
__version__ = '0.8.2'
__version__ = '0.8.3'
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.8.2
current_version = 0.8.3
commit = True
tag = True

Expand Down

0 comments on commit 168fa52

Please sign in to comment.