Skip to content

Commit 446f807

Browse files
matthew-mizielinskimatthew-mizielinski
authored
Merge pull request #154 from MetOffice/CDDSO-112_v2.5.0_release
CDDSO-112 v2.5.0 release
2 parents 165714d + 4b8bbc5 commit 446f807

File tree

69 files changed

+413
-333
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+413
-333
lines changed

‎cdds/CHANGES.rst‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@
33
44
.. include:: common.txt
55

6+
Release 2.5.0, July 27, 2023
7+
============================
8+
* Migrate CDDS to Cylc 8 (CDDSO-282, CDDSO-285)
9+
* Introduce gregorian calendar support (CDDSO-231, CDDSO-235, CDDSO-240, CDDSO-244)
10+
* Plugin and code development to support Regional models for projects such as CORDEX
11+
(CDDSO-233, CDDSO-68, CDDSO-74, CDDSO-261, CDDSO-149)
12+
* CDDS now uses ISO datetime format for all time values in CDDS and MIP Convert config
13+
files (CDDSO-313, CDDSO-45)
14+
* Relocate test and etc directories to support alternate platforms and migration to
15+
azure SPICE (CDDSO-131, CDDSO-273)
16+
* Replace pep8 with pycodestyle (CDDSO-207)
17+
* Separated extract validation into a separate script & task (CDDSO-243)
18+
* Introduced retries to workflow tasks when submission fails (CDDSO-314)
19+
620
Release 2.4.7, June 29, 2023
721
============================
822
* Fix a bug in the dehaloing script that prevented it from reading default command line

‎cdds/cdds/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# (C) British Crown Copyright 2022, Met Office.
1+
# (C) British Crown Copyright 2022-2023, Met Office.
22
# Please see LICENSE.rst for license details.
33
from cdds.versions import get_version
44

5-
_DEV = True
5+
_DEV = False
66
_NUMERICAL_VERSION = '2.5.0'
77
__version__ = get_version('cdds')

‎cdds/cdds/global_arguments.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
"mass_data_class": "crum",
66
"output_mass_root": "moose:/adhoc/projects/cdds/",
77
"output_mass_suffix": "development",
8-
"processing_workflow_branch": "trunk",
8+
"processing_workflow_branch": "cdds_2.5.0",
99
"root_ancil_dir": "${CDDS_ETC}/ancil/",
1010
"root_data_dir": "/project/cdds_data",
1111
"root_hybrid_heights_dir": "${CDDS_ETC}/vertical_coordinates",
1212
"root_inventory_dir": "/project/cdds/inventory/",
1313
"root_mip_table_dir": "${CDDS_ETC}/mip_tables/CMIP6/",
1414
"root_proc_dir": "/project/cdds/proc",
1515
"root_replacement_coordinates_dir": "${CDDS_ETC}/horizontal_coordinates/",
16-
"rose_suite_branch": "trunk",
16+
"rose_suite_branch": "tags/2.5.0",
1717
"sites_file": "${CDDS_ETC}/cfmip2/cfmip2-sites-orog.txt",
1818
"skip_extract": false,
1919
"skip_extract_validation": false,

‎cdds/cdds/global_arguments_jasmin.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
"mass_data_class": "crum",
77
"output_mass_root": "",
88
"output_mass_suffix": "",
9-
"processing_workflow_branch": "trunk",
9+
"processing_workflow_branch": "cdds_2.5.0",
1010
"root_ancil_dir": "/gws/smf/j04/cmip6_prep/cdds-env-python3/etc/ancil/",
1111
"root_data_dir": "/project/cdds_data",
1212
"root_hybrid_heights_dir": "/gws/smf/j04/cmip6_prep/cdds-env-python3/etc/vertical_coordinates",
1313
"root_inventory_dir": "/gws/smf/j04/cmip6_prep/cdds-env-python3/etc/inventory/",
1414
"root_mip_table_dir": "/gws/smf/j04/cmip6_prep/cdds-env-python3/etc/mip_tables/CMIP6/",
1515
"root_proc_dir": "/project/cdds/proc",
1616
"root_replacement_coordinates_dir": "/gws/smf/j04/cmip6_prep/cdds-env-python3/etc/horizontal_coordinates/",
17-
"rose_suite_branch": "cdds_jasmin_2.3",
17+
"rose_suite_branch": "cdds_jasmin_2.5",
1818
"sites_file": "/gws/smf/j04/cmip6_prep/cdds-env-python3/etc/cfmip2/cfmip2-sites-orog.txt",
1919
"skip_extract": true,
2020
"skip_extract_validation": false,

