From 741e73214872b5ca2db2c7377cdd95a8297ab78f Mon Sep 17 00:00:00 2001 From: Long Vu Date: Tue, 19 Apr 2022 18:35:14 -0400 Subject: [PATCH 1/5] proper pin of dask and distributed for the Finch docker image --- CHANGES.rst | 1 + environment.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 8c03c308..ee5003ad 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,7 @@ Changes 0.8.3 (unreleased) ================== * 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) ================== diff --git a/environment.yml b/environment.yml index a1081cd7..7bc37728 100644 --- a/environment.yml +++ b/environment.yml @@ -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 From d8979a6ebdf13734be7bda3821dbe3e9cfd5fb61 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Wed, 20 Apr 2022 11:26:55 -0400 Subject: [PATCH 2/5] docker: update conda to avoid "picosat: out of memory in 'resize'" error Got this error on DockerHub: ``` 10 [5/6] RUN conda config --add channels conda-forge && conda env create -n finch -f environment.yml && conda install -c conda-forge -n finch gunicorn psycopg2 && rm -rf /opt/conda/pkgs/* 10 sha256:300f07b5b9c74a71d82689738dfbba263b52421627f1100c2b35f97fa0d3957d 10 1.391 Collecting package metadata (repodata.json): ...working... done 10 98.50 Solving environment: ...working... *** picosat: out of memory in 'resize' 10 1262.5 Aborted 10 ERROR: executor failed running [/bin/sh -c conda config --add channels conda-forge && conda env create -n finch -f environment.yml && conda install -c conda-forge -n finch gunicorn psycopg2 && rm -rf /opt/conda/pkgs/*]: exit code: 134 ------ > [5/6] RUN conda config --add channels conda-forge && conda env create -n finch -f environment.yml && conda install -c conda-forge -n finch gunicorn psycopg2 && rm -rf /opt/conda/pkgs/*: ------ error: failed to solve: rpc error: code = Unknown desc = executor failed running [/bin/sh -c conda config --add channels conda-forge && conda env create -n finch -f environment.yml && conda install -c conda-forge -n finch gunicorn psycopg2 && rm -rf /opt/conda/pkgs/*]: exit code: 134 Build failed using Buildkit ``` This issue https://github.com/conda/conda/issues/9067 hints that maybe a conda update might fix it. --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b0035c38..65ab5149 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,8 @@ LABEL Description="Finch WPS" Vendor="Birdhouse" Version="0.8.2" # 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 WORKDIR /code From 777126d5b9a0e8ba0576409f49776ab5f77a572b Mon Sep 17 00:00:00 2001 From: Long Vu Date: Wed, 20 Apr 2022 15:43:38 -0400 Subject: [PATCH 3/5] docker: switch to use mamba since still build error on DockerHub Trying to fix this error on DockerHub, hope this works: ``` 10 [5/6] RUN conda config --add channels conda-forge && conda env create -n finch -f environment.yml && conda install -c conda-forge -n finch gunicorn psycopg2 && rm -rf /opt/conda/pkgs/* 10 sha256:32f6b0b62771f2317c26270dfe736f18955f5461cf54e4fcdcbf6df1327eb4ab 10 1.904 Collecting package metadata (repodata.json): ...working... done 10 126.7 Solving environment: ...working... Killed ``` --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 65ab5149..550e1e8f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,14 +7,15 @@ LABEL Description="Finch WPS" Vendor="Birdhouse" Version="0.8.2" RUN apt-get update && apt-get install -y \ build-essential git \ && rm -rf /var/lib/apt/lists/* \ - && conda update conda -n base + && 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 . . From 1e97b2ff1db9cb8bfa61bcc074b41a065ab55962 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Thu, 21 Apr 2022 08:32:11 -0400 Subject: [PATCH 4/5] CHANGES.rst: update 0.8.3 release date --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index ee5003ad..6c88485d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,7 +1,7 @@ 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 From 643b92a114b7ea34fbf06db0c232e583c0e92eac Mon Sep 17 00:00:00 2001 From: Long Vu Date: Thu, 21 Apr 2022 08:35:49 -0400 Subject: [PATCH 5/5] =?UTF-8?q?Bump=20version:=200.8.2=20=E2=86=92=200.8.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cruft.json | 2 +- Dockerfile | 2 +- docs/source/conf.py | 4 ++-- finch/__version__.py | 2 +- setup.cfg | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.cruft.json b/.cruft.json index b36d7f9c..167f029e 100644 --- a/.cruft.json +++ b/.cruft.json @@ -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": [ diff --git a/Dockerfile b/Dockerfile index 550e1e8f..a74b5b5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # 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 \ diff --git a/docs/source/conf.py b/docs/source/conf.py index 9fb7b4b2..e4744510 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -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. diff --git a/finch/__version__.py b/finch/__version__.py index 3b6a4185..9323ebf7 100644 --- a/finch/__version__.py +++ b/finch/__version__.py @@ -6,4 +6,4 @@ __author__ = """David Huard""" __email__ = "huard.david@ouranos.ca" -__version__ = '0.8.2' +__version__ = '0.8.3' diff --git a/setup.cfg b/setup.cfg index e7af977b..f637f509 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.2 +current_version = 0.8.3 commit = True tag = True