diff --git a/lib/iris/fileformats/um_cf_map.py b/lib/iris/fileformats/um_cf_map.py index cc568d7ccf..3fafa4df80 100644 --- a/lib/iris/fileformats/um_cf_map.py +++ b/lib/iris/fileformats/um_cf_map.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2018, Met Office +# (C) British Crown Copyright 2013 - 2019, Met Office # # This file is part of Iris. # @@ -16,11 +16,11 @@ # along with Iris. If not, see . # # DO NOT EDIT: AUTO-GENERATED -# Created on 01 June 2018 13:06 from +# Created on 22 May 2019 12:05 from # http://www.metarelate.net/metOcean -# at commit c07efb7ba0442332cbd5514c9d661c4f84a635c6 +# at commit a3649e942198f014f0258d926678dbbff616feae -# https://github.com/metarelate/metOcean/commit/c07efb7ba0442332cbd5514c9d661c4f84a635c6 +# https://github.com/metarelate/metOcean/commit/a3649e942198f014f0258d926678dbbff616feae """ Provides UM/CF phenomenon translations. @@ -720,7 +720,7 @@ 'm01s16i202': CFName('geopotential_height', None, 'm'), 'm01s16i203': CFName('air_temperature', None, 'K'), 'm01s16i204': CFName('relative_humidity', None, '%'), - 'm01s16i205': CFName(None, 'wet_bulb_potential_temperature', 'K'), + 'm01s16i205': CFName('wet_bulb_potential_temperature', None, 'K'), 'm01s16i222': CFName('air_pressure_at_sea_level', None, 'Pa'), 'm01s16i224': CFName(None, 'square_of_height', 'm2'), 'm01s16i255': CFName('geopotential_height', None, 'm'), diff --git a/tools/gen_translations.py b/tools/gen_translations.py index 5a710c5220..8df264d8ab 100644 --- a/tools/gen_translations.py +++ b/tools/gen_translations.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014 - 2017, Met Office +# (C) British Crown Copyright 2014 - 2019, Met Office # # This file is part of Iris. # @@ -28,6 +28,7 @@ import requests import sys +import metarelate from metarelate.fuseki import FusekiServer from translator import (FORMAT_URIS, FieldcodeCFMappings, StashCFNameMappings, @@ -191,7 +192,7 @@ def build_grib_cf_map(fuseki, now, git_sha, base_dir): with open(filename, 'w') as fh: fh.write(HEADER.format(year=YEAR, doc_string=DOC_STRING_GRIB, datestamp=now, git_sha=git_sha, - name='Iris')) + name='iris-grib')) fh.write(HEADER_GRIB) fh.write('\n') @@ -221,6 +222,9 @@ def build_grib_cf_map(fuseki, now, git_sha, base_dir): def main(): + # Protect metarelate resource from 1.0 emergent bug + if not float(metarelate.__version__) >= 1.1: + raise ValueError("Please ensure that Metarelate Version is >= 1.1") now = datetime.utcnow().strftime('%d %B %Y %H:%m') git_sha = requests.get('http://www.metarelate.net/metOcean/latest_sha').text gen_path = os.path.abspath(sys.modules['__main__'].__file__)