‎docs/cdds/doctrees/environment.pickle‎

1.03 KB
Binary file not shown.

‎docs/cdds/doctrees/release_history.doctree‎

6.23 KB
Binary file not shown.

‎docs/cdds/html/.buildinfo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: 69eadc0e105da72ddde19818b1652295
3+
config: 6fa6fcd6465e21b273ff4a52be5f456b
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

‎docs/cdds/html/_modules/cdds/common/plugins/base/base_models.html‎

Lines changed: 30 additions & 30 deletions
Large diffs are not rendered by default.

‎docs/cdds/html/_modules/cdds/common/plugins/base/base_plugin.html‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8-
<title>cdds.common.plugins.base.base_plugin &#8212; CDDS documentation</title>
8+
<title>cdds.common.plugins.base.base_plugin &#8212; CDDS 2.5.0 documentation</title>
99
<link rel="stylesheet" type="text/css" href="../../../../../_static/pygments.css" />
1010
<link rel="stylesheet" type="text/css" href="../../../../../_static/nature.css" />
1111
<script data-url_root="../../../../../" id="documentation_options" src="../../../../../_static/documentation_options.js"></script>
@@ -25,7 +25,7 @@ <h3>Navigation</h3>
2525
<li class="right" >
2626
<a href="../../../../../py-modindex.html" title="Python Module Index"
2727
>modules</a> |</li>
28-
<li class="nav-item nav-item-0"><a href="../../../../../index.html">CDDS documentation</a> &#187;</li>
28+
<li class="nav-item nav-item-0"><a href="../../../../../index.html">CDDS 2.5.0 documentation</a> &#187;</li>
2929
<li class="nav-item nav-item-1"><a href="../../../../index.html" accesskey="U">Module code</a> &#187;</li>
3030
<li class="nav-item nav-item-this"><a href="">cdds.common.plugins.base.base_plugin</a></li>
3131
</ul>
@@ -37,7 +37,7 @@ <h3>Navigation</h3>
3737
<div class="body" role="main">
3838

3939
<h1>Source code for cdds.common.plugins.base.base_plugin</h1><div class="highlight"><pre>
40-
<span></span><span class="c1"># (C) British Crown Copyright 2021-2022, Met Office.</span>
40+
<span></span><span class="c1"># (C) British Crown Copyright 2021-2023, Met Office.</span>
4141
<span class="c1"># Please see LICENSE.rst for license details.</span>
4242
<span class="sd">&quot;&quot;&quot;</span>
4343
<span class="sd">The :mod:`base_plugin` module contains the basic code for plugins.</span>
@@ -48,7 +48,7 @@ <h1>Source code for cdds.common.plugins.base.base_plugin</h1><div class="highlig
4848

4949

5050
<div class="viewcode-block" id="MipEra"><a class="viewcode-back" href="../../../../../plugins/plugins.base.html#cdds.common.plugins.base.base_plugin.MipEra">[docs]</a><span class="k">class</span> <span class="nc">MipEra</span><span class="p">(</span><span class="n">Enum</span><span class="p">):</span>
51-
<span class="sd">&quot;&quot;&quot;</span>
51+
<span class="w"> </span><span class="sd">&quot;&quot;&quot;</span>
5252
<span class="sd"> MIP eras of projects (e.g. cmip6, cmip7, ...)</span>
5353

5454
<span class="sd"> At the moment, only cmip6 is supported. That will change</span>
@@ -57,7 +57,7 @@ <h1>Source code for cdds.common.plugins.base.base_plugin</h1><div class="highlig
5757

