Prepare release 0.9.3 (#224)

* use clisops 0.9.6 * update conda spec file * added smoke tests for atlas * fixed owslib/smoke tests * use always orig files for atlas * added decadal smoke test * update changes * Bump version: 0.9.2 → 0.9.3
roocs · May 16, 2023 · 8961760 · 8961760
1 parent 1cf0fca
commit 8961760
Show file tree

Hide file tree

Showing 12 changed files with 271 additions and 147 deletions.
diff --git a/.cruft.json b/.cruft.json
@@ -11,7 +11,7 @@
             "project_repo_name": "rook",
             "project_readthedocs_name": "rook",
             "project_short_description": "A WPS service for roocs.",
-            "version": "0.9.2",
+            "version": "0.9.3",
             "open_source_license": "Apache Software License 2.0",
             "http_port": "5000",
             "_copy_without_render": [

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,12 @@
 Changes
 *******
 
+0.9.3 (2023-05-16)
+==================
+
+* Added smoke tests for c3s-ipcc-atlas and c3s-cmip6-decadal.
+* Updated roocs config for c3s-ipcc-atlas.
+
 0.9.2 (2023-02-02)
 ==================
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # vim:set ft=dockerfile:
 FROM continuumio/miniconda3
 MAINTAINER https://github.com/roocs/rook
-LABEL Description="rook WPS" Vendor="Birdhouse" Version="0.9.2"
+LABEL Description="rook WPS" Vendor="Birdhouse" Version="0.9.3"
 
 # Update Debian system
 RUN apt-get update && apt-get install -y \

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -125,7 +125,7 @@
 # The short X.Y version.
 # version = "0.1.0"
 # The full version, including alpha/beta/rc tags.
-release = "0.9.2"
+release = "0.9.3"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/environment.yml b/environment.yml
@@ -18,7 +18,7 @@ dependencies:
 - netcdf4>=1.4
 - bottleneck>=1.3.1,<1.4
 - daops>=0.8.1,<0.9
-- clisops>=0.9.5,<0.10
+- clisops>=0.9.6,<0.10
 - roocs-utils>=0.6.4,<0.7
 # workflow
 - networkx

diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@ click
 psutil
 # daops
 daops>=0.8.1,<0.9
-clisops>=0.9.5,<0.10
+clisops>=0.9.6,<0.10
 roocs-utils>=0.6.4,<0.7
 # roocs-utils @ git+https://github.com/roocs/roocs-utils@master#egg=roocs-utils
 xarray>=0.20,<0.22

diff --git a/rook/__version__.py b/rook/__version__.py
@@ -6,4 +6,4 @@
 
 __author__ = """Carsten Ehbrecht"""
 __email__ = "ehbrecht@dkrz.de"
-__version__ = "0.9.2"
+__version__ = "0.9.3"
diff --git a/rook/director/director.py b/rook/director/director.py
@@ -87,7 +87,7 @@ def _resolve(self):
             raise InvalidCollection()
 
         # If original files are requested then go straight there
-        if self.inputs.get("original_files"):
+        if self.inputs.get("original_files") or self.project == "c3s-ipcc-atlas":
             self.original_file_urls = self.search_result.download_urls()
             self.use_original_files = True
             return

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.9.2
+current_version = 0.9.3
 commit = True
 tag = True
 

diff --git a/spec-list.txt b/spec-list.txt
diff --git a/tests/smoke/conftest.py b/tests/smoke/conftest.py
@@ -17,7 +17,7 @@ def server_url():
 
 class RookWPS:
     def __init__(self, url):
-        self.wps = WebProcessingService(url, verbose=False, skip_caps=True)
+        self.wps = WebProcessingService(url, skip_caps=True)
 
     def getcapabilities(self):
         self.wps.getcapabilities()

diff --git a/tests/smoke/test_smoke_checks.py b/tests/smoke/test_smoke_checks.py
@@ -38,6 +38,12 @@
 
 C3S_CORDEX_MON_COLLECTION = "c3s-cordex.output.EUR-11.CLMcom.MOHC-HadGEM2-ES.rcp85.r1i1p1.CLMcom-CCLM4-8-17.v1.mon.tas.v20150320"  # noqa
 
+C3S_IPCC_ATLAS_CMIP5_COLLECTION = "c3s-ipcc-atlas.tnn.CMIP5.rcp45.mon"
+
+C3S_IPCC_ATLAS_CMIP6_COLLECTION = "c3s-ipcc-atlas.tnn.CMIP6.historical.mon"
+
+C3S_IPCC_ATLAS_CORDEX_COLLECTION = "c3s-ipcc-atlas.tnn.CORDEX-AFR.historical.mon"
+
 WF_C3S_CMIP5 = json.dumps(
     {
         "doc": "subset+average on cmip5",
@@ -97,6 +103,47 @@
     }
 )
 
+WF_C3S_CMIP6_DECADAL = json.dumps(
+    {
+        "doc": "subset on c3s-cmip6-decadal",
+        "inputs": {
+            "ds": [
+                "c3s-cmip6-decadal.DCPP.MOHC.HadGEM3-GC31-MM.dcppA-hindcast.s1995-r1i1p1f2.Amon.tas.gn.v20200417",
+                "c3s-cmip6-decadal.DCPP.MOHC.HadGEM3-GC31-MM.dcppA-hindcast.s1995-r2i1p1f2.Amon.tas.gn.v20200417",
+                "c3s-cmip6-decadal.DCPP.MOHC.HadGEM3-GC31-MM.dcppA-hindcast.s1995-r3i1p1f2.Amon.tas.gn.v20200417",
+                "c3s-cmip6-decadal.DCPP.MOHC.HadGEM3-GC31-MM.dcppA-hindcast.s1995-r4i1p1f2.Amon.tas.gn.v20200417",
+                "c3s-cmip6-decadal.DCPP.MOHC.HadGEM3-GC31-MM.dcppA-hindcast.s1995-r5i1p1f2.Amon.tas.gn.v20200417",
+                "c3s-cmip6-decadal.DCPP.MOHC.HadGEM3-GC31-MM.dcppA-hindcast.s1995-r6i1p1f2.Amon.tas.gn.v20200417",
+                "c3s-cmip6-decadal.DCPP.MOHC.HadGEM3-GC31-MM.dcppA-hindcast.s1995-r7i1p1f2.Amon.tas.gn.v20200417",
+                "c3s-cmip6-decadal.DCPP.MOHC.HadGEM3-GC31-MM.dcppA-hindcast.s1995-r8i1p1f2.Amon.tas.gn.v20200417",
+                "c3s-cmip6-decadal.DCPP.MOHC.HadGEM3-GC31-MM.dcppA-hindcast.s1995-r9i1p1f2.Amon.tas.gn.v20200417",
+                "c3s-cmip6-decadal.DCPP.MOHC.HadGEM3-GC31-MM.dcppA-hindcast.s1995-r10i1p1f2.Amon.tas.gn.v20200417",
+            ]
+        },
+        "outputs": {"output": "subset/output"},
+        "steps": {
+            "concat": {
+                "run": "concat",
+                "in": {
+                    "collection": "inputs/ds",
+                    "dims": "realization",
+                },
+            },
+            "average": {
+                "run": "average",
+                "in": {"collection": "concat/output", "dims": "realization"},
+            },
+            "subset": {
+                "run": "subset",
+                "in": {
+                    "collection": "average/output",
+                    "time": "1995/1996",
+                },
+            },
+        },
+    }
+)
+
 
 def test_smoke_get_capabilities(wps):
     caps = wps.getcapabilities()
@@ -440,3 +487,48 @@ def test_smoke_execute_c3s_cordex_orchestrate(wps):
         "tas_EUR-11_IPSL-IPSL-CM5A-MR_rcp85_r1i1p1_IPSL-WRF381P_v1_day_avg-t.nc"
         in urls[0]
     )
+
+
+def test_smoke_execute_c3s_cmip6_decadal_orchestrate(wps):
+    inputs = [
+        ("workflow", ComplexDataInput(WF_C3S_CMIP6_DECADAL)),
+    ]
+    urls = wps.execute("orchestrate", inputs)
+    assert len(urls) == 1
+    assert (
+        "tas_Amon_HadGEM3-GC31-MM_dcppA-hindcast_r10i1p1f2_gn_19951116-19961216.nc"
+        in urls[0]
+    )
+
+
+def test_smoke_execute_c3s_ipcc_atlas_cmip5_subset(wps):
+    inputs = [
+        ("collection", C3S_IPCC_ATLAS_CMIP5_COLLECTION),
+        # ("time", "2000-01-01/2000-12-30"),
+        # ("original_files", "1"),
+    ]
+    urls = wps.execute("subset", inputs)
+    assert len(urls) == 1
+    assert "data.mips.copernicus-climate.eu" in urls[0]
+
+
+def test_smoke_execute_c3s_ipcc_atlas_cmip6_subset(wps):
+    inputs = [
+        ("collection", C3S_IPCC_ATLAS_CMIP6_COLLECTION),
+        # ("time", "2000-01-01/2000-12-30"),
+        # ("original_files", "1"),
+    ]
+    urls = wps.execute("subset", inputs)
+    assert len(urls) == 1
+    assert "data.mips.copernicus-climate.eu" in urls[0]
+
+
+def test_smoke_execute_c3s_ipcc_atlas_cordex_subset(wps):
+    inputs = [
+        ("collection", C3S_IPCC_ATLAS_CORDEX_COLLECTION),
+        # ("time", "2000-01-01/2000-12-30"),
+        # ("original_files", "1"),
+    ]
+    urls = wps.execute("subset", inputs)
+    assert len(urls) == 1
+    assert "data.mips.copernicus-climate.eu" in urls[0]