5858
<div class="viewcode-block" id="MipEra.from_str"><a class="viewcode-back" href="../../../../../plugins/plugins.base.html#cdds.common.plugins.base.base_plugin.MipEra.from_str">[docs]</a> <span class="nd">@staticmethod</span>
5959
<span class="k">def</span> <span class="nf">from_str</span><span class="p">(</span><span class="n">str_value</span><span class="p">:</span> <span class="nb">str</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="s1">&#39;MipEra&#39;</span><span class="p">:</span>
60-
<span class="sd">&quot;&quot;&quot;</span>
60+
<span class="w"> </span><span class="sd">&quot;&quot;&quot;</span>
6161
<span class="sd"> Returns the corresponding MIP era to the given string representation.</span>
6262

6363
<span class="sd"> :param str_value: MIP era as string</span>
@@ -72,7 +72,7 @@ <h1>Source code for cdds.common.plugins.base.base_plugin</h1><div class="highlig
7272

7373
<div class="viewcode-block" id="MipEra.is_cmip"><a class="viewcode-back" href="../../../../../plugins/plugins.base.html#cdds.common.plugins.base.base_plugin.MipEra.is_cmip">[docs]</a> <span class="nd">@staticmethod</span>
7474
<span class="k">def</span> <span class="nf">is_cmip</span><span class="p">(</span><span class="n">mip_era</span><span class="p">:</span> <span class="nb">str</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">bool</span><span class="p">:</span>
75-
<span class="sd">&quot;&quot;&quot;</span>
75+
<span class="w"> </span><span class="sd">&quot;&quot;&quot;</span>
7676
<span class="sd"> Checks if given project is a CMIP project.</span>
7777

7878
<span class="sd"> :param mip_era: ID of project to check (case-sensitive check!)</span>
@@ -87,7 +87,7 @@ <h1>Source code for cdds.common.plugins.base.base_plugin</h1><div class="highlig
8787

8888
<div class="viewcode-block" id="MipEra.is_gcmodeldev"><a class="viewcode-back" href="../../../../../plugins/plugins.base.html#cdds.common.plugins.base.base_plugin.MipEra.is_gcmodeldev">[docs]</a> <span class="nd">@staticmethod</span>
8989
<span class="k">def</span> <span class="nf">is_gcmodeldev</span><span class="p">(</span><span class="n">mip_era</span><span class="p">:</span> <span class="nb">str</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">bool</span><span class="p">:</span>
90-
<span class="sd">&quot;&quot;&quot;</span>
90+
<span class="w"> </span><span class="sd">&quot;&quot;&quot;</span>
9191
<span class="sd"> Checks if given project is a GcModelDev project.</span>
9292

9393
<span class="sd"> :param mip_era: ID of project to check (case-sensitive check!)</span>
@@ -100,12 +100,20 @@ <h1>Source code for cdds.common.plugins.base.base_plugin</h1><div class="highlig
100100
<span class="k">return</span> <span class="kc">True</span>
101101
<span class="k">return</span> <span class="kc">False</span></div>
102102

103+
<div class="viewcode-block" id="MipEra.is_cordex"><a class="viewcode-back" href="../../../../../plugins/plugins.base.html#cdds.common.plugins.base.base_plugin.MipEra.is_cordex">[docs]</a> <span class="nd">@staticmethod</span>
104+
<span class="k">def</span> <span class="nf">is_cordex</span><span class="p">(</span><span class="n">mip_era</span><span class="p">:</span> <span class="nb">str</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">bool</span><span class="p">:</span>
105+
<span class="k">for</span> <span class="n">cordex</span> <span class="ow">in</span> <span class="p">[</span><span class="n">MipEra</span><span class="o">.</span><span class="n">CORDEX</span><span class="p">]:</span>
106+
<span class="k">if</span> <span class="n">mip_era</span> <span class="o">==</span> <span class="n">cordex</span><span class="o">.</span><span class="n">value</span><span class="p">:</span>
107+
<span class="k">return</span> <span class="kc">True</span>
108+
<span class="k">return</span> <span class="kc">False</span></div>
109+
103110
<span class="n">CMIP6</span> <span class="o">=</span> <span class="s2">&quot;CMIP6&quot;</span>
104-
<span class="n">GC_MODEL_DEV</span> <span class="o">=</span> <span class="s2">&quot;GCModelDev&quot;</span></div>
111+
<span class="n">GC_MODEL_DEV</span> <span class="o">=</span> <span class="s2">&quot;GCModelDev&quot;</span>
112+
<span class="n">CORDEX</span> <span class="o">=</span> <span class="s2">&quot;CORDEX&quot;</span></div>
105113

106114

107115
<div class="viewcode-block" id="BasePlugin"><a class="viewcode-back" href="../../../../../plugins/plugins.base.html#cdds.common.plugins.base.base_plugin.BasePlugin">[docs]</a><span class="k">class</span> <span class="nc">BasePlugin</span><span class="p">(</span><span class="n">CddsPlugin</span><span class="p">,</span> <span class="n">ABC</span><span class="p">):</span>
108-
<span class="sd">&quot;&quot;&quot;</span>
116+
<span class="w"> </span><span class="sd">&quot;&quot;&quot;</span>
109117
<span class="sd"> Abstract class that provides some basic functionality for plugins.</span>
110118
<span class="sd"> &quot;&quot;&quot;</span>
111119

@@ -142,13 +150,13 @@ <h3>Navigation</h3>
142150
<li class="right" >
143151
<a href="../../../../../py-modindex.html" title="Python Module Index"
144152
>modules</a> |</li>
145-
<li class="nav-item nav-item-0"><a href="../../../../../index.html">CDDS documentation</a> &#187;</li>
153+
<li class="nav-item nav-item-0"><a href="../../../../../index.html">CDDS 2.5.0 documentation</a> &#187;</li>
146154
<li class="nav-item nav-item-1"><a href="../../../../index.html" >Module code</a> &#187;</li>
147155
<li class="nav-item nav-item-this"><a href="">cdds.common.plugins.base.base_plugin</a></li>
148156
</ul>
149157
</div>
150158
<div class="footer" role="contentinfo">
151-
&#169; Copyright 2022, The Climate Data Delivery Team.
159+
&#169; Copyright British Crown 2015-2023, Met Office.
152160
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 4.2.0.
153161
</div>
154162
</body>

‎docs/cdds/html/_modules/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8-
<title>Overview: module code &#8212; CDDS 2.5.0.dev0+CDDSO-286_git-wiki-docs-into-sphinx.e59b447-M documentation</title>
8+
<title>Overview: module code &#8212; CDDS 2.5.0 documentation</title>
99
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
1010
<link rel="stylesheet" type="text/css" href="../_static/nature.css" />
1111
<script data-url_root="../" id="documentation_options" src="../_static/documentation_options.js"></script>
@@ -25,7 +25,7 @@ <h3>Navigation</h3>
2525
<li class="right" >
2626
<a href="../py-modindex.html" title="Python Module Index"
2727
>modules</a> |</li>
28-
<li class="nav-item nav-item-0"><a href="../index.html">CDDS 2.5.0.dev0+CDDSO-286_git-wiki-docs-into-sphinx.e59b447-M documentation</a> &#187;</li>
28+
<li class="nav-item nav-item-0"><a href="../index.html">CDDS 2.5.0 documentation</a> &#187;</li>
2929
<li class="nav-item nav-item-this"><a href="">Overview: module code</a></li>
3030
</ul>
3131
</div>
@@ -79,7 +79,7 @@ <h3>Navigation</h3>
7979
<li class="right" >
8080
<a href="../py-modindex.html" title="Python Module Index"
8181
>modules</a> |</li>
82-
<li class="nav-item nav-item-0"><a href="../index.html">CDDS 2.5.0.dev0+CDDSO-286_git-wiki-docs-into-sphinx.e59b447-M documentation</a> &#187;</li>
82+
<li class="nav-item nav-item-0"><a href="../index.html">CDDS 2.5.0 documentation</a> &#187;</li>
8383
<li class="nav-item nav-item-this"><a href="">Overview: module code</a></li>
8484
</ul>
8585
</div>

0 commit comments

Comments
 (0)